mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
107 commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
unknown
|
af9f7a239e |
re-push of Bug 29536 for 5.1.22: timestamp inconsistent in replication around 1970
MySQL replicates the time zone only when operations that involve it are performed. This is controlled by a flag. But this flag is set only on successful operation. The flag must be set also when there is an error that involves a timezone (so the master would replicate the error to the slaves). mysql-test/suite/rpl/r/rpl_timezone.result: repush of Bug 29536 for 5.1.22 tree: test case mysql-test/suite/rpl/t/rpl_timezone.test: repush of Bug 29536 for 5.1.22 tree: test case sql/field.cc: re-push of Bug 29536 for 5.1.22: move setting of the flag before the operation (so it apples to errors as well). sql/time.cc: re-push of Bug 29536 for 5.1.22: move setting of the flag before the operation (so it apples to errors as well). |
||
|
unknown
|
9b49c3cb71 |
recommit of Bug 25228 for 5.1.22: rpl_relayspace.test fails on powermacg5, vm-win2003-32-a
A test case was waiting for a fixed number of seconds for a specific state of the slave IO thread to take place. Fixed by waiting in a loop for that specific thread state instead (or timeout). mysql-test/suite/rpl/t/rpl_relayspace.test: recommit of Bug 25228 for 5.1.22: fixed test case |
||
|
unknown
|
2bdfe4d7b0 |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22 |
||
|
unknown
|
4f8bcc8eda | unable to reproduce bug, perhaps pushbuild can give more info | ||
|
unknown
|
e81734ce53 |
Bug#28744, Bug#29363
mysql-test/suite/rpl/include/rpl_mixed_ddl.inc: updated main test for DDL mysql-test/suite/rpl/include/rpl_mixed_dml.inc: updated main test for DML mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result: updated result file mysql-test/suite/rpl/t/disabled.def: updated disabled.def |
||
|
unknown
|
a59096c554 |
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
into mysql.com:/data1/mysql-5.1-target-5.1.22 |
||
|
unknown
|
9534a41c3e |
ndb_dd_ddl.test, ndb_dd_ddl.result:
Updated test case to correst inconsistant results on different OS per #bug30559 mysql-test/suite/ndb/t/ndb_dd_ddl.test: Updated test case to correst inconsistant results on different OS per #bug30559 mysql-test/suite/ndb/r/ndb_dd_ddl.result: Updated test case to correst inconsistant results on different OS per #bug30559 |
||
|
unknown
|
b07fc5442d |
Merge trift2.:/MySQL/M51/clone-5.1
into trift2.:/MySQL/M51/target-5.1.22 |
||
|
unknown
|
833afa54ab |
ndb_dd_dump.test, ndb_dd_dump.result:
uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas mysql-test/suite/ndb/t/ndb_dd_dump.test: uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas mysql-test/suite/ndb/r/ndb_dd_dump.result: uncommented the test case stated in bug18856 and commiting to mysql-5.1-target-5.1.22 clone per Tomas |
||
|
unknown
|
02f1b317b4 |
Merge bk-internal:/home/bk/mysql-5.1-marvel
into mysql.com:/data0/mysqldev/my/build-200708161639-5.1.21-beta/mysql-5.1-release sql/log_event.cc: Auto merged |
||
|
unknown
|
10ef77fc3b |
Fixed errors found by pushbuild:
Fixed failing func_misc test for embedded server Added casts to avoid compiler warnings Removed Table_locks_immediate as it's depending on log file cacheing Changed type of get_time() to avoid warnings Removed testing if purger master logs succeded as this is not deterministic libmysqld/lib_sql.cc: Fixed failing func_misc test for embedded server mysql-test/mysql-test-run.pl: Shut first down slaves, then masters. This should avoid some errors in the log file about not being able to connect to master during shutdown mysql-test/r/func_misc.result: Move DROP TABLE's first mysql-test/r/status.result: Removed Table_locks_immediate as it's depending on log file cacheing mysql-test/suite/ndb/r/ndb_binlog_basic.result: Removed testing if purger master logs succeded as this is not deterministic mysql-test/suite/ndb/t/ndb_binlog_basic.test: Removed testing if purger master logs succeded as this is not deterministic mysql-test/t/func_misc.test: Move DROP TABLE's first mysql-test/t/status.test: Removed Table_locks_immediate as it's depending on log file cacheing sql/log_event.cc: Added cast to avoid warnings sql/log_event.h: Changed type of get_time() to avoid warnings |
||
|
unknown
|
1c47af79da |
Bug#30322 Server crashes on selecting from i_s.columns when cluster is running -regression
disable partition processing if we open frm file only mysql-test/suite/ndb/r/ndb_dd_basic.result: test result mysql-test/suite/ndb/t/ndb_dd_basic.test: test case sql/table.cc: disable partition processing if we open frm file only |
||
|
unknown
|
422173a8b9 |
Updated funcs_1 test and result files (not including cluster) for 5.1.21
mysql-test/suite/funcs_1/r/innodb__datadict.result: Updated result file mysql-test/suite/funcs_1/r/innodb_func_view.result: Updated result file mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: Updated result file mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: Updated result file mysql-test/suite/funcs_1/r/innodb_trig_03e.result: Updated result file mysql-test/suite/funcs_1/r/innodb_views.result: Updated result file mysql-test/suite/funcs_1/r/memory__datadict.result: Updated result file mysql-test/suite/funcs_1/r/memory_func_view.result: Updated result file mysql-test/suite/funcs_1/r/memory_storedproc_07.result: Updated result file mysql-test/suite/funcs_1/r/memory_storedproc_08.result: Updated result file mysql-test/suite/funcs_1/r/memory_trig_03e.result: Updated result file mysql-test/suite/funcs_1/r/memory_views.result: Updated result file mysql-test/suite/funcs_1/r/myisam__datadict.result: Updated result file mysql-test/suite/funcs_1/r/myisam_func_view.result: Updated result file mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: Updated result file mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: Updated result file mysql-test/suite/funcs_1/r/myisam_trig_03e.result: Updated result file mysql-test/suite/funcs_1/r/myisam_views.result: Updated result file mysql-test/suite/funcs_1/views/views_master.inc: updated test file |
||
|
unknown
|
5809417e40 |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build mysql-test/lib/mtr_report.pl: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/show_check.test: Auto merged mysys/charset.c: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.h: Auto merged sql/item_timefunc.cc: Auto merged sql/log_event.cc: Auto merged |
||
|
unknown
|
82d28fada7 |
WL#3732 Information schema optimization
client/mysqldump.c:
table type compare is changed to case insensitive
mysql-test/r/information_schema.result:
test result
mysql-test/r/information_schema_db.result:
result fix
mysql-test/suite/ndb/r/ndb_alter_table.result:
result fix
mysql-test/suite/ndb/r/ndb_temporary.result:
result fix
mysql-test/t/information_schema.test:
test case
sql/ha_ndbcluster.cc:
char* variables are changed to LEX_STRING
sql/ha_ndbcluster.h:
char* variables are changed to LEX_STRING
sql/ha_ndbcluster_binlog.cc:
char* variables are changed to LEX_STRING
sql/handler.cc:
char* variables are changed to LEX_STRING
sql/handler.h:
char* variables are changed to LEX_STRING
sql/sql_base.cc:
Modified functions which are used during open table process
according to table opening method and requested_object.
sql/sql_select.cc:
Add support for I_S tables into select_describe() function
sql/sql_show.cc:
1. Added initialization of 'open_method' to 'st_field_info' structs.
2. Added initialization of 'i_s_requested_object' to 'ST_SCHEMA_TABLE' structs.
3. New function which calculates database name and table name values
from 'where' condition if it's possible
void get_lookup_field_values(THD *thd, COND *cond, TABLE_LIST *table,
LOOKUP_FIELD_VALUES *lookup_field_vals);
4. New function which set table open method
setup_table_open_method(TABLE_LIST *tables,
ST_SCHEMA_TABLE *schema_table,
enum enum_schema_tables schema_table_idx)
5. New function
int make_db_list(THD *thd, List<LEX_STRING> *files,
LOOKUP_FIELD_VALUES *lookup_field_vals,
bool *with_i_schema)
6. New function
int make_table_name_list(THD *thd, List<LEX_STRING> *files, LEX *lex,
LOOKUP_FIELD_VALUES *lookup_field_vals,
bool with_i_schema, LEX_STRING *db_name)
7. Modified 'get_all_tables' function according to new schema(see wl#3732).
sql/sql_show.h:
char* variables are changed to LEX_STRING
sql/table.cc:
Modified functions which are used during open table process
according to table opening method and requested_object.
sql/table.h:
1. added new constants(open_method)
#define SKIP_OPEN_TABLE 0
#define OPEN_FRM_ONLY 1
#define OPEN_FULL_TABLE 2
2. Added new field 'open_method' into struct st_field_info;
uint open_method;
3. Added new field into ST_SCHEMA_TABLE struct
uint i_s_requested_object; /* the object we need to open(TABLE | VIEW) */.
4. Added new field to TABLE_LIST struct.
uint i_s_requested_object;
This field is set from ST_SCHEMA_TABLE.i_s_requested_object
for processed table before opening.
5. Added new fields to TABLE_LIST struct, used for 'explain select' for I_S table
bool has_db_lookup_value;
bool has_table_lookup_value;
uint table_open_method;
sql/unireg.h:
added new constants
|
||
|
unknown
|
339434317e |
WL#3228 (NDB) : RBR using different table defs on slave/master
This patch corrects a problem found during testing on Solaris. The code changes how length values are retrieved on big endian machines. The patch allows the rpl_extraColmaster tests to run on these machines. mysql-test/suite/rpl/r/rpl_row_create_table.result: WL#3228 (NDB) : RBR using different table defs on slave/master New result file with changes from merge of 5.1 main. mysql-test/suite/rpl/t/disabled.def: WL#3228 (NDB) : RBR using different table defs on slave/master Disable the rpl_rwo_extraColmaster_ndb test (WL#3915) because the code fails on Big Endian machines. See BUG#29549 for more details. sql/field.cc: WL#3228 (NDB) : RBR using different table defs on slave/master This patch corrects a problem found during testing on Solaris. The code changes how the store_length method processes requests for values on big endian machines. sql/field.h: WL#3228 (NDB) : RBR using different table defs on slave/master This patch corrects a problem found during testing on Solaris. The code changes how the store_length method processes requests for values on big endian machines. It also changes the get_packed_length() method to use the endian-ness of the host in getting the length + packlength. sql/rpl_record.cc: WL#3228 (NDB) : RBR using different table defs on slave/master This patch turns on the little endian switch (db_low_byte_first) in order to ensure the values are unpack correctly from binlog as they are stored in little endian format in binlog. sql/rpl_utility.cc: WL#3228 (NDB) : RBR using different table defs on slave/master This patch corrects a problem found during testing on Solaris. The code changes how the calculated field size method processes requests for values on big endian machines. |
||
|
unknown
|
9eea112d9d |
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1
into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge mysql-test/lib/mtr_report.pl: Auto merged mysql-test/t/disabled.def: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/log_event.cc: Auto merged mysql-test/suite/rpl/r/rpl_row_create_table.result: Merge with 5.1 main. |
||
|
unknown
|
15835a5693 |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 mysql-test/r/show_check.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/show_check.test: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/log.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged |
||
|
unknown
|
31e33aba7b |
Addendum to bug 27417: poor test results fixes.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Addendum to bug 27417: removed tests for another bug mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test: Addendum to bug 27417: removed tests for another bug mysql-test/suite/rpl/r/rpl_row_create_table.result: Addendum to bug 27417: changes to non-transactional tables should be logged even on rollback. |
||
|
unknown
|
8e1ec7ab5e | merge of the fix for bug 17417 5.0-opt->5.1-opt | ||
|
unknown
|
5d4a257332 |
Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into linux.site:/home/omer/source/jrg51 scripts/make_binary_distribution.sh: Auto merged sql/field.cc: Auto merged |
||
|
unknown
|
d605bc5608 |
WL#3915 : (NDB) master's cols > slave
Corrective patch to fix test failures in pushbuild and add assertions to help debug rpl_extraColmaster test failures. mysql-test/extra/rpl_tests/rpl_row_tabledefs.test: WL#3915 : (NDB) master's cols > slave Change test to omit the port numbers in the result file. mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: WL#3915 : (NDB) master's cols > slave Corrected result file. mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: WL#3915 : (NDB) master's cols > slave Corrected result file. sql/rpl_utility.cc: WL#3915 : (NDB) master's cols > slave Added assertions to assist in debugging. |
||
|
unknown
|
e5fd6b3c71 |
(Pushing for Andrei)
Merge magare.gmz:/home/kgeorge/mysql/work/B27417-5.0-opt into magare.gmz:/home/kgeorge/mysql/work/B27417-5.1-opt mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_table.cc: Auto merged mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: merge of bug 27471 from 5.0-opt to 5.1-opt sql/log.cc: merge of bug 27471 from 5.0-opt to 5.1-opt sql/set_var.cc: merge of bug 27471 from 5.0-opt to 5.1-opt sql/sp_head.cc: merge of bug 27471 from 5.0-opt to 5.1-opt sql/sql_delete.cc: merge of bug 27471 from 5.0-opt to 5.1-opt sql/sql_insert.cc: merge of bug 27471 from 5.0-opt to 5.1-opt sql/sql_load.cc: merge of bug 27471 from 5.0-opt to 5.1-opt sql/sql_parse.cc: merge of bug 27471 from 5.0-opt to 5.1-opt sql/sql_update.cc: merge of bug 27471 from 5.0-opt to 5.1-opt |
||
|
unknown
|
aee08c3d06 |
WL#3915 : (NDB) master's cols > slave
Changed test to enable easier debugging. mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test: WL#3915 : (NDB) master's cols > slave Changes to test in order to aide debugging. mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result: WL#3915 : (NDB) master's cols > slave New result file for test changes. mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result: WL#3915 : (NDB) master's cols > slave New result file for test changes. mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result: WL#3915 : (NDB) master's cols > slave New result file for test changes. |
||
|
unknown
|
61b86c4f36 |
Merge linux.site:/home/omer/source/bld50_0724
into linux.site:/home/omer/source/jrg51 mysql-test/suite/funcs_1/datadict/datadict_master.inc: Auto merged mysql-test/suite/funcs_1/r/innodb__datadict.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/innodb_views.result: Auto merged mysql-test/suite/funcs_1/r/memory__datadict.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/memory_views.result: Auto merged mysql-test/suite/funcs_1/r/myisam__datadict.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_09.result: Auto merged mysql-test/suite/funcs_1/triggers/triggers_0102.inc: Auto merged mysql-test/suite/funcs_1/views/func_view.inc: Auto merged mysql-test/suite/funcs_1/r/innodb_func_view.result: manual merge mysql-test/suite/funcs_1/r/memory_func_view.result: manual merge mysql-test/suite/funcs_1/r/myisam_func_view.result: manual merge mysql-test/suite/funcs_1/r/myisam_views.result: manual merge |
||
|
unknown
|
05b84eb4f3 |
WL#3228 (NDB) : RBR using different table defs on slave/master
This patch includes changes to result files for tests issuing BINLOG queries. The values have changed due to a size difference in the table map. mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: WL#3228 (NDB) : RBR using different table defs on slave/master New results file for changes to binlog table map log event size. mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: WL#3228 (NDB) : RBR using different table defs on slave/master New results file for changes to binlog table map log event size. |
||
|
unknown
|
f5ef5cb0af |
WL#3228 (RBR using different table defs on slave/master):
Fixing tests and results to work when replicating to fewer columns on slave than on master. One test that previously should fail, now works, and some log positions have changed as a result of adding metadata to the events. mysql-test/extra/rpl_tests/rpl_row_tabledefs.test: Replication to fewer columns on slave now works. mysql-test/include/wait_for_slave_to_stop.inc: Adding subsitutions for SHOW SLAVE STATUS mysql-test/suite/binlog/r/binlog_row_binlog.result: Result change. mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result: Result change. mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Result change. mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Result change. mysql-test/suite/rpl/r/rpl_slave_skip.result: Result change. mysql-test/suite/rpl/t/rpl_skip_error-slave.opt: Error number changed [!] |
||
|
unknown
|
df126d23af |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1 |
||
|
unknown
|
d4671354f1 |
WL#3228 (NDB) : RBR using different table defs on slave/master
This patch adds the ability to store extra field metadata in the table map event. This data can include pack_length() or field_lenght() for fields such as CHAR or VARCHAR enabling developers to add code that can check for compatibilty between master and slave columns. More importantly, the extra field metadata can be used to store data from the master correctly should a VARCHAR field on the master be <= 255 bytes while the same field on the slave is > 255 bytes. The patch also includes the needed changes to unpack to ensure that data which is smaller on the master can be unpacked correctly on the slave. WL#3915 : (NDB) master's cols > slave Slave starts accepting and handling rows of master's tables which have more columns. The most important part of implementation is how to caclulate the amount of bytes to skip for unknown by slave column. mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test: WL#3228 : RBR using different table defs on slave/master This patch changes the test to coincide with changes to binlog size of table map event. mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. mysql-test/suite/rpl/r/rpl_row_create_table.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. mysql-test/suite/rpl/r/rpl_row_log.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. mysql-test/suite/rpl/r/rpl_row_log_innodb.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. mysql-test/suite/rpl/r/rpl_row_max_relay_size.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. mysql-test/suite/rpl/r/rpl_row_until.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. mysql-test/suite/rpl/r/rpl_skip_error.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. mysql-test/suite/rpl/t/disabled.def: WL#3915 master's cols > slave Disabled the rpl_stm_extraColmaster_ndb test because statement-based replication is not supported in NDB at this time. It can be enabled when statement-based replication for NDB is released. mysql-test/suite/rpl/t/rpl_row_create_table.test: WL#3228 : RBR using different table defs on slave/master This patch corrects binlog positions a result of the change to the size of the tablemap log event. mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test: WL#3228 : RBR using different table defs on slave/master This patch corrects binlog positions a result of the change to the size of the tablemap log event. mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result: WL#3228 : RBR using different table defs on slave/master This patch contains a new result file as a result of the change to the size of the tablemap log event. sql/field.cc: WL#3228 : RBR using different table defs on slave/master This patch includes updates to the unpack() methods for the variable length fields. A new parameter was added (from_length) that is the value stored in the field_metadata of the table map from the table_def class. If the value is non-zero and less than what the field on the slave is then use the from_length else use the original value from the field on the slave. sql/field.h: L#3228 : RBR using different table defs on slave/master This patch includes updates to the unpack() methods for the variable length fields. A new parameter was added (from_length) that is the value stored in the field_metadata of the table map from the table_def class. sql/log_event.cc: WL#3228 : RBR using different table defs on slave/master This patch adds methods to calculate the field metadata size, prepare the field metadata for writing to the binlog, and additions to the Table_map_log_event::write_body method to include the field metadata in the table map that is written to the binlog. WL#3915 master's cols > slave copying extra (slave's) fields returns early if master's table version is wider; removing assert in the way of master > slave cols. sql/log_event.h: WL#3228 : RBR using different table defs on slave/master This patch adds method declarations and variables needed to support storing field metadata in the table map that is written to the binlog. sql/rpl_record.cc: WL#3228 : RBR using different table defs on slave/master This patch modifies the unpack_row() method to unpack fields passing in the value from the table_def class. This value is the extra field metadata stored there from the master. WL#3915 master's cols > slave adding a snippet that shift exectution curson donw the row skipping unknown by slave fields' data. sql/rpl_rli.h: WL#3228 : RBR using different table defs on slave/master This patch adds a helper function to retrieve the table_def for a given table in the RPL_TABLE_LIST structure. sql/rpl_utility.cc: WL#3228 : RBR using different table defs on slave/master This patch adds a helper method that retrieves the correct size parameter for the field. This method is used to compare the size as sent by the master with that on the slave for all types of fields that can vary in size and storage requirements. WL#3915 master's cols > slave Remove warning message for master's cols > slave. sql/rpl_utility.h: WL#3228 : RBR using different table defs on slave/master This patch changes the table_def class constructor to pass in the raw data read from the table map and extract it into an array of dimension size (number of fields). It also adds a method to return the field metadata for any field. The method returns the data stored in the table map or 0 if no data was stored for that field. Lastly, a method to return the results of field->maybe_null() is included so that the slave can determine if a field that is not on the slave is null. mysql-test/suite/rpl/t/rpl_colSize.test: WL#3228 : RBR using different table defs on slave/master This patch contains a new test designed to test the feature of having columns on the master that are smaller than what is on the slave. mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-master.opt: WL#3915 master's cols > slave option for innodb mysql-test/suite/rpl/t/rpl_extraColmaster_innodb-slave.opt: WL#3915 master's cols > slave option for innodb mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test: WL#3915 master's cols > slave Test of innodb. Test runs in both statement- and row-based replication. mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test: WL#3915 master's cols > slave Test of myisam. Test runs in both statement- and row-based replication. mysql-test/suite/rpl/r/rpl_colSize.result: WL#3228 : RBR using different table defs on slave/master This patch contains a result file for the new test designed to test the feature of having columns on the master that are smaller than what is on the slave. mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test: WL#3915 master's cols > slave Test of ndb. Test runs in row-based replication. mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test: WL#3915 master's cols > slave Test of ndb. Test runs in statement-based replication. mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result: WL#3915 master's cols > slave new results mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result: WL#3915 master's cols > slave new results mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test: WL#3915 master's cols > slave basic tests checking altering and skipping extra fields by slave. The fields can be of any possible types. mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result: WL#3915 master's cols > slave new results |
||
|
unknown
|
975acfbb60 |
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into kindahl-laptop.dnsalias.net:/home/bk/b27972-mysql-5.1-rpl mysql-test/suite/rpl_ndb/t/disabled.def: Auto merged |
||
|
unknown
|
7b9a6b1b37 |
Merge gleb.loc:/home/uchum/work/bk/5.1
into gleb.loc:/home/uchum/work/bk/5.1-opt |
||
|
unknown
|
5fb351ae07 |
rpl_session_var.test fixed to not depend on mysql_test_run parameters
mysql-test/suite/rpl/r/rpl_session_var.result: result fixed mysql-test/suite/rpl/t/rpl_session_var.test: test fixed |
||
|
unknown
|
baf24e69da |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/29878/my51-29878 |
||
|
unknown
|
8feaed2ae7 |
Merge mysql.com:/home/hf/work/29878/my50-29878
into mysql.com:/home/hf/work/29878/my51-29878 mysql-test/suite/rpl/r/rpl_session_var.result: Auto merged mysql-test/suite/rpl/t/rpl_session_var.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_strfunc.h: Auto merged |
||
|
unknown
|
d47763406d |
fixing the 5.1-opt merge of the fix for bug 29571:
cannot check the statments in the binlog for row based replication. |
||
|
unknown
|
39f3cda7c7 |
Fix a bad BitKeeper dependency structure for the "funcs_1" suite:
Step 2: Restore the 5.1 contents in the 5.0-dependent files. mysql-test/suite/funcs_1/cursors/cursors_master.test: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/datadict/datadict_master.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/datadict/datadict_tables.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb__datadict.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_func_view.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_storedproc.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_0102.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_03.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_0407.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_08.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_09.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_trig_frkey.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/innodb_views.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory__datadict.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_func_view.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_storedproc.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_trig_0102.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_trig_03.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_trig_0407.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_trig_08.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_trig_09.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_trig_1011ext.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/memory_views.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam__datadict.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_func_view.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_storedproc.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_trig_0102.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_trig_03.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_trig_0407.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_trig_08.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_trig_09.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/r/myisam_views.result: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/storedproc/storedproc_02.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/storedproc/storedproc_10.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/storedproc/storedproc_master.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/triggers/triggers_0102.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/triggers/triggers_03.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/triggers/triggers_0407.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/triggers/triggers_08.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/triggers/triggers_09.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/views/func_view.inc: Restore the 5.1 contents in the 5.0-dependent file. mysql-test/suite/funcs_1/views/views_master.inc: Restore the 5.1 contents in the 5.0-dependent file. |
||
|
unknown
|
4fb6815468 |
BUG#27972 (Test failure for rpl_ndb_circular_simplex):
Removing a RESET MASTER inside the test since that will change binlog positions in such a manner that the dual masters lose track of where they acually are. mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result: Result change. mysql-test/suite/rpl_ndb/t/disabled.def: Enabling test. mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test: Removing a RESET MASTER since circular replication don't look kindly on truncating binlogs. |
||
|
unknown
|
78587a08ac | portation of the test case for bug 29571 to cover row replication | ||
|
unknown
|
072db2f2e4 |
Fix a bad BitKeeper dependency structure for the "funcs_1" suite:
The files below "mysql-test/suite/funcs_1" in version 5.1
did not depend on the equivalent ones in 5.0,
probably because they had been checked in independent of each other
in both versions.
Step 1:
Foreach file F in the suite that has a "deleted" counterpart D, use
bk rm $F
bk mv $D $F
to get those files into the 5.1 suite that (for BK) depend on 5.0.
BitKeeper/deleted/.del-bitdata_master.test~6c37e095e0a9add9:
Delete: mysql-test/suite/funcs_1/bitdata/bitdata_master.test
BitKeeper/deleted/.del-cursors_master.test~9dcdbd03ab922cc0:
Delete: mysql-test/suite/funcs_1/cursors/cursors_master.test
mysql-test/suite/funcs_1/bitdata/bitdata_master.test:
Rename: BitKeeper/deleted/.del-bitdata_master.test -> mysql-test/suite/funcs_1/bitdata/bitdata_master.test
BitKeeper/deleted/.del-innodb_tb1.txt~7aac0fc74aa9562b:
Delete: mysql-test/suite/funcs_1/data/innodb_tb1.txt
BitKeeper/deleted/.del-innodb_tb2.txt~9e942b8278568a29:
Delete: mysql-test/suite/funcs_1/data/innodb_tb2.txt
mysql-test/suite/funcs_1/cursors/cursors_master.test:
Rename: BitKeeper/deleted/.del-cursors_master.test -> mysql-test/suite/funcs_1/cursors/cursors_master.test
mysql-test/suite/funcs_1/data/innodb_tb1.txt:
Rename: BitKeeper/deleted/.del-innodb_tb1.txt -> mysql-test/suite/funcs_1/data/innodb_tb1.txt
mysql-test/suite/funcs_1/data/innodb_tb2.txt:
Rename: BitKeeper/deleted/.del-innodb_tb2.txt -> mysql-test/suite/funcs_1/data/innodb_tb2.txt
BitKeeper/deleted/.del-innodb_tb3.txt~2799425a5cda8773:
Delete: mysql-test/suite/funcs_1/data/innodb_tb3.txt
BitKeeper/deleted/.del-innodb_tb4.txt~4944d7e7a6e18007:
Delete: mysql-test/suite/funcs_1/data/innodb_tb4.txt
mysql-test/suite/funcs_1/data/innodb_tb3.txt:
Rename: BitKeeper/deleted/.del-innodb_tb3.txt -> mysql-test/suite/funcs_1/data/innodb_tb3.txt
mysql-test/suite/funcs_1/data/innodb_tb4.txt:
Rename: BitKeeper/deleted/.del-innodb_tb4.txt -> mysql-test/suite/funcs_1/data/innodb_tb4.txt
BitKeeper/deleted/.del-memory_tb1.txt~6132f28bde92b74d:
Delete: mysql-test/suite/funcs_1/data/memory_tb1.txt
BitKeeper/deleted/.del-memory_tb2.txt~e989d4cca5cc4383:
Delete: mysql-test/suite/funcs_1/data/memory_tb2.txt
BitKeeper/deleted/.del-memory_tb3.txt~41d0c3a6f93c7943:
Delete: mysql-test/suite/funcs_1/data/memory_tb3.txt
mysql-test/suite/funcs_1/data/memory_tb1.txt:
Rename: BitKeeper/deleted/.del-memory_tb1.txt -> mysql-test/suite/funcs_1/data/memory_tb1.txt
mysql-test/suite/funcs_1/data/memory_tb2.txt:
Rename: BitKeeper/deleted/.del-memory_tb2.txt -> mysql-test/suite/funcs_1/data/memory_tb2.txt
mysql-test/suite/funcs_1/data/memory_tb3.txt:
Rename: BitKeeper/deleted/.del-memory_tb3.txt -> mysql-test/suite/funcs_1/data/memory_tb3.txt
BitKeeper/deleted/.del-memory_tb4.txt~c2e1ba0cb221343c:
Delete: mysql-test/suite/funcs_1/data/memory_tb4.txt
BitKeeper/deleted/.del-myisam_tb1.txt~7f1338ea22ef2ddd:
Delete: mysql-test/suite/funcs_1/data/myisam_tb1.txt
mysql-test/suite/funcs_1/data/memory_tb4.txt:
Rename: BitKeeper/deleted/.del-memory_tb4.txt -> mysql-test/suite/funcs_1/data/memory_tb4.txt
mysql-test/suite/funcs_1/data/myisam_tb1.txt:
Rename: BitKeeper/deleted/.del-myisam_tb1.txt -> mysql-test/suite/funcs_1/data/myisam_tb1.txt
BitKeeper/deleted/.del-myisam_tb2.txt~274fcaf6c68cd806:
Delete: mysql-test/suite/funcs_1/data/myisam_tb2.txt
BitKeeper/deleted/.del-myisam_tb3.txt~79980a26498bc43:
Delete: mysql-test/suite/funcs_1/data/myisam_tb3.txt
BitKeeper/deleted/.del-myisam_tb4.txt~f6911545af0083a1:
Delete: mysql-test/suite/funcs_1/data/myisam_tb4.txt
mysql-test/suite/funcs_1/data/myisam_tb2.txt:
Rename: BitKeeper/deleted/.del-myisam_tb2.txt -> mysql-test/suite/funcs_1/data/myisam_tb2.txt
mysql-test/suite/funcs_1/data/myisam_tb3.txt:
Rename: BitKeeper/deleted/.del-myisam_tb3.txt -> mysql-test/suite/funcs_1/data/myisam_tb3.txt
BitKeeper/deleted/.del-t3.txt~6ae31465f2e71150:
Delete: mysql-test/suite/funcs_1/data/t3.txt
BitKeeper/deleted/.del-t4.txt~ea4aa3bb29a89198:
Delete: mysql-test/suite/funcs_1/data/t4.txt
mysql-test/suite/funcs_1/data/myisam_tb4.txt:
Rename: BitKeeper/deleted/.del-myisam_tb4.txt -> mysql-test/suite/funcs_1/data/myisam_tb4.txt
mysql-test/suite/funcs_1/data/t3.txt:
Rename: BitKeeper/deleted/.del-t3.txt -> mysql-test/suite/funcs_1/data/t3.txt
mysql-test/suite/funcs_1/data/t4.txt:
Rename: BitKeeper/deleted/.del-t4.txt -> mysql-test/suite/funcs_1/data/t4.txt
BitKeeper/deleted/.del-datadict_bug_12777.inc~672dfea7d7dba2b8:
Delete: mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
BitKeeper/deleted/.del-t7.txt~eede0d702e02d5bf:
Delete: mysql-test/suite/funcs_1/data/t7.txt
BitKeeper/deleted/.del-t9.txt~3df18021c8994cfa:
Delete: mysql-test/suite/funcs_1/data/t9.txt
mysql-test/suite/funcs_1/data/t7.txt:
Rename: BitKeeper/deleted/.del-t7.txt -> mysql-test/suite/funcs_1/data/t7.txt
mysql-test/suite/funcs_1/data/t9.txt:
Rename: BitKeeper/deleted/.del-t9.txt -> mysql-test/suite/funcs_1/data/t9.txt
BitKeeper/deleted/.del-datadict_load.inc~ff1ec79eab8c431c:
Delete: mysql-test/suite/funcs_1/datadict/datadict_load.inc
BitKeeper/deleted/.del-datadict_master.inc~94ae7b735ad01d72:
Delete: mysql-test/suite/funcs_1/datadict/datadict_master.inc
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
Rename: BitKeeper/deleted/.del-datadict_bug_12777.inc -> mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Rename: BitKeeper/deleted/.del-datadict_load.inc -> mysql-test/suite/funcs_1/datadict/datadict_load.inc
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
Rename: BitKeeper/deleted/.del-datadict_master.inc -> mysql-test/suite/funcs_1/datadict/datadict_master.inc
BitKeeper/deleted/.del-datadict_show_schema.inc~b6dc1e8ed481fa92:
Delete: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
BitKeeper/deleted/.del-datadict_show_table_design.inc~517436f76de0716b:
Delete: mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
Rename: BitKeeper/deleted/.del-datadict_show_schema.inc -> mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc:
Rename: BitKeeper/deleted/.del-datadict_show_table_design.inc -> mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
BitKeeper/deleted/.del-datadict_tables.inc~cf3c01f9d1cd0cdf:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables.inc
BitKeeper/deleted/.del-datadict_tables_error.inc~5516c7f2d254fdee:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
BitKeeper/deleted/.del-datadict_tables_error_1.inc~18e7ad369f9eb3fd:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
Rename: BitKeeper/deleted/.del-datadict_tables.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc:
Rename: BitKeeper/deleted/.del-datadict_tables_error.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
BitKeeper/deleted/.del-datadict_tables_error_1044.inc~3cfe7748d18be96c:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
BitKeeper/deleted/.del-datadict_tables_error_1049.inc~61e79841bf09fc97:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc:
Rename: BitKeeper/deleted/.del-datadict_tables_error_1.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc:
Rename: BitKeeper/deleted/.del-datadict_tables_error_1044.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc:
Rename: BitKeeper/deleted/.del-datadict_tables_error_1049.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
BitKeeper/deleted/.del-datadict_tables_error_1051.inc~e637de2d82fa7519:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
BitKeeper/deleted/.del-datadict_tables_error_1146.inc~3f6d5feff7f0e9d0:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
BitKeeper/deleted/.del-datadict_tables_error_1288.inc~2f5deb63fbe93e71:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc:
Rename: BitKeeper/deleted/.del-datadict_tables_error_1051.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc:
Rename: BitKeeper/deleted/.del-datadict_tables_error_1146.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
BitKeeper/deleted/.del-create_database.inc~ef2ebad71f178a1c:
Delete: mysql-test/suite/funcs_1/include/create_database.inc
BitKeeper/deleted/.del-create_user_lowest_priv.inc~6f636433dda5160c:
Delete: mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc:
Rename: BitKeeper/deleted/.del-datadict_tables_error_1288.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
mysql-test/suite/funcs_1/include/create_database.inc:
Rename: BitKeeper/deleted/.del-create_database.inc -> mysql-test/suite/funcs_1/include/create_database.inc
mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc:
Rename: BitKeeper/deleted/.del-create_user_lowest_priv.inc -> mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
BitKeeper/deleted/.del-create_user_no_super.inc~1d0bed25cc65132f:
Delete: mysql-test/suite/funcs_1/include/create_user_no_super.inc
BitKeeper/deleted/.del-innodb_tb1.inc~7e6d03d2ddf3b609:
Delete: mysql-test/suite/funcs_1/include/innodb_tb1.inc
BitKeeper/deleted/.del-innodb_tb2.inc~2ab09e131335c5ac:
Delete: mysql-test/suite/funcs_1/include/innodb_tb2.inc
mysql-test/suite/funcs_1/include/create_user_no_super.inc:
Rename: BitKeeper/deleted/.del-create_user_no_super.inc -> mysql-test/suite/funcs_1/include/create_user_no_super.inc
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
Rename: BitKeeper/deleted/.del-innodb_tb1.inc -> mysql-test/suite/funcs_1/include/innodb_tb1.inc
BitKeeper/deleted/.del-innodb_tb3.inc~ce29b178da64097:
Delete: mysql-test/suite/funcs_1/include/innodb_tb3.inc
BitKeeper/deleted/.del-innodb_tb4.inc~912d46a6ce99beb:
Delete: mysql-test/suite/funcs_1/include/innodb_tb4.inc
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
Rename: BitKeeper/deleted/.del-innodb_tb2.inc -> mysql-test/suite/funcs_1/include/innodb_tb2.inc
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
Rename: BitKeeper/deleted/.del-innodb_tb3.inc -> mysql-test/suite/funcs_1/include/innodb_tb3.inc
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
Rename: BitKeeper/deleted/.del-innodb_tb4.inc -> mysql-test/suite/funcs_1/include/innodb_tb4.inc
BitKeeper/deleted/.del-memory_tb1.inc~26b9bca8492b8ef0:
Delete: mysql-test/suite/funcs_1/include/memory_tb1.inc
BitKeeper/deleted/.del-memory_tb2.inc~9789d498ce902299:
Delete: mysql-test/suite/funcs_1/include/memory_tb2.inc
BitKeeper/deleted/.del-memory_tb3.inc~f68852743e949b69:
Delete: mysql-test/suite/funcs_1/include/memory_tb3.inc
mysql-test/suite/funcs_1/include/memory_tb1.inc:
Rename: BitKeeper/deleted/.del-memory_tb1.inc -> mysql-test/suite/funcs_1/include/memory_tb1.inc
mysql-test/suite/funcs_1/include/memory_tb2.inc:
Rename: BitKeeper/deleted/.del-memory_tb2.inc -> mysql-test/suite/funcs_1/include/memory_tb2.inc
BitKeeper/deleted/.del-memory_tb4.inc~19ec0e6953e071e6:
Delete: mysql-test/suite/funcs_1/include/memory_tb4.inc
BitKeeper/deleted/.del-myisam_tb1.inc~9f4487705fda1b27:
Delete: mysql-test/suite/funcs_1/include/myisam_tb1.inc
mysql-test/suite/funcs_1/include/memory_tb3.inc:
Rename: BitKeeper/deleted/.del-memory_tb3.inc -> mysql-test/suite/funcs_1/include/memory_tb3.inc
mysql-test/suite/funcs_1/include/memory_tb4.inc:
Rename: BitKeeper/deleted/.del-memory_tb4.inc -> mysql-test/suite/funcs_1/include/memory_tb4.inc
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
Rename: BitKeeper/deleted/.del-myisam_tb1.inc -> mysql-test/suite/funcs_1/include/myisam_tb1.inc
BitKeeper/deleted/.del-myisam_tb2.inc~5433401ca94057c3:
Delete: mysql-test/suite/funcs_1/include/myisam_tb2.inc
BitKeeper/deleted/.del-myisam_tb3.inc~8056471332f80a19:
Delete: mysql-test/suite/funcs_1/include/myisam_tb3.inc
BitKeeper/deleted/.del-myisam_tb4.inc~5e51596cea151c88:
Delete: mysql-test/suite/funcs_1/include/myisam_tb4.inc
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
Rename: BitKeeper/deleted/.del-myisam_tb2.inc -> mysql-test/suite/funcs_1/include/myisam_tb2.inc
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
Rename: BitKeeper/deleted/.del-myisam_tb3.inc -> mysql-test/suite/funcs_1/include/myisam_tb3.inc
BitKeeper/deleted/.del-show_connection.inc~e779f70c38f084c6:
Delete: mysql-test/suite/funcs_1/include/show_connection.inc
BitKeeper/deleted/.del-sp_tb.inc~68c5d8cee47a7ebc:
Delete: mysql-test/suite/funcs_1/include/sp_tb.inc
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
Rename: BitKeeper/deleted/.del-myisam_tb4.inc -> mysql-test/suite/funcs_1/include/myisam_tb4.inc
mysql-test/suite/funcs_1/include/show_connection.inc:
Rename: BitKeeper/deleted/.del-show_connection.inc -> mysql-test/suite/funcs_1/include/show_connection.inc
BitKeeper/deleted/.del-DataGen_local.pl~3239b01670d34dde:
Delete: mysql-test/suite/funcs_1/lib/DataGen_local.pl
BitKeeper/deleted/.del-DataGen_modify.pl~b7fa80d2d927dae6:
Delete: mysql-test/suite/funcs_1/lib/DataGen_modify.pl
mysql-test/suite/funcs_1/include/sp_tb.inc:
Rename: BitKeeper/deleted/.del-sp_tb.inc -> mysql-test/suite/funcs_1/include/sp_tb.inc
mysql-test/suite/funcs_1/lib/DataGen_local.pl:
Rename: BitKeeper/deleted/.del-DataGen_local.pl -> mysql-test/suite/funcs_1/lib/DataGen_local.pl
mysql-test/suite/funcs_1/lib/DataGen_modify.pl:
Rename: BitKeeper/deleted/.del-DataGen_modify.pl -> mysql-test/suite/funcs_1/lib/DataGen_modify.pl
BitKeeper/deleted/.del-innodb__datadict.result~c02e1f54796a8ca6:
Delete: mysql-test/suite/funcs_1/r/innodb__datadict.result
BitKeeper/deleted/.del-innodb__load.result~e93101337aed3e72:
Delete: mysql-test/suite/funcs_1/r/innodb__load.result
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Rename: BitKeeper/deleted/.del-innodb__datadict.result -> mysql-test/suite/funcs_1/r/innodb__datadict.result
mysql-test/suite/funcs_1/r/innodb__load.result:
Rename: BitKeeper/deleted/.del-innodb__load.result -> mysql-test/suite/funcs_1/r/innodb__load.result
BitKeeper/deleted/.del-innodb_bitdata.result~799181269a7c3f76:
Delete: mysql-test/suite/funcs_1/r/innodb_bitdata.result
BitKeeper/deleted/.del-innodb_cursors.result~5501346a312eb2c:
Delete: mysql-test/suite/funcs_1/r/innodb_cursors.result
BitKeeper/deleted/.del-innodb_func_view.result~40832cbc3cd01357:
Delete: mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/innodb_bitdata.result:
Rename: BitKeeper/deleted/.del-innodb_bitdata.result -> mysql-test/suite/funcs_1/r/innodb_bitdata.result
mysql-test/suite/funcs_1/r/innodb_cursors.result:
Rename: BitKeeper/deleted/.del-innodb_cursors.result -> mysql-test/suite/funcs_1/r/innodb_cursors.result
BitKeeper/deleted/.del-innodb_storedproc.result~f519851b98532739:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc.result
BitKeeper/deleted/.del-innodb_storedproc_02.result~4183d0a85e3d9c3f:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
mysql-test/suite/funcs_1/r/innodb_func_view.result:
Rename: BitKeeper/deleted/.del-innodb_func_view.result -> mysql-test/suite/funcs_1/r/innodb_func_view.result
mysql-test/suite/funcs_1/r/innodb_storedproc.result:
Rename: BitKeeper/deleted/.del-innodb_storedproc.result -> mysql-test/suite/funcs_1/r/innodb_storedproc.result
BitKeeper/deleted/.del-innodb_storedproc_03.result~a27277dc4cfcd8b4:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
BitKeeper/deleted/.del-innodb_storedproc_06.result~ebc1ed638105c6a4:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Rename: BitKeeper/deleted/.del-innodb_storedproc_02.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
Rename: BitKeeper/deleted/.del-innodb_storedproc_03.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Rename: BitKeeper/deleted/.del-innodb_storedproc_06.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
BitKeeper/deleted/.del-innodb_storedproc_07.result~aef68b204aae26a5:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
BitKeeper/deleted/.del-innodb_storedproc_08.result~110d457978e5bb08:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Rename: BitKeeper/deleted/.del-innodb_storedproc_07.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
BitKeeper/deleted/.del-innodb_storedproc_10.result~bac006c3f8720ff7:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
BitKeeper/deleted/.del-innodb_trig_0102.result~552e7936f9c3e8b1:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_0102.result
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Rename: BitKeeper/deleted/.del-innodb_storedproc_08.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Rename: BitKeeper/deleted/.del-innodb_storedproc_10.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Rename: BitKeeper/deleted/.del-innodb_trig_0102.result -> mysql-test/suite/funcs_1/r/innodb_trig_0102.result
BitKeeper/deleted/.del-innodb_trig_03.result~e0001f2ae0594271:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_03.result
BitKeeper/deleted/.del-innodb_trig_0407.result~30a523819cb1dbce:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_0407.result
BitKeeper/deleted/.del-innodb_trig_08.result~7fb6bf5750a72547:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_08.result
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
Rename: BitKeeper/deleted/.del-innodb_trig_03.result -> mysql-test/suite/funcs_1/r/innodb_trig_03.result
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
Rename: BitKeeper/deleted/.del-innodb_trig_0407.result -> mysql-test/suite/funcs_1/r/innodb_trig_0407.result
BitKeeper/deleted/.del-innodb_trig_09.result~45bdbd4e78d18c43:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_09.result
BitKeeper/deleted/.del-innodb_trig_1011ext.result~693d4af717160b0:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
Rename: BitKeeper/deleted/.del-innodb_trig_08.result -> mysql-test/suite/funcs_1/r/innodb_trig_08.result
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
Rename: BitKeeper/deleted/.del-innodb_trig_09.result -> mysql-test/suite/funcs_1/r/innodb_trig_09.result
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
Rename: BitKeeper/deleted/.del-innodb_trig_1011ext.result -> mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
BitKeeper/deleted/.del-innodb_trig_frkey.result~f8324099abe39a:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
BitKeeper/deleted/.del-innodb_triggers.result~47d4751cc196bab9:
Delete: mysql-test/suite/funcs_1/r/innodb_triggers.result
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
Rename: BitKeeper/deleted/.del-innodb_trig_frkey.result -> mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
mysql-test/suite/funcs_1/r/innodb_triggers.result:
Rename: BitKeeper/deleted/.del-innodb_triggers.result -> mysql-test/suite/funcs_1/r/innodb_triggers.result
BitKeeper/deleted/.del-innodb_views.result~f6ee0e22cb353b49:
Delete: mysql-test/suite/funcs_1/r/innodb_views.result
BitKeeper/deleted/.del-memory__datadict.result~49b74301886e1847:
Delete: mysql-test/suite/funcs_1/r/memory__datadict.result
BitKeeper/deleted/.del-memory__load.result~e759ae177d135580:
Delete: mysql-test/suite/funcs_1/r/memory__load.result
mysql-test/suite/funcs_1/r/innodb_views.result:
Rename: BitKeeper/deleted/.del-innodb_views.result -> mysql-test/suite/funcs_1/r/innodb_views.result
mysql-test/suite/funcs_1/r/memory__datadict.result:
Rename: BitKeeper/deleted/.del-memory__datadict.result -> mysql-test/suite/funcs_1/r/memory__datadict.result
BitKeeper/deleted/.del-memory_bitdata.result~cbda7481debfd3d2:
Delete: mysql-test/suite/funcs_1/r/memory_bitdata.result
BitKeeper/deleted/.del-memory_cursors.result~ff9866fb5dfd7e3a:
Delete: mysql-test/suite/funcs_1/r/memory_cursors.result
mysql-test/suite/funcs_1/r/memory__load.result:
Rename: BitKeeper/deleted/.del-memory__load.result -> mysql-test/suite/funcs_1/r/memory__load.result
mysql-test/suite/funcs_1/r/memory_bitdata.result:
Rename: BitKeeper/deleted/.del-memory_bitdata.result -> mysql-test/suite/funcs_1/r/memory_bitdata.result
mysql-test/suite/funcs_1/r/memory_cursors.result:
Rename: BitKeeper/deleted/.del-memory_cursors.result -> mysql-test/suite/funcs_1/r/memory_cursors.result
BitKeeper/deleted/.del-memory_func_view.result~e552d7de38647c08:
Delete: mysql-test/suite/funcs_1/r/memory_func_view.result
BitKeeper/deleted/.del-memory_storedproc.result~f448dceb2b3c0663:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc.result
mysql-test/suite/funcs_1/r/memory_func_view.result:
Rename: BitKeeper/deleted/.del-memory_func_view.result -> mysql-test/suite/funcs_1/r/memory_func_view.result
mysql-test/suite/funcs_1/r/memory_storedproc.result:
Rename: BitKeeper/deleted/.del-memory_storedproc.result -> mysql-test/suite/funcs_1/r/memory_storedproc.result
BitKeeper/deleted/.del-memory_storedproc_02.result~8fe9a1951ddcddb2:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc_02.result
BitKeeper/deleted/.del-memory_storedproc_03.result~da1a54e7f7fb565c:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc_03.result
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Rename: BitKeeper/deleted/.del-memory_storedproc_02.result -> mysql-test/suite/funcs_1/r/memory_storedproc_02.result
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
Rename: BitKeeper/deleted/.del-memory_storedproc_03.result -> mysql-test/suite/funcs_1/r/memory_storedproc_03.result
BitKeeper/deleted/.del-memory_storedproc_06.result~a2f933a1c033c7a4:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc_06.result
BitKeeper/deleted/.del-memory_storedproc_07.result~2bc5723a4df61278:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc_07.result
BitKeeper/deleted/.del-memory_storedproc_08.result~5e68fabd8a121268:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc_08.result
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Rename: BitKeeper/deleted/.del-memory_storedproc_06.result -> mysql-test/suite/funcs_1/r/memory_storedproc_06.result
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Rename: BitKeeper/deleted/.del-memory_storedproc_07.result -> mysql-test/suite/funcs_1/r/memory_storedproc_07.result
BitKeeper/deleted/.del-memory_storedproc_10.result~2eae10df620fed3b:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc_10.result
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Rename: BitKeeper/deleted/.del-memory_storedproc_08.result -> mysql-test/suite/funcs_1/r/memory_storedproc_08.result
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Rename: BitKeeper/deleted/.del-memory_storedproc_10.result -> mysql-test/suite/funcs_1/r/memory_storedproc_10.result
BitKeeper/deleted/.del-memory_trig_0102.result~6ddf339f2d5523c6:
Delete: mysql-test/suite/funcs_1/r/memory_trig_0102.result
BitKeeper/deleted/.del-memory_trig_03.result~843e1e88cec532e7:
Delete: mysql-test/suite/funcs_1/r/memory_trig_03.result
BitKeeper/deleted/.del-memory_trig_0407.result~a561a80e40cd820a:
Delete: mysql-test/suite/funcs_1/r/memory_trig_0407.result
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Rename: BitKeeper/deleted/.del-memory_trig_0102.result -> mysql-test/suite/funcs_1/r/memory_trig_0102.result
mysql-test/suite/funcs_1/r/memory_trig_03.result:
Rename: BitKeeper/deleted/.del-memory_trig_03.result -> mysql-test/suite/funcs_1/r/memory_trig_03.result
BitKeeper/deleted/.del-memory_trig_08.result~3a5fc5dba5ab1378:
Delete: mysql-test/suite/funcs_1/r/memory_trig_08.result
BitKeeper/deleted/.del-memory_trig_09.result~f54649a13258f1f9:
Delete: mysql-test/suite/funcs_1/r/memory_trig_09.result
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
Rename: BitKeeper/deleted/.del-memory_trig_0407.result -> mysql-test/suite/funcs_1/r/memory_trig_0407.result
mysql-test/suite/funcs_1/r/memory_trig_08.result:
Rename: BitKeeper/deleted/.del-memory_trig_08.result -> mysql-test/suite/funcs_1/r/memory_trig_08.result
mysql-test/suite/funcs_1/r/memory_trig_09.result:
Rename: BitKeeper/deleted/.del-memory_trig_09.result -> mysql-test/suite/funcs_1/r/memory_trig_09.result
BitKeeper/deleted/.del-memory_trig_1011ext.result~58022c2cc6d43a43:
Delete: mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
BitKeeper/deleted/.del-memory_triggers.result~4720213a17bd1f8b:
Delete: mysql-test/suite/funcs_1/r/memory_triggers.result
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
Rename: BitKeeper/deleted/.del-memory_trig_1011ext.result -> mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
mysql-test/suite/funcs_1/r/memory_triggers.result:
Rename: BitKeeper/deleted/.del-memory_triggers.result -> mysql-test/suite/funcs_1/r/memory_triggers.result
BitKeeper/deleted/.del-memory_views.result~d600cc46b350d191:
Delete: mysql-test/suite/funcs_1/r/memory_views.result
BitKeeper/deleted/.del-myisam__datadict.result~84fd7948204f0fcf:
Delete: mysql-test/suite/funcs_1/r/myisam__datadict.result
mysql-test/suite/funcs_1/r/memory_views.result:
Rename: BitKeeper/deleted/.del-memory_views.result -> mysql-test/suite/funcs_1/r/memory_views.result
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Rename: BitKeeper/deleted/.del-myisam__datadict.result -> mysql-test/suite/funcs_1/r/myisam__datadict.result
BitKeeper/deleted/.del-myisam__load.result~a5cdfae657f4420a:
Delete: mysql-test/suite/funcs_1/r/myisam__load.result
BitKeeper/deleted/.del-myisam_bitdata.result~58a8f4201386a085:
Delete: mysql-test/suite/funcs_1/r/myisam_bitdata.result
mysql-test/suite/funcs_1/r/myisam__load.result:
Rename: BitKeeper/deleted/.del-myisam__load.result -> mysql-test/suite/funcs_1/r/myisam__load.result
mysql-test/suite/funcs_1/r/myisam_bitdata.result:
Rename: BitKeeper/deleted/.del-myisam_bitdata.result -> mysql-test/suite/funcs_1/r/myisam_bitdata.result
BitKeeper/deleted/.del-myisam_cursors.result~49d90d672526a743:
Delete: mysql-test/suite/funcs_1/r/myisam_cursors.result
BitKeeper/deleted/.del-myisam_func_view.result~534db497d89b6db8:
Delete: mysql-test/suite/funcs_1/r/myisam_func_view.result
mysql-test/suite/funcs_1/r/myisam_cursors.result:
Rename: BitKeeper/deleted/.del-myisam_cursors.result -> mysql-test/suite/funcs_1/r/myisam_cursors.result
mysql-test/suite/funcs_1/r/myisam_func_view.result:
Rename: BitKeeper/deleted/.del-myisam_func_view.result -> mysql-test/suite/funcs_1/r/myisam_func_view.result
BitKeeper/deleted/.del-myisam_storedproc.result~11afaec1d6691272:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc.result
BitKeeper/deleted/.del-myisam_storedproc_02.result~da54080b38b800e1:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
BitKeeper/deleted/.del-myisam_storedproc_03.result~f43705b213fa0be7:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
mysql-test/suite/funcs_1/r/myisam_storedproc.result:
Rename: BitKeeper/deleted/.del-myisam_storedproc.result -> mysql-test/suite/funcs_1/r/myisam_storedproc.result
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Rename: BitKeeper/deleted/.del-myisam_storedproc_02.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
BitKeeper/deleted/.del-myisam_storedproc_06.result~82bc7661134f9251:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
BitKeeper/deleted/.del-myisam_storedproc_07.result~43793b065606447:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
Rename: BitKeeper/deleted/.del-myisam_storedproc_03.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Rename: BitKeeper/deleted/.del-myisam_storedproc_06.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Rename: BitKeeper/deleted/.del-myisam_storedproc_07.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
BitKeeper/deleted/.del-myisam_storedproc_08.result~a41f1829cf91919d:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
BitKeeper/deleted/.del-myisam_storedproc_10.result~601f1f3b7ff82de6:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Rename: BitKeeper/deleted/.del-myisam_storedproc_08.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Rename: BitKeeper/deleted/.del-myisam_storedproc_10.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
BitKeeper/deleted/.del-myisam_trig_0102.result~aa3d68a52b9d9461:
Delete: mysql-test/suite/funcs_1/r/myisam_trig_0102.result
BitKeeper/deleted/.del-myisam_trig_03.result~a958349fc6dbafc4:
Delete: mysql-test/suite/funcs_1/r/myisam_trig_03.result
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Rename: BitKeeper/deleted/.del-myisam_trig_0102.result -> mysql-test/suite/funcs_1/r/myisam_trig_0102.result
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
Rename: BitKeeper/deleted/.del-myisam_trig_03.result -> mysql-test/suite/funcs_1/r/myisam_trig_03.result
BitKeeper/deleted/.del-myisam_trig_0407.result~ff5d0269d6f069ac:
Delete: mysql-test/suite/funcs_1/r/myisam_trig_0407.result
BitKeeper/deleted/.del-myisam_trig_08.result~b116c6baef5c9329:
Delete: mysql-test/suite/funcs_1/r/myisam_trig_08.result
BitKeeper/deleted/.del-myisam_trig_09.result~f5e5181e4de57aa2:
Delete: mysql-test/suite/funcs_1/r/myisam_trig_09.result
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
Rename: BitKeeper/deleted/.del-myisam_trig_0407.result -> mysql-test/suite/funcs_1/r/myisam_trig_0407.result
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
Rename: BitKeeper/deleted/.del-myisam_trig_08.result -> mysql-test/suite/funcs_1/r/myisam_trig_08.result
BitKeeper/deleted/.del-myisam_trig_1011ext.result~188c33cf34d15c28:
Delete: mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
BitKeeper/deleted/.del-myisam_triggers.result~5d09cc9a6e725ae0:
Delete: mysql-test/suite/funcs_1/r/myisam_triggers.result
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
Rename: BitKeeper/deleted/.del-myisam_trig_09.result -> mysql-test/suite/funcs_1/r/myisam_trig_09.result
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
Rename: BitKeeper/deleted/.del-myisam_trig_1011ext.result -> mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
BitKeeper/deleted/.del-cleanup_sp_tb.inc~e56fdf367dc4920f:
Delete: mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
BitKeeper/deleted/.del-myisam_views.result~3f58b2463d68e870:
Delete: mysql-test/suite/funcs_1/r/myisam_views.result
mysql-test/suite/funcs_1/r/myisam_triggers.result:
Rename: BitKeeper/deleted/.del-myisam_triggers.result -> mysql-test/suite/funcs_1/r/myisam_triggers.result
mysql-test/suite/funcs_1/r/myisam_views.result:
Rename: BitKeeper/deleted/.del-myisam_views.result -> mysql-test/suite/funcs_1/r/myisam_views.result
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
Rename: BitKeeper/deleted/.del-cleanup_sp_tb.inc -> mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
BitKeeper/deleted/.del-load_sp_tb.inc~874151dac20d4609:
Delete: mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
BitKeeper/deleted/.del-storedproc_02.inc~382fa05b78862c2d:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
Rename: BitKeeper/deleted/.del-load_sp_tb.inc -> mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
Rename: BitKeeper/deleted/.del-storedproc_02.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
BitKeeper/deleted/.del-storedproc_03.inc~950bd5f0df49c0c0:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
BitKeeper/deleted/.del-storedproc_06.inc~3313ca46f891a104:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
Rename: BitKeeper/deleted/.del-storedproc_03.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Rename: BitKeeper/deleted/.del-storedproc_06.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
BitKeeper/deleted/.del-storedproc_07.inc~8af2431ad7ef6a1:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
BitKeeper/deleted/.del-storedproc_08.inc~e2730281eff07089:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
BitKeeper/deleted/.del-storedproc_08_show.inc~756c67bd3b7d61f8:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
mysql-test/suite/funcs_1/storedproc/storedproc_07.inc:
Rename: BitKeeper/deleted/.del-storedproc_07.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
mysql-test/suite/funcs_1/storedproc/storedproc_08.inc:
Rename: BitKeeper/deleted/.del-storedproc_08.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
BitKeeper/deleted/.del-storedproc_10.inc~9b2eecdca3bc87e0:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
BitKeeper/deleted/.del-storedproc_master.inc~d06ed09343243344:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc:
Rename: BitKeeper/deleted/.del-storedproc_08_show.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
Rename: BitKeeper/deleted/.del-storedproc_10.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
BitKeeper/deleted/.del-disabled.def~5839f38d337055cd:
Delete: mysql-test/suite/funcs_1/t/disabled.def
BitKeeper/deleted/.del-innodb__datadict.test~56554dd847c45d1b:
Delete: mysql-test/suite/funcs_1/t/innodb__datadict.test
mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
Rename: BitKeeper/deleted/.del-storedproc_master.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
mysql-test/suite/funcs_1/t/disabled.def:
Rename: BitKeeper/deleted/.del-disabled.def~1 -> mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/funcs_1/t/innodb__datadict.test:
Rename: BitKeeper/deleted/.del-innodb__datadict.test -> mysql-test/suite/funcs_1/t/innodb__datadict.test
BitKeeper/deleted/.del-innodb__load.test~7085d9e6cde80a45:
Delete: mysql-test/suite/funcs_1/t/innodb__load.test
BitKeeper/deleted/.del-innodb_bitdata.test~85aa8297cea412f0:
Delete: mysql-test/suite/funcs_1/t/innodb_bitdata.test
BitKeeper/deleted/.del-innodb_cursors.test~b2f689e5aad9ed61:
Delete: mysql-test/suite/funcs_1/t/innodb_cursors.test
mysql-test/suite/funcs_1/t/innodb__load.test:
Rename: BitKeeper/deleted/.del-innodb__load.test -> mysql-test/suite/funcs_1/t/innodb__load.test
mysql-test/suite/funcs_1/t/innodb_bitdata.test:
Rename: BitKeeper/deleted/.del-innodb_bitdata.test -> mysql-test/suite/funcs_1/t/innodb_bitdata.test
BitKeeper/deleted/.del-innodb_func_view.test~cefb7d1dd6010a54:
Delete: mysql-test/suite/funcs_1/t/innodb_func_view.test
mysql-test/suite/funcs_1/t/innodb_cursors.test:
Rename: BitKeeper/deleted/.del-innodb_cursors.test -> mysql-test/suite/funcs_1/t/innodb_cursors.test
mysql-test/suite/funcs_1/t/innodb_func_view.test:
Rename: BitKeeper/deleted/.del-innodb_func_view.test -> mysql-test/suite/funcs_1/t/innodb_func_view.test
BitKeeper/deleted/.del-innodb_storedproc.test~59836b12f28c524a:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc.test
BitKeeper/deleted/.del-innodb_storedproc_02.test~b8a1d59320d17ccd:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
BitKeeper/deleted/.del-innodb_storedproc_03.test~f0a04b626962c3ae:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
Rename: BitKeeper/deleted/.del-innodb_storedproc.test -> mysql-test/suite/funcs_1/t/innodb_storedproc.test
mysql-test/suite/funcs_1/t/innodb_storedproc_02.test:
Rename: BitKeeper/deleted/.del-innodb_storedproc_02.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
BitKeeper/deleted/.del-innodb_storedproc_06.test~f0c4a7598abaa44:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
BitKeeper/deleted/.del-innodb_storedproc_07.test~f5fc9e0a296cff76:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
mysql-test/suite/funcs_1/t/innodb_storedproc_03.test:
Rename: BitKeeper/deleted/.del-innodb_storedproc_03.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
mysql-test/suite/funcs_1/t/innodb_storedproc_06.test:
Rename: BitKeeper/deleted/.del-innodb_storedproc_06.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
mysql-test/suite/funcs_1/t/innodb_storedproc_07.test:
Rename: BitKeeper/deleted/.del-innodb_storedproc_07.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
BitKeeper/deleted/.del-innodb_storedproc_08.test~96c9f3ecc7801edb:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
BitKeeper/deleted/.del-innodb_storedproc_10.test~368950a6728faf08:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
BitKeeper/deleted/.del-innodb_trig_0102.test~4c86148638150f86:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_0102.test
mysql-test/suite/funcs_1/t/innodb_storedproc_08.test:
Rename: BitKeeper/deleted/.del-innodb_storedproc_08.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
mysql-test/suite/funcs_1/t/innodb_storedproc_10.test:
Rename: BitKeeper/deleted/.del-innodb_storedproc_10.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
BitKeeper/deleted/.del-innodb_trig_03.test~b90f32a29fd224d6:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_03.test
BitKeeper/deleted/.del-innodb_trig_0407.test~8b8d01c8c8b107:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_0407.test
mysql-test/suite/funcs_1/t/innodb_trig_0102.test:
Rename: BitKeeper/deleted/.del-innodb_trig_0102.test -> mysql-test/suite/funcs_1/t/innodb_trig_0102.test
mysql-test/suite/funcs_1/t/innodb_trig_03.test:
Rename: BitKeeper/deleted/.del-innodb_trig_03.test -> mysql-test/suite/funcs_1/t/innodb_trig_03.test
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
Rename: BitKeeper/deleted/.del-innodb_trig_0407.test -> mysql-test/suite/funcs_1/t/innodb_trig_0407.test
BitKeeper/deleted/.del-innodb_trig_08.test~82ea213f59cf5634:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_08.test
BitKeeper/deleted/.del-innodb_trig_09.test~1407c2016d589067:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_09.test
mysql-test/suite/funcs_1/t/innodb_trig_08.test:
Rename: BitKeeper/deleted/.del-innodb_trig_08.test -> mysql-test/suite/funcs_1/t/innodb_trig_08.test
mysql-test/suite/funcs_1/t/innodb_trig_09.test:
Rename: BitKeeper/deleted/.del-innodb_trig_09.test -> mysql-test/suite/funcs_1/t/innodb_trig_09.test
BitKeeper/deleted/.del-innodb_trig_1011ext.test~8f405ef2239bcfed:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
BitKeeper/deleted/.del-innodb_trig_frkey.test~7c1c0af7c80de602:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
BitKeeper/deleted/.del-innodb_views.test~460914b9e63a58f0:
Delete: mysql-test/suite/funcs_1/t/innodb_views.test
mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test:
Rename: BitKeeper/deleted/.del-innodb_trig_1011ext.test -> mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test:
Rename: BitKeeper/deleted/.del-innodb_trig_frkey.test -> mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
BitKeeper/deleted/.del-memory__datadict.test~97e67292a3c6ebd0:
Delete: mysql-test/suite/funcs_1/t/memory__datadict.test
BitKeeper/deleted/.del-memory__load.test~a18998091ef9b001:
Delete: mysql-test/suite/funcs_1/t/memory__load.test
mysql-test/suite/funcs_1/t/innodb_views.test:
Rename: BitKeeper/deleted/.del-innodb_views.test -> mysql-test/suite/funcs_1/t/innodb_views.test
mysql-test/suite/funcs_1/t/memory__datadict.test:
Rename: BitKeeper/deleted/.del-memory__datadict.test -> mysql-test/suite/funcs_1/t/memory__datadict.test
mysql-test/suite/funcs_1/t/memory__load.test:
Rename: BitKeeper/deleted/.del-memory__load.test -> mysql-test/suite/funcs_1/t/memory__load.test
BitKeeper/deleted/.del-memory_bitdata.test~8c3293caa99e7db2:
Delete: mysql-test/suite/funcs_1/t/memory_bitdata.test
BitKeeper/deleted/.del-memory_cursors.test~208b9d3a3b388e5a:
Delete: mysql-test/suite/funcs_1/t/memory_cursors.test
BitKeeper/deleted/.del-memory_func_view.test~43ca20a516b29af3:
Delete: mysql-test/suite/funcs_1/t/memory_func_view.test
mysql-test/suite/funcs_1/t/memory_bitdata.test:
Rename: BitKeeper/deleted/.del-memory_bitdata.test -> mysql-test/suite/funcs_1/t/memory_bitdata.test
mysql-test/suite/funcs_1/t/memory_cursors.test:
Rename: BitKeeper/deleted/.del-memory_cursors.test -> mysql-test/suite/funcs_1/t/memory_cursors.test
BitKeeper/deleted/.del-memory_storedproc.test~1b6d3856750b4103:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc.test
BitKeeper/deleted/.del-memory_storedproc_02.test~3d699d9d8cadcec:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc_02.test
mysql-test/suite/funcs_1/t/memory_func_view.test:
Rename: BitKeeper/deleted/.del-memory_func_view.test -> mysql-test/suite/funcs_1/t/memory_func_view.test
mysql-test/suite/funcs_1/t/memory_storedproc.test:
Rename: BitKeeper/deleted/.del-memory_storedproc.test -> mysql-test/suite/funcs_1/t/memory_storedproc.test
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
Rename: BitKeeper/deleted/.del-memory_storedproc_02.test -> mysql-test/suite/funcs_1/t/memory_storedproc_02.test
BitKeeper/deleted/.del-memory_storedproc_03.test~b8e4f73c53d2d65c:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc_03.test
BitKeeper/deleted/.del-memory_storedproc_06.test~6f0344325cdc7e47:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc_06.test
BitKeeper/deleted/.del-memory_storedproc_07.test~d72c0c08d46ff3d:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc_07.test
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
Rename: BitKeeper/deleted/.del-memory_storedproc_03.test -> mysql-test/suite/funcs_1/t/memory_storedproc_03.test
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
Rename: BitKeeper/deleted/.del-memory_storedproc_06.test -> mysql-test/suite/funcs_1/t/memory_storedproc_06.test
BitKeeper/deleted/.del-memory_storedproc_08.test~abb018786b9c9cc4:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc_08.test
BitKeeper/deleted/.del-memory_storedproc_10.test~235432215fa35be8:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc_10.test
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
Rename: BitKeeper/deleted/.del-memory_storedproc_07.test -> mysql-test/suite/funcs_1/t/memory_storedproc_07.test
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
Rename: BitKeeper/deleted/.del-memory_storedproc_08.test -> mysql-test/suite/funcs_1/t/memory_storedproc_08.test
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
Rename: BitKeeper/deleted/.del-memory_storedproc_10.test -> mysql-test/suite/funcs_1/t/memory_storedproc_10.test
BitKeeper/deleted/.del-memory_trig_0102.test~14bcf15df5764973:
Delete: mysql-test/suite/funcs_1/t/memory_trig_0102.test
BitKeeper/deleted/.del-memory_trig_03.test~27016478f8698755:
Delete: mysql-test/suite/funcs_1/t/memory_trig_03.test
mysql-test/suite/funcs_1/t/memory_trig_0102.test:
Rename: BitKeeper/deleted/.del-memory_trig_0102.test -> mysql-test/suite/funcs_1/t/memory_trig_0102.test
mysql-test/suite/funcs_1/t/memory_trig_03.test:
Rename: BitKeeper/deleted/.del-memory_trig_03.test -> mysql-test/suite/funcs_1/t/memory_trig_03.test
BitKeeper/deleted/.del-memory_trig_0407.test~519fa098e2e89a49:
Delete: mysql-test/suite/funcs_1/t/memory_trig_0407.test
BitKeeper/deleted/.del-memory_trig_08.test~eb12b11ef9e956ca:
Delete: mysql-test/suite/funcs_1/t/memory_trig_08.test
BitKeeper/deleted/.del-memory_trig_09.test~f53b89eced332954:
Delete: mysql-test/suite/funcs_1/t/memory_trig_09.test
mysql-test/suite/funcs_1/t/memory_trig_0407.test:
Rename: BitKeeper/deleted/.del-memory_trig_0407.test -> mysql-test/suite/funcs_1/t/memory_trig_0407.test
mysql-test/suite/funcs_1/t/memory_trig_08.test:
Rename: BitKeeper/deleted/.del-memory_trig_08.test -> mysql-test/suite/funcs_1/t/memory_trig_08.test
BitKeeper/deleted/.del-memory_trig_1011ext.test~b090a0fc7f12ab08:
Delete: mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
BitKeeper/deleted/.del-memory_views.test~91ffafb774f67137:
Delete: mysql-test/suite/funcs_1/t/memory_views.test
mysql-test/suite/funcs_1/t/memory_trig_09.test:
Rename: BitKeeper/deleted/.del-memory_trig_09.test -> mysql-test/suite/funcs_1/t/memory_trig_09.test
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test:
Rename: BitKeeper/deleted/.del-memory_trig_1011ext.test -> mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
mysql-test/suite/funcs_1/t/memory_views.test:
Rename: BitKeeper/deleted/.del-memory_views.test -> mysql-test/suite/funcs_1/t/memory_views.test
BitKeeper/deleted/.del-myisam__datadict.test~cae9a60de78fc35d:
Delete: mysql-test/suite/funcs_1/t/myisam__datadict.test
BitKeeper/deleted/.del-myisam__load.test~475638485078225c:
Delete: mysql-test/suite/funcs_1/t/myisam__load.test
BitKeeper/deleted/.del-myisam_bitdata.test~12a510e9660ace8b:
Delete: mysql-test/suite/funcs_1/t/myisam_bitdata.test
mysql-test/suite/funcs_1/t/myisam__datadict.test:
Rename: BitKeeper/deleted/.del-myisam__datadict.test -> mysql-test/suite/funcs_1/t/myisam__datadict.test
mysql-test/suite/funcs_1/t/myisam__load.test:
Rename: BitKeeper/deleted/.del-myisam__load.test -> mysql-test/suite/funcs_1/t/myisam__load.test
BitKeeper/deleted/.del-myisam_cursors.test~e14ab9d55d14f27b:
Delete: mysql-test/suite/funcs_1/t/myisam_cursors.test
BitKeeper/deleted/.del-myisam_func_view.test~1e272349f93f83f2:
Delete: mysql-test/suite/funcs_1/t/myisam_func_view.test
mysql-test/suite/funcs_1/t/myisam_bitdata.test:
Rename: BitKeeper/deleted/.del-myisam_bitdata.test -> mysql-test/suite/funcs_1/t/myisam_bitdata.test
mysql-test/suite/funcs_1/t/myisam_cursors.test:
Rename: BitKeeper/deleted/.del-myisam_cursors.test -> mysql-test/suite/funcs_1/t/myisam_cursors.test
mysql-test/suite/funcs_1/t/myisam_func_view.test:
Rename: BitKeeper/deleted/.del-myisam_func_view.test -> mysql-test/suite/funcs_1/t/myisam_func_view.test
BitKeeper/deleted/.del-myisam_storedproc.test~2ba6363d2e1a3c34:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc.test
BitKeeper/deleted/.del-myisam_storedproc_02.test~3baa154a9e7da1f9:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
Rename: BitKeeper/deleted/.del-myisam_storedproc.test -> mysql-test/suite/funcs_1/t/myisam_storedproc.test
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
Rename: BitKeeper/deleted/.del-myisam_storedproc_02.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
BitKeeper/deleted/.del-myisam_storedproc_03.test~b6ca96ed3dfbe37f:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
BitKeeper/deleted/.del-myisam_storedproc_06.test~a4150b544475b75:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
BitKeeper/deleted/.del-myisam_storedproc_07.test~618a6a50ec4ad67e:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
Rename: BitKeeper/deleted/.del-myisam_storedproc_03.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
Rename: BitKeeper/deleted/.del-myisam_storedproc_06.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
BitKeeper/deleted/.del-myisam_storedproc_08.test~84a1b27da7087d9:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
BitKeeper/deleted/.del-myisam_storedproc_10.test~488ef8f94b0e21bd:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
Rename: BitKeeper/deleted/.del-myisam_storedproc_07.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
Rename: BitKeeper/deleted/.del-myisam_storedproc_08.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
Rename: BitKeeper/deleted/.del-myisam_storedproc_10.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
BitKeeper/deleted/.del-myisam_trig_0102.test~ba6337bfcf06720f:
Delete: mysql-test/suite/funcs_1/t/myisam_trig_0102.test
BitKeeper/deleted/.del-myisam_trig_03.test~26c97fd2347ce5a5:
Delete: mysql-test/suite/funcs_1/t/myisam_trig_03.test
BitKeeper/deleted/.del-myisam_trig_0407.test~bf799febfd188363:
Delete: mysql-test/suite/funcs_1/t/myisam_trig_0407.test
mysql-test/suite/funcs_1/t/myisam_trig_0102.test:
Rename: BitKeeper/deleted/.del-myisam_trig_0102.test -> mysql-test/suite/funcs_1/t/myisam_trig_0102.test
mysql-test/suite/funcs_1/t/myisam_trig_03.test:
Rename: BitKeeper/deleted/.del-myisam_trig_03.test -> mysql-test/suite/funcs_1/t/myisam_trig_03.test
BitKeeper/deleted/.del-myisam_trig_08.test~9dd03c9fb189a2d0:
Delete: mysql-test/suite/funcs_1/t/myisam_trig_08.test
BitKeeper/deleted/.del-myisam_trig_09.test~4706099520d9fcff:
Delete: mysql-test/suite/funcs_1/t/myisam_trig_09.test
mysql-test/suite/funcs_1/t/myisam_trig_0407.test:
Rename: BitKeeper/deleted/.del-myisam_trig_0407.test -> mysql-test/suite/funcs_1/t/myisam_trig_0407.test
mysql-test/suite/funcs_1/t/myisam_trig_08.test:
Rename: BitKeeper/deleted/.del-myisam_trig_08.test -> mysql-test/suite/funcs_1/t/myisam_trig_08.test
BitKeeper/deleted/.del-myisam_trig_1011ext.test~33947cfdce83359f:
Delete: mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
BitKeeper/deleted/.del-myisam_views.test~8191b1664f3fb073:
Delete: mysql-test/suite/funcs_1/t/myisam_views.test
mysql-test/suite/funcs_1/t/myisam_trig_09.test:
Rename: BitKeeper/deleted/.del-myisam_trig_09.test -> mysql-test/suite/funcs_1/t/myisam_trig_09.test
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
Rename: BitKeeper/deleted/.del-myisam_trig_1011ext.test -> mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
mysql-test/suite/funcs_1/t/myisam_views.test:
Rename: BitKeeper/deleted/.del-myisam_views.test -> mysql-test/suite/funcs_1/t/myisam_views.test
BitKeeper/deleted/.del-trig_frkey.inc~ddc32f51b7efc8a7:
Delete: mysql-test/suite/funcs_1/triggers/trig_frkey.inc
BitKeeper/deleted/.del-trig_frkey2.inc~6e45874f67bff63f:
Delete: mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
BitKeeper/deleted/.del-triggers_0102.inc~3e3628c21eb1b6b3:
Delete: mysql-test/suite/funcs_1/triggers/triggers_0102.inc
mysql-test/suite/funcs_1/triggers/trig_frkey.inc:
Rename: BitKeeper/deleted/.del-trig_frkey.inc -> mysql-test/suite/funcs_1/triggers/trig_frkey.inc
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
Rename: BitKeeper/deleted/.del-trig_frkey2.inc -> mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
BitKeeper/deleted/.del-triggers_03.inc~952da03e2aa2e366:
Delete: mysql-test/suite/funcs_1/triggers/triggers_03.inc
BitKeeper/deleted/.del-triggers_0407.inc~26d5f499dcbba3dd:
Delete: mysql-test/suite/funcs_1/triggers/triggers_0407.inc
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Rename: BitKeeper/deleted/.del-triggers_0102.inc -> mysql-test/suite/funcs_1/triggers/triggers_0102.inc
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
Rename: BitKeeper/deleted/.del-triggers_03.inc -> mysql-test/suite/funcs_1/triggers/triggers_03.inc
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
Rename: BitKeeper/deleted/.del-triggers_0407.inc -> mysql-test/suite/funcs_1/triggers/triggers_0407.inc
BitKeeper/deleted/.del-triggers_08.inc~23ce6806b152b7fc:
Delete: mysql-test/suite/funcs_1/triggers/triggers_08.inc
BitKeeper/deleted/.del-triggers_09.inc~77f09e3677536d9f:
Delete: mysql-test/suite/funcs_1/triggers/triggers_09.inc
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
Rename: BitKeeper/deleted/.del-triggers_08.inc -> mysql-test/suite/funcs_1/triggers/triggers_08.inc
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
Rename: BitKeeper/deleted/.del-triggers_09.inc -> mysql-test/suite/funcs_1/triggers/triggers_09.inc
BitKeeper/deleted/.del-func_view.inc~f237e7bc7e6cfcbc:
Delete: mysql-test/suite/funcs_1/views/func_view.inc
BitKeeper/deleted/.del-triggers_1011ext.inc~ed096947fb03693:
Delete: mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
BitKeeper/deleted/.del-triggers_master.test~fc19575e956a0b72:
Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
Rename: BitKeeper/deleted/.del-triggers_1011ext.inc -> mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
mysql-test/suite/funcs_1/triggers/triggers_master.test:
Rename: BitKeeper/deleted/.del-triggers_master.test -> mysql-test/suite/funcs_1/triggers/triggers_master.test
BitKeeper/deleted/.del-fv1.inc~87b440f98d8b8193:
Delete: mysql-test/suite/funcs_1/views/fv1.inc
BitKeeper/deleted/.del-fv2.inc~26896746173f9122:
Delete: mysql-test/suite/funcs_1/views/fv2.inc
mysql-test/suite/funcs_1/views/func_view.inc:
Rename: BitKeeper/deleted/.del-func_view.inc -> mysql-test/suite/funcs_1/views/func_view.inc
mysql-test/suite/funcs_1/views/fv1.inc:
Rename: BitKeeper/deleted/.del-fv1.inc -> mysql-test/suite/funcs_1/views/fv1.inc
mysql-test/suite/funcs_1/views/fv2.inc:
Rename: BitKeeper/deleted/.del-fv2.inc -> mysql-test/suite/funcs_1/views/fv2.inc
BitKeeper/deleted/.del-fv_cast.inc~ef53731c7c6dcd27:
Delete: mysql-test/suite/funcs_1/views/fv_cast.inc
BitKeeper/deleted/.del-fv_if1.inc~86c887a184ab39eb:
Delete: mysql-test/suite/funcs_1/views/fv_if1.inc
mysql-test/suite/funcs_1/views/fv_cast.inc:
Rename: BitKeeper/deleted/.del-fv_cast.inc -> mysql-test/suite/funcs_1/views/fv_cast.inc
mysql-test/suite/funcs_1/views/fv_if1.inc:
Rename: BitKeeper/deleted/.del-fv_if1.inc -> mysql-test/suite/funcs_1/views/fv_if1.inc
BitKeeper/deleted/.del-fv_if2.inc~483e3f7a24f7e55c:
Delete: mysql-test/suite/funcs_1/views/fv_if2.inc
BitKeeper/deleted/.del-fv_ifnull.inc~fbffea1ccd756112:
Delete: mysql-test/suite/funcs_1/views/fv_ifnull.inc
BitKeeper/deleted/.del-views_master.inc~2d2a52a68d0d77fd:
Delete: mysql-test/suite/funcs_1/views/views_master.inc
mysql-test/suite/funcs_1/views/fv_if2.inc:
Rename: BitKeeper/deleted/.del-fv_if2.inc -> mysql-test/suite/funcs_1/views/fv_if2.inc
mysql-test/suite/funcs_1/views/fv_ifnull.inc:
Rename: BitKeeper/deleted/.del-fv_ifnull.inc -> mysql-test/suite/funcs_1/views/fv_ifnull.inc
BitKeeper/deleted/.del-README.txt:
Delete: mysql-test/suite/funcs_1/README.txt
mysql-test/suite/funcs_1/README.txt:
Rename: BitKeeper/deleted/.del-README.txt-renamed -> mysql-test/suite/funcs_1/README.txt
mysql-test/suite/funcs_1/views/views_master.inc:
Rename: BitKeeper/deleted/.del-views_master.inc -> mysql-test/suite/funcs_1/views/views_master.inc
|
||
|
unknown
|
13c679124f |
5.0-opt -> 5.1-opt merge of the test case for bug 29571:
- reset the logs before and after the test. - cleanup from the previous tests : use the correct schema. mysql-test/extra/rpl_tests/rpl_insert_delayed.test: 5.0-opt -> 5.1-opt merge of the test case for bug 29571. mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result: 5.0-opt -> 5.1-opt merge of the test case for bug 29571. |
||
|
unknown
|
299fc364e2 |
Merge debian.(none):/M50/rowlock-5.0
into debian.(none):/M51/rowlock-5.1 BitKeeper/deleted/.del-readme.txt~3: Merge rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt~3 Makefile.am: Manual merge: "row_lock" suite is deleted. |
||
|
unknown
|
d8c8c3437f |
Remove the "row_lock" suite from the sources.
For more information, see WL#3866 and the bugs numbered 28685 and 20390. BitKeeper/deleted/.del-readme.txt: Delete: mysql-test/suite/row_lock/readme.txt BitKeeper/deleted/.del-summary_of_sel_test.txt: Delete: mysql-test/suite/row_lock/summary_of_sel_test.txt BitKeeper/deleted/.del-innodb_row_lock_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_1.result BitKeeper/deleted/.del-innodb_row_lock_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_2.result BitKeeper/deleted/.del-innodb_row_lock_3.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_3.result BitKeeper/deleted/.del-innodb_row_lock_4.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_4.result BitKeeper/deleted/.del-innodb_row_lock_5.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_5.result BitKeeper/deleted/.del-innodb_row_lock_big_tab.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result BitKeeper/deleted/.del-innodb_row_lock_big_tab_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result BitKeeper/deleted/.del-innodb_row_lock_big_tab_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result BitKeeper/deleted/.del-innodb_row_lock_trig_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result BitKeeper/deleted/.del-innodb_row_lock_trig_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result BitKeeper/deleted/.del-innodb_row_lock_view_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result BitKeeper/deleted/.del-row_lock.inc: Delete: mysql-test/suite/row_lock/include/row_lock.inc BitKeeper/deleted/.del-row_lock_big_tab.inc: Delete: mysql-test/suite/row_lock/include/row_lock_big_tab.inc BitKeeper/deleted/.del-row_lock_big_tab_1.inc: Delete: mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc BitKeeper/deleted/.del-row_lock_big_tab_2.inc: Delete: mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc BitKeeper/deleted/.del-row_lock_trig.inc: Delete: mysql-test/suite/row_lock/include/row_lock_trig.inc BitKeeper/deleted/.del-row_lock_view.inc: Delete: mysql-test/suite/row_lock/include/row_lock_view.inc BitKeeper/deleted/.del-row_lock_view_mix.inc: Delete: mysql-test/suite/row_lock/include/row_lock_view_mix.inc BitKeeper/deleted/.del-row_lock_view_storedp.inc: Delete: mysql-test/suite/row_lock/include/row_lock_view_storedp.inc BitKeeper/deleted/.del-row_lock_view_trig.inc: Delete: mysql-test/suite/row_lock/include/row_lock_view_trig.inc BitKeeper/deleted/.del-innodb_row_lock_view_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result BitKeeper/deleted/.del-innodb_row_lock_view_mix_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result BitKeeper/deleted/.del-innodb_row_lock_view_mix_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result BitKeeper/deleted/.del-innodb_row_lock_view_storedp_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result BitKeeper/deleted/.del-innodb_row_lock_view_storedp_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result BitKeeper/deleted/.del-innodb_row_lock_view_trig_1.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result BitKeeper/deleted/.del-innodb_row_lock_view_trig_2.result: Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result BitKeeper/deleted/.del-ndb_row_lock_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_1.result BitKeeper/deleted/.del-ndb_row_lock_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_2.result BitKeeper/deleted/.del-ndb_row_lock_3.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_3.result BitKeeper/deleted/.del-ndb_row_lock_4.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_4.result BitKeeper/deleted/.del-ndb_row_lock_5.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_5.result BitKeeper/deleted/.del-ndb_row_lock_big_tab.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result BitKeeper/deleted/.del-ndb_row_lock_big_tab_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result BitKeeper/deleted/.del-ndb_row_lock_big_tab_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result BitKeeper/deleted/.del-ndb_row_lock_trig_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result BitKeeper/deleted/.del-ndb_row_lock_trig_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result BitKeeper/deleted/.del-ndb_row_lock_view_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result BitKeeper/deleted/.del-ndb_row_lock_view_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result BitKeeper/deleted/.del-innodb_row_lock_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_1.test BitKeeper/deleted/.del-innodb_row_lock_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_2.test BitKeeper/deleted/.del-innodb_row_lock_3.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_3.test BitKeeper/deleted/.del-innodb_row_lock_4.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_4.test BitKeeper/deleted/.del-innodb_row_lock_5.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_5.test BitKeeper/deleted/.del-innodb_row_lock_big_tab.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test BitKeeper/deleted/.del-innodb_row_lock_big_tab_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test BitKeeper/deleted/.del-innodb_row_lock_big_tab_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test BitKeeper/deleted/.del-innodb_row_lock_trig_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test BitKeeper/deleted/.del-innodb_row_lock_trig_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test BitKeeper/deleted/.del-innodb_row_lock_view_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test BitKeeper/deleted/.del-innodb_row_lock_view_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test BitKeeper/deleted/.del-innodb_row_lock_view_mix_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test BitKeeper/deleted/.del-ndb_row_lock_view_mix_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result BitKeeper/deleted/.del-ndb_row_lock_view_mix_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result BitKeeper/deleted/.del-ndb_row_lock_view_storedp_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result BitKeeper/deleted/.del-ndb_row_lock_view_storedp_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result BitKeeper/deleted/.del-ndb_row_lock_view_trig_1.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result BitKeeper/deleted/.del-ndb_row_lock_view_trig_2.result: Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result BitKeeper/deleted/.del-innodb_row_lock_view_mix_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test BitKeeper/deleted/.del-innodb_row_lock_view_storedp_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test BitKeeper/deleted/.del-innodb_row_lock_view_storedp_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test BitKeeper/deleted/.del-innodb_row_lock_view_trig_1.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test BitKeeper/deleted/.del-innodb_row_lock_view_trig_2.test: Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test BitKeeper/deleted/.del-ndb_row_lock_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_1.test BitKeeper/deleted/.del-ndb_row_lock_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_2.test BitKeeper/deleted/.del-ndb_row_lock_3.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_3.test BitKeeper/deleted/.del-ndb_row_lock_4.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_4.test BitKeeper/deleted/.del-ndb_row_lock_5.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_5.test BitKeeper/deleted/.del-ndb_row_lock_big_tab.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test BitKeeper/deleted/.del-ndb_row_lock_big_tab_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test BitKeeper/deleted/.del-ndb_row_lock_big_tab_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test BitKeeper/deleted/.del-ndb_row_lock_trig_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test BitKeeper/deleted/.del-ndb_row_lock_trig_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test BitKeeper/deleted/.del-ndb_row_lock_view_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test BitKeeper/deleted/.del-ndb_row_lock_view_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test BitKeeper/deleted/.del-ndb_row_lock_view_mix_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test BitKeeper/deleted/.del-ndb_row_lock_view_mix_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test BitKeeper/deleted/.del-ndb_row_lock_view_storedp_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test BitKeeper/deleted/.del-ndb_row_lock_view_storedp_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test BitKeeper/deleted/.del-ndb_row_lock_view_trig_1.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test BitKeeper/deleted/.del-ndb_row_lock_view_trig_2.test: Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.test Makefile.am: Remove the "row_lock" suite from the "test-bt" target. Also, a formatting change: empty line for better readability. |
||
|
unknown
|
36f16bf862 |
BUG#29809 (Slave SQL errors in warnings file):
Adding code to filter out slave SQL errors since these are checked by the tests themselves. mysql-test/lib/mtr_report.pl: Filtering out slave SQL errors since these are handled by the tests themselves. mysql-test/suite/rpl/t/disabled.def: Enabling disabled tests. mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result: Result change. mysql-test/suite/rpl_ndb/t/disabled.def: Enabling disabled tests. |
||
|
unknown
|
34864af8fd |
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1-engines
into mysql.com:/home/svoj/devel/mysql/BUG29806/mysql-5.1-engines sql/ha_ndbcluster.cc: Auto merged sql/lock.cc: Auto merged |
||
|
unknown
|
4537a0c9e9 |
BUG#29806 - binlog_innodb.test creates a server log
Stopping mysql server could result in an entry in mysql error file: "InnoDB: Error: MySQL is freeing a thd". This happened because InnoDB assumes that the server will never call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed. Prior to this patch we haven't had strict definition whether external_lock(F_UNLCK) must be called in case external_lock(READ/WRITE) fails. This patch states that we never call external_lock(F_UNLCK) in case external_lock(READ/WRITE) fails. mysql-test/suite/binlog/t/disabled.def: Re-enabled binlog_innodb and binlog_killed tests. sql/ha_ndbcluster.cc: Restore handler state in case external_lock() failed. sql/ha_partition.cc: Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed. sql/lock.cc: Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed. storage/myisammrg/myrg_locking.c: Restore handler state in case external_lock() failed. |
||
|
unknown
|
ef9738fe92 |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team include/my_bitmap.h: Auto merged mysql-test/suite/binlog/r/binlog_multi_engine.result: Auto merged mysql-test/suite/ndb/r/ndb_binlog_multi.result: Auto merged mysql-test/suite/ndb/t/ndb_autodiscover3.test: Auto merged mysql-test/suite/ndb/t/ndb_binlog_basic.test: Auto merged mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test: Auto merged mysql-test/suite/ndb/t/ndb_binlog_discover.test: Auto merged mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test: Auto merged mysql-test/suite/ndb/t/ndb_binlog_log_bin.test: Auto merged mysql-test/suite/ndb/t/ndb_binlog_multi.test: Auto merged mysql-test/suite/ndb/t/ndb_multi_row.test: Auto merged mysql-test/suite/rpl/r/rpl_row_log.result: Auto merged mysql-test/suite/rpl/r/rpl_row_log_innodb.result: Auto merged mysql-test/suite/rpl/r/rpl_stm_log.result: Auto merged mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result: Auto merged mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result: Auto merged mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test: Auto merged sql/log_event.cc: Auto merged mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result: Manual merge mysql-test/t/disabled.def: Manual merge of main tree into replication tree |
||
|
unknown
|
78207030bb |
Updated/fixed test and result files to 5.0.46
Note datadict files do not include wrong is_updatable wrong value
as a result of bug 30020.
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
Updated test file
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated test file
mysql-test/suite/funcs_1/r/innodb_func_view.result:
Updated test file
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Updated test file
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
Updated test file
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
Updated test file
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated test file
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated test file
mysql-test/suite/funcs_1/r/memory_func_view.result:
Updated test file
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Updated test file
mysql-test/suite/funcs_1/r/memory_trig_08.result:
Updated test file
mysql-test/suite/funcs_1/r/memory_trig_09.result:
Updated test file
mysql-test/suite/funcs_1/r/memory_views.result:
Updated test file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated test file
mysql-test/suite/funcs_1/r/myisam_func_view.result:
Updated test file
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Updated test file
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
Updated test file
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
Updated test file
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated test file
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Updated test file
mysql-test/suite/funcs_1/views/func_view.inc:
Updated test file
|
||
|
unknown
|
066d97ba09 |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build libmysql/libmysql.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field.cc: Auto merged |
||
|
unknown
|
568eccb513 |
Merge gleb.loc:/home/uchum/work/bk/5.1
into gleb.loc:/home/uchum/work/bk/5.1-opt mysql-test/t/disabled.def: Auto merged sql/set_var.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: SCCS merged tests/mysql_client_test.c: SCCS merged |
||
|
unknown
|
2eed7b94e3 |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1 sql/mysql_priv.h: Auto merged |