| List: | Commits | « Previous MessageNext Message » | |
| From: | rsomla | Date: | February 22 2007 9:29pm |
| Subject: | bk commit into 5.1 tree (rafal:1.2413) | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 repository of rafal. When rafal does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-02-22 21:28:50+01:00, rafal@quant.(none) +23 -0 Merge quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl into quant.(none):/ext/mysql/bk/backup/prototype MERGE: 1.2273.163.10 BitKeeper/etc/ignore@stripped, 2007-02-22 21:13:17+01:00, rafal@quant.(none) +6 -6 auto-union MERGE: 1.253.4.1 libmysqld/Makefile.am@stripped, 2007-02-22 21:28:41+01:00, rafal@quant.(none) +0 -2 Manual merge (will be updated with extra CSet) MERGE: 1.98.1.1 mysql-test/r/backup.result@stripped, 2007-02-22 21:19:17+01:00, rafal@quant.(none) +0 -13 Results for the backup test. MERGE: 1.21.1.1 mysql-test/r/ps_1general.result@stripped, 2007-02-22 21:13:51+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.62.1.1 mysql-test/r/sp-error.result@stripped, 2007-02-22 21:13:51+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.115.1.1 mysql-test/r/sp.result@stripped, 2007-02-22 21:13:51+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.225.1.1 mysql-test/t/backup.test@stripped, 2007-02-22 21:19:38+01:00, rafal@quant.(none) +3 -1 Simple backup test. MERGE: 1.22.1.2 mysql-test/t/ps_1general.test@stripped, 2007-02-22 21:13:51+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.35.1.1 mysql-test/t/sp-error.test@stripped, 2007-02-22 21:13:51+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.112.2.1 mysql-test/t/sp.test@stripped, 2007-02-22 21:13:52+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.195.6.1 sql/CMakeLists.txt@stripped, 2007-02-22 21:19:51+01:00, rafal@quant.(none) +3 -18 MERGE: 1.29.1.5 sql/Makefile.am@stripped, 2007-02-22 21:28:41+01:00, rafal@quant.(none) +1 -3 Manual merge. MERGE: 1.155.3.3 sql/handler.h@stripped, 2007-02-22 21:28:41+01:00, rafal@quant.(none) +2 -2 Manual merge. MERGE: 1.240.3.4 sql/sql_parse.cc@stripped, 2007-02-22 21:28:41+01:00, rafal@quant.(none) +0 -1 Manual merge. MERGE: 1.581.1.2 sql/sql_show.cc@stripped, 2007-02-22 21:13:53+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.362.2.1 sql/sql_table.cc@stripped, 2007-02-22 21:13:53+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.359.9.1 sql/sql_yacc.yy@stripped, 2007-02-22 21:13:54+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.502.4.1 sql/table.h@stripped, 2007-02-22 21:13:54+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.153.1.4 storage/archive/CMakeLists.txt@stripped, 2007-02-22 21:13:54+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.6.1.1 storage/archive/Makefile.am@stripped, 2007-02-22 21:13:54+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.8.1.2 storage/archive/ha_archive.cc@stripped, 2007-02-22 21:28:42+01:00, rafal@quant.(none) +0 -2 Manual merge. MERGE: 1.103.2.4 storage/archive/ha_archive.h@stripped, 2007-02-22 21:28:42+01:00, rafal@quant.(none) +0 -0 Manual merge. MERGE: 1.50.2.4 unittest/mysys/Makefile.am@stripped, 2007-02-22 21:13:54+01:00, rafal@quant.(none) +0 -0 Auto merged MERGE: 1.6.1.1 # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: rafal # Host: quant.(none) # Root: /ext/mysql/bk/backup/prototype/RESYNC --- 1.171/sql/Makefile.am 2007-02-22 21:29:03 +01:00 +++ 1.172/sql/Makefile.am 2007-02-22 21:29:03 +01:00 @@ -67,7 +67,7 @@ event_db_repository.h event_queue.h \ sql_plugin.h authors.h sql_partition.h event_data_objects.h \ partition_info.h partition_element.h event_scheduler.h \ - contributors.h sql_servers.h + backup.h backup0.h contributors.h mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ item.cc item_sum.cc item_buff.cc item_func.cc \ item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \ @@ -106,7 +106,8 @@ event_queue.cc event_db_repository.cc events.cc \ sql_plugin.cc sql_binlog.cc \ sql_builtin.cc sql_tablespace.cc partition_info.cc \ - sql_servers.cc + sql_servers.cc \ + backup.cc backup_util.cc backup_prototype.cc backup_alg.cc restore_alg.cc gen_lex_hash_SOURCES = gen_lex_hash.cc --- 1.252/sql/handler.h 2007-02-22 21:29:03 +01:00 +++ 1.253/sql/handler.h 2007-02-22 21:29:03 +01:00 @@ -13,7 +13,19 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "backup0.h" + +/* +typedef int Backup_result_t; +namespace backup +{ + class Engine; +} + +typedef backup::Engine Backup_engine; +*/ + /* Definitions for parameters to do with handler-routines */ #ifdef USE_PRAGMA_INTERFACE @@ -553,6 +565,13 @@ void *buffer; }; + + +/* + Types for backup API +*/ + + /* handlerton is a singleton structure - one instance per storage engine - to provide access to storage engine functionality that works on the @@ -684,6 +703,12 @@ const char *name); uint32 license; /* Flag for Engine License */ void *data; /* Location for engines to keep personal structures */ + + /* + Backup API hook + */ + + Backup_result_t (*get_backup_engine)(handlerton *hton, Backup_engine* &be); }; --- 1.616/sql/sql_parse.cc 2007-02-22 21:29:03 +01:00 +++ 1.617/sql/sql_parse.cc 2007-02-22 21:29:03 +01:00 @@ -27,6 +27,7 @@ #include "sp_cache.h" #include "events.h" #include "event_data_objects.h" +#include "backup.h" #ifdef HAVE_OPENSSL /* @@ -2810,26 +2811,32 @@ case SQLCOM_BACKUP_TABLE: { - DBUG_ASSERT(first_table == all_tables && first_table != 0); + backup::do_backup(thd); +/* + DBUG_ASSERT(first_table == all_tables && first_table != 0); if (check_table_access(thd, SELECT_ACL, all_tables, 0) || check_global_access(thd, FILE_ACL)) - goto error; /* purecov: inspected */ - thd->enable_slow_log= opt_log_slow_admin_statements; + goto error; */ /* purecov: inspected */ +/* thd->enable_slow_log= opt_log_slow_admin_statements; res = mysql_backup_table(thd, first_table); select_lex->table_list.first= (byte*) first_table; lex->query_tables=all_tables; +*/ break; } case SQLCOM_RESTORE_TABLE: { - DBUG_ASSERT(first_table == all_tables && first_table != 0); + backup::do_restore(thd); +/* DBUG_ASSERT(first_table == all_tables && first_table != 0); if (check_table_access(thd, INSERT_ACL, all_tables, 0) || check_global_access(thd, FILE_ACL)) - goto error; /* purecov: inspected */ - thd->enable_slow_log= opt_log_slow_admin_statements; + goto error; +*/ /* purecov: inspected */ +/* thd->enable_slow_log= opt_log_slow_admin_statements; res = mysql_restore_table(thd, first_table); select_lex->table_list.first= (byte*) first_table; lex->query_tables=all_tables; +*/ break; } case SQLCOM_ASSIGN_TO_KEYCACHE: --- 1.385/sql/sql_show.cc 2007-02-22 21:29:03 +01:00 +++ 1.386/sql/sql_show.cc 2007-02-22 21:29:03 +01:00 @@ -4824,7 +4824,7 @@ mysql_schema_table() thd thread handler lex pointer to LEX - table_list pointer to table_list + table_list pointer to str. describing the table to be opened/created RETURN 0 success --- 1.382/sql/sql_table.cc 2007-02-22 21:29:03 +01:00 +++ 1.383/sql/sql_table.cc 2007-02-22 21:29:03 +01:00 @@ -1763,7 +1763,7 @@ new_error= Table_triggers_list::drop_all_triggers(thd, db, table->table_name); } - error|= new_error; + if( !if_exists ) error|= new_error; } } if (error) --- 1.533/sql/sql_yacc.yy 2007-02-22 21:29:04 +01:00 +++ 1.534/sql/sql_yacc.yy 2007-02-22 21:29:04 +01:00 @@ -5557,28 +5557,32 @@ restore: - RESTORE_SYM table_or_tables + RESTORE_SYM /* table_or_tables */ { Lex->sql_command = SQLCOM_RESTORE_TABLE; - WARN_DEPRECATED(yythd, "5.2", "RESTORE TABLE", +/* WARN_DEPRECATED(yythd, "5.2", "RESTORE TABLE", "MySQL Administrator (mysqldump, mysql)"); - } +*/ }; +/* table_list FROM TEXT_STRING_sys { Lex->backup_dir = $6.str; }; +*/ backup: - BACKUP_SYM table_or_tables + BACKUP_SYM /* table_or_tables */ { Lex->sql_command = SQLCOM_BACKUP_TABLE; - WARN_DEPRECATED(yythd, "5.2", "BACKUP TABLE", +/* WARN_DEPRECATED(yythd, "5.2", "BACKUP TABLE", "MySQL Administrator (mysqldump, mysql)"); - } +*/ }; + /* table_list TO_SYM TEXT_STRING_sys { Lex->backup_dir = $6.str; - }; + }; + */ checksum: CHECKSUM_SYM table_or_tables --- 1.154/sql/table.h 2007-02-22 21:29:04 +01:00 +++ 1.155/sql/table.h 2007-02-22 21:29:04 +01:00 @@ -1,9 +1,8 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +/* Copyright (C) 2000-2006 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,6 +17,7 @@ /* Structs that defines the TABLE */ class Item; /* Needed by ORDER */ +class Item_subselect; class GRANT_TABLE; class st_select_lex_unit; class st_select_lex; @@ -74,6 +74,9 @@ typedef struct st_filesort_info { IO_CACHE *io_cache; /* If sorted through filebyte */ + uchar **sort_keys; /* Buffer for sorting keys */ + byte *buffpek; /* Buffer for buffpek structures */ + uint buffpek_len; /* Max number of buffpeks in the buffer */ byte *addon_buf; /* Pointer to a buffer if sorted with fields */ uint addon_length; /* Length of the buffer */ struct st_sort_addon_field *addon_field; /* Pointer to the fields info */ @@ -112,6 +115,7 @@ typedef struct st_table_share { + st_table_share() {} /* Remove gcc warning */ /* hash of field names (contains pointers to elements of field array) */ HASH name_hash; /* hash of field names */ MEM_ROOT mem_root; @@ -860,6 +864,7 @@ procedure. */ void reinit_before_use(THD *thd); + Item_subselect *containing_subselect(); private: bool prep_check_option(THD *thd, uint8 check_opt_type); --- 1.116/storage/archive/ha_archive.cc 2007-02-22 21:29:04 +01:00 +++ 1.117/storage/archive/ha_archive.cc 2007-02-22 21:29:04 +01:00 @@ -25,6 +25,7 @@ #include <mysql/plugin.h> + /* First, if you want to understand storage engines you should look at ha_example.cc and ha_example.h. @@ -117,10 +118,6 @@ pthread_mutex_t archive_mutex; static HASH archive_open_tables; -/* The file extension */ -#define ARZ ".ARZ" // The data file -#define ARN ".ARN" // Files used during an optimize call -#define ARM ".ARM" // Meta file /* uchar + uchar + ulonglong + ulonglong + ulonglong + ulonglong + FN_REFLEN + uchar @@ -185,7 +182,10 @@ archive_hton->db_type=DB_TYPE_ARCHIVE_DB; archive_hton->create=archive_create_handler; archive_hton->flags=HTON_NO_FLAGS; - + +// archive_backup::init(); + archive_hton->get_backup_engine= archive_backup_engine; + if (pthread_mutex_init(&archive_mutex, MY_MUTEX_INIT_FAST)) goto error; if (hash_init(&archive_open_tables, system_charset_info, 32, 0, 0, @@ -430,6 +430,7 @@ share->table_name= tmp_name; share->crashed= FALSE; share->archive_write_open= FALSE; + fn_format(share->data_file_name, table_name, "", ARZ,MY_REPLACE_EXT|MY_UNPACK_FILENAME); fn_format(meta_file_name, table_name, "", ARM, @@ -474,6 +475,38 @@ } +int ha_archive::flush(bool lock) +{ + int rc= 0; + DBUG_ENTER("ha_archive::flush"); + + if (lock) + pthread_mutex_lock(&archive_mutex); + + if (share->archive_write_open) + { + DBUG_PRINT("archive", ("flushing table data")); + if (azflush(&(share->archive_write), Z_FULL_FLUSH)) // Z_SYNC_FLUSH or Z_FULL_FLUSH + rc= 1; + share->forced_flushes++; + } + + (void)write_meta_file(share->meta_file, share->rows_recorded, + share->auto_increment_value, + share->forced_flushes, + share->real_path, + share->dirty); + + //if (my_close(share->meta_file, MYF(0))) + // rc= 1; + + if (lock) + pthread_mutex_unlock(&archive_mutex); + + DBUG_RETURN(rc); +} + + /* Free the share. See ha_example.cc for a description. @@ -489,6 +522,7 @@ pthread_mutex_lock(&archive_mutex); if (!--share->use_count) { + DBUG_PRINT("info", ("archive removing share for table %s",share->table_name)); hash_delete(&archive_open_tables, (byte*) share); thr_lock_delete(&share->lock); VOID(pthread_mutex_destroy(&share->mutex)); @@ -782,6 +816,7 @@ char *data_ptr; uint32 size= ((Field_blob*) table->field[*ptr])->get_length(); + if (size) { ((Field_blob*) table->field[*ptr])->get_ptr(&data_ptr); @@ -789,7 +824,8 @@ if (written != (my_off_t)size) DBUG_RETURN(errno ? errno : -1); } - } + }; + DBUG_RETURN(0); } @@ -901,6 +937,7 @@ share->rows_recorded++; rc= real_write_row(buf, &(share->archive_write)); + error: pthread_mutex_unlock(&share->mutex); if (read_buf) @@ -908,7 +945,6 @@ DBUG_RETURN(rc); } - void ha_archive::get_auto_increment(ulonglong offset, ulonglong increment, ulonglong nb_desired_values, --- 1.54/storage/archive/ha_archive.h 2007-02-22 21:29:04 +01:00 +++ 1.55/storage/archive/ha_archive.h 2007-02-22 21:29:04 +01:00 @@ -20,6 +20,24 @@ #include <zlib.h> #include "azlib.h" +#include "backup.h" + +/* The file extension */ +#define ARZ ".ARZ" // The data file +#define ARN ".ARN" // Files used during an optimize call +#define ARM ".ARM" // Meta file + + +class ha_archive; + +namespace archive_backup +{ + void init(); + void done(); + class Engine; + class Table_backup; // needs to be friend of ha_archive (see abackup.cc for def) +} + /* Please read ha_archive.cc first. If you are looking for more general answers on how storage engines work, look at ha_example.cc and @@ -42,6 +60,8 @@ ulonglong forced_flushes; ulonglong mean_rec_length; char real_path[FN_REFLEN]; + + uint backup_stream; } ARCHIVE_SHARE; /* @@ -51,7 +71,7 @@ #define ARCHIVE_VERSION 2 class ha_archive: public handler -{ +{ THR_LOCK_DATA lock; /* MySQL lock */ ARCHIVE_SHARE *share; /* Shared lock info */ azio_stream archive; /* Archive file we are working with */ @@ -114,6 +134,7 @@ char *real_path, bool dirty); ARCHIVE_SHARE *get_share(const char *table_name, TABLE *table, int *rc); + int flush(bool lock=TRUE); int free_share(ARCHIVE_SHARE *share); int init_archive_writer(); bool auto_repair() const { return 1; } // For the moment we just do this @@ -136,5 +157,9 @@ bool is_crashed() const; int check(THD* thd, HA_CHECK_OPT* check_opt); bool check_and_repair(THD *thd); + +// archive_backup::Engine *backup_engine_instance; + friend class archive_backup::Table_backup; }; +Backup_result_t archive_backup_engine(handlerton *self, Backup_engine* &be); --- 1.9/storage/archive/Makefile.am 2007-02-22 21:29:04 +01:00 +++ 1.10/storage/archive/Makefile.am 2007-02-22 21:29:04 +01:00 @@ -1,18 +1,17 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# +# Copyright (C) 2005-2006 MySQL AB +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# +# the Free Software Foundation; version 2 of the License. +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #called from the top level Makefile --- 1.63/mysql-test/r/ps_1general.result 2007-02-22 21:29:04 +01:00 +++ 1.64/mysql-test/r/ps_1general.result 2007-02-22 21:29:04 +01:00 @@ -259,7 +259,6 @@ execute stmt4; Database information_schema -cluster mysql test prepare stmt4 from ' show tables from test like ''t2%'' '; --- 1.37/mysql-test/t/ps_1general.test 2007-02-22 21:29:04 +01:00 +++ 1.38/mysql-test/t/ps_1general.test 2007-02-22 21:29:04 +01:00 @@ -453,9 +453,9 @@ prepare stmt1 from ' analyze table t1 ' ; prepare stmt1 from ' checksum table t1 ' ; prepare stmt1 from ' repair table t1 ' ; ---error ER_UNSUPPORTED_PS -prepare stmt1 from ' restore table t1 from ''data.txt'' ' ; -## handler +#--error ER_UNSUPPORTED_PS +#prepare stmt1 from ' restore table t1 from ''data.txt'' ' ; +# handler --error ER_UNSUPPORTED_PS prepare stmt1 from ' handler t1 open '; --- 1.7/unittest/mysys/Makefile.am 2007-02-22 21:29:04 +01:00 +++ 1.8/unittest/mysys/Makefile.am 2007-02-22 21:29:04 +01:00 @@ -14,12 +14,19 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include -AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap +AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap -I$(top_srcdir)/sql LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/strings/libmystrings.a -noinst_PROGRAMS = bitmap-t base64-t my_atomic-t +noinst_PROGRAMS = bitmap-t base64-t my_atomic-t # string-t +#string_t_SOURCES = string-t.cc +#string_t_LDADD = \ +# $(top_builddir)/libmysqld/libmysqld.a \ +# @mysql_plugin_libs@ +# $(top_builddir)/vio/libvio.a \ +# $(yassl_inc_libs) + \ No newline at end of file --- 1.118/mysql-test/r/sp-error.result 2007-02-22 21:29:04 +01:00 +++ 1.119/mysql-test/r/sp-error.result 2007-02-22 21:29:04 +01:00 @@ -1098,18 +1098,6 @@ RETURN 1; END| ERROR 0A000: Not allowed to return a result set from a function -CREATE FUNCTION bug13012() RETURNS INT -BEGIN -BACKUP TABLE t1 TO '/tmp'; -RETURN 1; -END| -ERROR 0A000: Not allowed to return a result set from a function -CREATE FUNCTION bug13012() RETURNS INT -BEGIN -RESTORE TABLE t1 FROM '/tmp'; -RETURN 1; -END| -ERROR 0A000: Not allowed to return a result set from a function create table t1 (a int)| CREATE PROCEDURE bug13012_1() REPAIR TABLE t1| CREATE FUNCTION bug13012_2() RETURNS INT --- 1.244/mysql-test/r/sp.result 2007-02-22 21:29:04 +01:00 +++ 1.245/mysql-test/r/sp.result 2007-02-22 21:29:04 +01:00 @@ -2182,20 +2182,20 @@ call bug3426(1000, @i)| select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time| @i time -2 01-01-1970 03:16:40 +2 01-01-1970 12:16:40 call bug3426(NULL, @i)| select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time| @i time -1 01-01-1970 03:00:10 +1 01-01-1970 12:00:10 alter procedure bug3426 sql security invoker| call bug3426(NULL, @i)| select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time| @i time -1 01-01-1970 03:00:10 +1 01-01-1970 12:00:10 call bug3426(1000, @i)| select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time| @i time -2 01-01-1970 03:16:40 +2 01-01-1970 12:16:40 drop procedure bug3426| create table t3 ( id int unsigned auto_increment not null primary key, @@ -4389,21 +4389,6 @@ a - local variable in a nested compound statement drop procedure bug5967| drop procedure if exists bug13012| -create procedure bug13012() -BEGIN -REPAIR TABLE t1; -BACKUP TABLE t1 to '../tmp'; -DROP TABLE t1; -RESTORE TABLE t1 FROM '../tmp'; -END| -call bug13012()| -Table Op Msg_type Msg_text -test.t1 repair status OK -Table Op Msg_type Msg_text -test.t1 backup status OK -Table Op Msg_type Msg_text -test.t1 restore status OK -drop procedure bug13012| create view v1 as select * from t1| create procedure bug13012() BEGIN --- 1.115/mysql-test/t/sp-error.test 2007-02-22 21:29:04 +01:00 +++ 1.116/mysql-test/t/sp-error.test 2007-02-22 21:29:04 +01:00 @@ -1565,18 +1565,18 @@ REPAIR TABLE t1; RETURN 1; END| ---error ER_SP_NO_RETSET -CREATE FUNCTION bug13012() RETURNS INT -BEGIN - BACKUP TABLE t1 TO '/tmp'; - RETURN 1; -END| ---error ER_SP_NO_RETSET -CREATE FUNCTION bug13012() RETURNS INT -BEGIN - RESTORE TABLE t1 FROM '/tmp'; - RETURN 1; -END| +#--error ER_SP_NO_RETSET +#CREATE FUNCTION bug13012() RETURNS INT +#BEGIN +# BACKUP TABLE t1 TO '/tmp'; +# RETURN 1; +#END| +#--error ER_SP_NO_RETSET +#CREATE FUNCTION bug13012() RETURNS INT +#BEGIN +# RESTORE TABLE t1 FROM '/tmp'; +# RETURN 1; +#END| create table t1 (a int)| CREATE PROCEDURE bug13012_1() REPAIR TABLE t1| CREATE FUNCTION bug13012_2() RETURNS INT --- 1.211/mysql-test/t/sp.test 2007-02-22 21:29:04 +01:00 +++ 1.212/mysql-test/t/sp.test 2007-02-22 21:29:04 +01:00 @@ -5248,16 +5248,16 @@ --disable_warnings drop procedure if exists bug13012| # Disable warnings also for BACKUP/RESTORE: they are deprecated. -create procedure bug13012() -BEGIN - REPAIR TABLE t1; - BACKUP TABLE t1 to '../tmp'; - DROP TABLE t1; - RESTORE TABLE t1 FROM '../tmp'; -END| -call bug13012()| +#create procedure bug13012() +#BEGIN +# REPAIR TABLE t1; +# BACKUP TABLE t1 to '../tmp'; +# DROP TABLE t1; +# RESTORE TABLE t1 FROM '../tmp'; +#END| +#call bug13012()| --enable_warnings -drop procedure bug13012| +#drop procedure bug13012| create view v1 as select * from t1| create procedure bug13012() BEGIN --- 1.270/BitKeeper/etc/ignore 2007-02-22 21:29:04 +01:00 +++ 1.271/BitKeeper/etc/ignore 2007-02-22 21:29:04 +01:00 @@ -55,15 +55,20 @@ ./mysql.sln ./mysql.suo ./prepare +.cdtproject .defs.mk .depend .depend.mk .deps +.externalToolBuilders/org.eclipse.cdt.make.core.ScannerConfigBuilder.launch .gdb_history .gdbinit .libs .o .out +.project +.settings/org.eclipse.cdt.core.prefs +.settings/org.eclipse.ltk.core.refactoring.prefs .snprj/* .vimrc 50 @@ -1005,6 +1010,7 @@ libmysqld/.deps/tztime.Po libmysqld/.deps/uniques.Po libmysqld/.deps/unireg.Po +libmysqld/backup.cc libmysqld/backup_dir libmysqld/client.c libmysqld/client_settings.h --- 1.7/storage/archive/CMakeLists.txt 2007-02-22 21:29:04 +01:00 +++ 1.8/storage/archive/CMakeLists.txt 2007-02-22 21:29:04 +01:00 @@ -1,3 +1,18 @@ +# Copyright (C) 2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (rafal:1.2413) | rsomla | 22 Feb |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.707 sec. using MySQL 5.1.14-beta-log