From 69cfa9b06ea5f58bc758756310cc73e2e6511234 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Fri, 15 Jun 2007 17:42:03 +0200 Subject: [PATCH 01/38] Bug#18415 known problem when mysql-test-run.pl run ActiveState perl for windows - Select STDOUT as default handle after having cloned the child - Disable check for "$error eq $output" to ptoperly redirect $error --- mysql-test/lib/mtr_process.pl | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index ac2e049a67c..2b6abcf004d 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -142,6 +142,7 @@ sub spawn_impl ($$$$$$$) { if ( $pid ) { + select(STDOUT) if $::glob_win32_perl; return spawn_parent_impl($pid,$mode,$path); } else @@ -163,9 +164,6 @@ sub spawn_impl ($$$$$$$) { { # Don't redirect stdout on ActiveState perl since this is # just another thread in the same process. - # Should be fixed so that the thread that is created with fork - # executes the exe in another process and wait's for it to return. - # In the meanwhile, we get all the output from mysqld's to screen } elsif ( ! open(STDOUT,$log_file_open_mode,$output) ) { @@ -175,7 +173,7 @@ sub spawn_impl ($$$$$$$) { if ( $error ) { - if ( $output eq $error ) + if ( !$::glob_win32_perl and $output eq $error ) { if ( ! open(STDERR,">&STDOUT") ) { @@ -184,15 +182,7 @@ sub spawn_impl ($$$$$$$) { } else { - if ( $::glob_win32_perl ) - { - # Don't redirect stdout on ActiveState perl since this is - # just another thread in the same process. - # Should be fixed so that the thread that is created with fork - # executes the exe in another process and wait's for it to return. - # In the meanwhile, we get all the output from mysqld's to screen - } - elsif ( ! open(STDERR,$log_file_open_mode,$error) ) + if ( ! open(STDERR,$log_file_open_mode,$error) ) { mtr_child_error("can't redirect STDERR to \"$error\": $!"); } From aabbd2fb69193bc9c3c9dee1129a4dc79c551f37 Mon Sep 17 00:00:00 2001 From: "ramil/ram@mysql.com/ramil.myoffice.izhnet.ru" <> Date: Fri, 22 Jun 2007 17:12:40 +0500 Subject: [PATCH 02/38] Fix for bug #29079: Semantics of "bigint" depend on platform specifics (size, signedness of char ?) Problem: long and long long types mess in a comparison may lead to wrong results on some platforms. Fix: prefer [unsigned] long long as [u]longlong as it's used unconditionally in many places. --- include/my_global.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/my_global.h b/include/my_global.h index b7b200fdcf4..5e31a66e5e3 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -828,7 +828,12 @@ error "Neither int or long is of 4 bytes width" typedef unsigned long ulong; /* Short for unsigned long */ #endif #ifndef longlong_defined -#if defined(HAVE_LONG_LONG) && SIZEOF_LONG != 8 +/* + Using [unsigned] long long is preferable as [u]longlong because we use + [unsigned] long long unconditionally in many places, + for example in constants with [U]LL suffix. +*/ +#if defined(HAVE_LONG_LONG) && SIZEOF_LONG_LONG == 8 typedef unsigned long long int ulonglong; /* ulong or unsigned long long */ typedef long long int longlong; #else From 25af844f6feda6ec9cfb094b4ca4f49aac7d3ecc Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Mon, 25 Jun 2007 11:34:23 +0200 Subject: [PATCH 03/38] Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB fix binlog-writing so that end_log_pos is given correctly even within transactions for both SHOW BINLOG and SHOW MASTER STATUS, that is as absolute values (from log start) rather than relative values (from transaction's start). --- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 --- mysql-test/r/binlog.result | 122 ++++++++++++++++++++++++++++++++++++- mysql-test/t/binlog.test | 93 +++++++++++++++++++++++++++- sql/log.cc | 63 +++++++++++++++++-- 3 files changed, 269 insertions(+), 9 deletions(-) diff --git a/mysql-test/r/binlog.result b/mysql-test/r/binlog.result index 6807da16e66..41c75a2067b 100644 --- a/mysql-test/r/binlog.result +++ b/mysql-test/r/binlog.result @@ -1,6 +1,6 @@ drop table if exists t1, t2; reset master; -create table t1 (a int) engine=bdb; +create table t1 (a int) engine=innodb; create table t2 (a int) engine=innodb; begin; insert t1 values (5); @@ -10,11 +10,11 @@ insert t2 values (5); commit; show binlog events from 98; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query 1 # use `test`; create table t1 (a int) engine=bdb +master-bin.000001 # Query 1 # use `test`; create table t1 (a int) engine=innodb master-bin.000001 # Query 1 # use `test`; create table t2 (a int) engine=innodb master-bin.000001 # Query 1 # use `test`; BEGIN master-bin.000001 # Query 1 # use `test`; insert t1 values (5) -master-bin.000001 # Query 1 # use `test`; COMMIT +master-bin.000001 # Xid 1 # COMMIT /* XID */ master-bin.000001 # Query 1 # use `test`; BEGIN master-bin.000001 # Query 1 # use `test`; insert t2 values (5) master-bin.000001 # Xid 1 # COMMIT /* XID */ @@ -133,3 +133,119 @@ master-bin.000001 # Rotate 1 # master-bin.000002;pos=4 show binlog events in 'master-bin.000002' from 98; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000002 # Query 1 # use `test`; drop table t1 +set @ac = @@autocommit; +set autocommit= 0; +reset master; +create table t1(n int) engine=innodb; +begin; +insert into t1 values (1); +insert into t1 values (2); +insert into t1 values (3); +commit; +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 98 Server version, Binlog ver: 4 +master-bin.000001 98 Query 1 197 use `test`; create table t1(n int) engine=innodb +master-bin.000001 197 Query 1 265 use `test`; BEGIN +master-bin.000001 265 Query 1 353 use `test`; insert into t1 values (1) +master-bin.000001 353 Query 1 441 use `test`; insert into t1 values (2) +master-bin.000001 441 Query 1 529 use `test`; insert into t1 values (3) +master-bin.000001 529 Xid 1 556 COMMIT /* XID */ +master-bin.000001 556 Query 1 632 use `test`; drop table t1 +set autocommit= 1; +reset master; +create table t1(n int) engine=innodb; +insert into t1 values (1); +insert into t1 values (2); +insert into t1 values (3); +commit; +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 98 Server version, Binlog ver: 4 +master-bin.000001 98 Query 1 197 use `test`; create table t1(n int) engine=innodb +master-bin.000001 197 Query 1 285 use `test`; insert into t1 values (1) +master-bin.000001 285 Xid 1 312 COMMIT /* XID */ +master-bin.000001 312 Query 1 400 use `test`; insert into t1 values (2) +master-bin.000001 400 Xid 1 427 COMMIT /* XID */ +master-bin.000001 427 Query 1 515 use `test`; insert into t1 values (3) +master-bin.000001 515 Xid 1 542 COMMIT /* XID */ +master-bin.000001 542 Query 1 618 use `test`; drop table t1 +reset master; +create table t1(n int) engine=myisam; +begin; +insert into t1 values (4); +insert into t1 values (5); +insert into t1 values (6); +commit; +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 98 Server version, Binlog ver: 4 +master-bin.000001 98 Query 1 197 use `test`; create table t1(n int) engine=myisam +master-bin.000001 197 Query 1 285 use `test`; insert into t1 values (4) +master-bin.000001 285 Query 1 373 use `test`; insert into t1 values (5) +master-bin.000001 373 Query 1 461 use `test`; insert into t1 values (6) +master-bin.000001 461 Query 1 537 use `test`; drop table t1 +set autocommit= 1; +reset master; +create table t1(n int) engine=innodb; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 197 +insert into t1 values (1); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 312 +insert into t1 values (2); +insert into t1 values (3); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 542 +commit; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 542 +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 98 Server version, Binlog ver: 4 +master-bin.000001 98 Query 1 197 use `test`; create table t1(n int) engine=innodb +master-bin.000001 197 Query 1 285 use `test`; insert into t1 values (1) +master-bin.000001 285 Xid 1 312 COMMIT /* XID */ +master-bin.000001 312 Query 1 400 use `test`; insert into t1 values (2) +master-bin.000001 400 Xid 1 427 COMMIT /* XID */ +master-bin.000001 427 Query 1 515 use `test`; insert into t1 values (3) +master-bin.000001 515 Xid 1 542 COMMIT /* XID */ +master-bin.000001 542 Query 1 618 use `test`; drop table t1 +set autocommit= 0; +reset master; +create table t1(n int) engine=myisam; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 197 +insert into t1 values (4); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 285 +insert into t1 values (5); +insert into t1 values (6); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 461 +commit; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 461 +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 98 Server version, Binlog ver: 4 +master-bin.000001 98 Query 1 197 use `test`; create table t1(n int) engine=myisam +master-bin.000001 197 Query 1 285 use `test`; insert into t1 values (4) +master-bin.000001 285 Query 1 373 use `test`; insert into t1 values (5) +master-bin.000001 373 Query 1 461 use `test`; insert into t1 values (6) +master-bin.000001 461 Query 1 537 use `test`; drop table t1 +set session autocommit = @ac; +End of 5.0 tests diff --git a/mysql-test/t/binlog.test b/mysql-test/t/binlog.test index accfa6a577f..6271a8f95a8 100644 --- a/mysql-test/t/binlog.test +++ b/mysql-test/t/binlog.test @@ -3,7 +3,6 @@ # -- source include/have_log_bin.inc -- source include/not_embedded.inc --- source include/have_bdb.inc -- source include/have_innodb.inc -- source include/have_log_bin.inc @@ -12,7 +11,7 @@ drop table if exists t1, t2; --enable_warnings reset master; -create table t1 (a int) engine=bdb; +create table t1 (a int) engine=innodb; create table t2 (a int) engine=innodb; begin; insert t1 values (5); @@ -49,3 +48,93 @@ show binlog events in 'master-bin.000001' from 98; --replace_column 2 # 5 # show binlog events in 'master-bin.000002' from 98; +# +# Bug#22540 - Incorrect value in column End_log_pos of +# SHOW BINLOG EVENTS using InnoDB +# + +# the following tests will show that certain queries now return +# absolute offsets (from binlog start, rather than relative to +# the beginning of the current transaction). under what +# conditions it should be allowed / is sensible to put the +# slider into the middle of a transaction is not our concern +# here; we just guarantee that if and when it's done, the +# user has valid offsets to use. if the setter function still +# wants to throw a "positioning into middle of transaction" +# warning, that's its prerogative and handled elsewhere. + +set @ac = @@autocommit; + +# first show this to work for SHOW BINLOG EVENTS + +set autocommit= 0; +reset master; +create table t1(n int) engine=innodb; +begin; +insert into t1 values (1); +insert into t1 values (2); +insert into t1 values (3); +commit; +drop table t1; +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/ +show binlog events from 0; + +set autocommit= 1; +reset master; +create table t1(n int) engine=innodb; +insert into t1 values (1); +insert into t1 values (2); +insert into t1 values (3); +commit; +drop table t1; +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/ +show binlog events from 0; + +reset master; +create table t1(n int) engine=myisam; +begin; +insert into t1 values (4); +insert into t1 values (5); +insert into t1 values (6); +commit; +drop table t1; +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/ +show binlog events from 0; + +# now show this also works for SHOW MASTER STATUS +# as this is what "mysqldump --master-data=1" uses. + +set autocommit= 1; +reset master; +create table t1(n int) engine=innodb; +show master status; +insert into t1 values (1); +show master status; +insert into t1 values (2); +insert into t1 values (3); +show master status; +commit; +show master status; +drop table t1; +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/ +show binlog events from 0; + +set autocommit= 0; +reset master; +create table t1(n int) engine=myisam; +show master status; +insert into t1 values (4); +show master status; +insert into t1 values (5); +insert into t1 values (6); + +show master status; +commit; +show master status; +drop table t1; +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/ +show binlog events from 0; + +set session autocommit = @ac; + +--echo End of 5.0 tests diff --git a/sql/log.cc b/sql/log.cc index 818828f9557..465d694ba10 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -134,7 +134,7 @@ static int binlog_commit(THD *thd, bool all) // we're here because trans_log was flushed in MYSQL_LOG::log_xid() DBUG_RETURN(0); } - if (all) + if (all) { Query_log_event qev(thd, STRING_WITH_LEN("COMMIT"), TRUE, FALSE); qev.error_code= 0; // see comment in MYSQL_LOG::write(THD, IO_CACHE) @@ -1835,7 +1835,9 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) if (likely(is_open())) // Should always be true { - uint length; + uint length, group, carry, hdr_offs; + long val; + byte header[LOG_EVENT_HEADER_LEN]; /* Log "BEGIN" at the beginning of the transaction. @@ -1867,13 +1869,66 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) /* Read from the file used to cache the queries .*/ if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0)) goto err; - length=my_b_bytes_in_cache(cache); + + length= my_b_bytes_in_cache(cache); DBUG_EXECUTE_IF("half_binlogged_transaction", length-=100;); + + group= my_b_tell(&log_file); + hdr_offs= carry= 0; + do { + if (likely(carry > 0)) + { + DBUG_ASSERT(carry < LOG_EVENT_HEADER_LEN); + + memcpy(&header[carry], (char *)cache->read_pos, LOG_EVENT_HEADER_LEN - carry); + + val= uint4korr(&header[LOG_POS_OFFSET]) + group; + int4store(&header[LOG_POS_OFFSET], val); + + if (my_b_write(&log_file, header, carry)) + goto err; + + memcpy((char *)cache->read_pos, &header[carry], LOG_EVENT_HEADER_LEN - carry); + + hdr_offs = LOG_EVENT_HEADER_LEN - carry + + uint4korr(&header[EVENT_LEN_OFFSET]); + + carry= 0; + } + + if(likely(length > 0)) + { + do { + DBUG_ASSERT((hdr_offs + max(EVENT_LEN_OFFSET, LOG_POS_OFFSET) + 4) <= length); + + val= uint4korr((char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET) + group; + int4store((char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET, val); + hdr_offs += uint4korr((char *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET); + + /* header beyond current read-buffer? */ + if (hdr_offs >= length) + { + hdr_offs -= length; + break; + } + + /* split header? */ + if (hdr_offs + LOG_EVENT_HEADER_LEN > length) + { + carry= length - hdr_offs; + + memcpy(header, (char *)cache->read_pos + hdr_offs, carry); + length -= carry; + } + + } while (hdr_offs < length); + } + /* Write data to the binary log file */ if (my_b_write(&log_file, cache->read_pos, length)) - goto err; + goto err; cache->read_pos=cache->read_end; // Mark buffer used up DBUG_EXECUTE_IF("half_binlogged_transaction", goto DBUG_skip_commit;); } while ((length=my_b_fill(cache))); From 4ca5aabf98044166d98d261a0dfee8a4ef4bdfef Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Mon, 25 Jun 2007 11:37:10 +0200 Subject: [PATCH 04/38] Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB fix binlog-writing so that end_log_pos is given correctly even within transactions for both SHOW BINLOG and SHOW MASTER STATUS, that is as absolute values (from log start) rather than relative values (from transaction's start). --- Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 into sin.intern.azundris.com:/home/tnurnberg/22540/51-22540 --- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint into sin.intern.azundris.com:/home/tnurnberg/22540/51-22540 --- mysql-test/extra/binlog_tests/binlog.test | 92 +++++++++++++++++ mysql-test/r/binlog_stm_binlog.result | 118 +++++++++++++++++++++- sql/log.cc | 60 ++++++++++- 3 files changed, 267 insertions(+), 3 deletions(-) diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test index e838acbed35..02d5a92ea38 100644 --- a/mysql-test/extra/binlog_tests/binlog.test +++ b/mysql-test/extra/binlog_tests/binlog.test @@ -49,6 +49,98 @@ show binlog events in 'master-bin.000001' from 106; --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\// show binlog events in 'master-bin.000002' from 106; + +# +# Bug#22540 - Incorrect value in column End_log_pos of +# SHOW BINLOG EVENTS using InnoDB +# + +# the following tests will show that certain queries now return +# absolute offsets (from binlog start, rather than relative to +# the beginning of the current transaction). under what +# conditions it should be allowed / is sensible to put the +# slider into the middle of a transaction is not our concern +# here; we just guarantee that if and when it's done, the +# user has valid offsets to use. if the setter function still +# wants to throw a "positioning into middle of transaction" +# warning, that's its prerogative and handled elsewhere. + +set @ac = @@autocommit; + +# first show this to work for SHOW BINLOG EVENTS + +set autocommit= 0; +reset master; +create table t1(n int) engine=innodb; +begin; +insert into t1 values (1); +insert into t1 values (2); +insert into t1 values (3); +commit; +drop table t1; +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/ +show binlog events from 0; + +set autocommit= 1; +reset master; +create table t1(n int) engine=innodb; +insert into t1 values (1); +insert into t1 values (2); +insert into t1 values (3); +commit; +drop table t1; +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/ +show binlog events from 0; + +reset master; +create table t1(n int) engine=myisam; +begin; +insert into t1 values (4); +insert into t1 values (5); +insert into t1 values (6); +commit; +drop table t1; +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/ +show binlog events from 0; + +# now show this also works for SHOW MASTER STATUS +# as this is what "mysqldump --master-data=1" uses. + +set autocommit= 1; +reset master; +create table t1(n int) engine=innodb; +show master status; +insert into t1 values (1); +show master status; +insert into t1 values (2); +insert into t1 values (3); +show master status; +commit; +show master status; +drop table t1; +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/ +show binlog events from 0; + +set autocommit= 0; +reset master; +create table t1(n int) engine=myisam; +show master status; +insert into t1 values (4); +show master status; +insert into t1 values (5); +insert into t1 values (6); + +show master status; +commit; +show master status; +drop table t1; +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/ +show binlog events from 0; + +set session autocommit = @ac; + +--echo End of 5.0 tests + # Test of a too big SET INSERT_ID: see if the truncated value goes # into binlog (right), or the too big value (wrong); we look at the # binlog further down with SHOW BINLOG EVENTS. diff --git a/mysql-test/r/binlog_stm_binlog.result b/mysql-test/r/binlog_stm_binlog.result index 66fe3e40270..1bc7430fde0 100644 --- a/mysql-test/r/binlog_stm_binlog.result +++ b/mysql-test/r/binlog_stm_binlog.result @@ -7,7 +7,7 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 4 Format_desc 1 106 Server ver: #, Binlog ver: # master-bin.000001 106 Query 1 213 use `test`; create table t1 (a int, b int) engine=innodb master-bin.000001 213 Query 1 281 use `test`; BEGIN -master-bin.000001 281 Query 1 90 use `test`; insert into t1 values (1,2) +master-bin.000001 281 Query 1 371 use `test`; insert into t1 values (1,2) master-bin.000001 371 Xid 1 398 COMMIT /* XID */ drop table t1; drop table if exists t1, t2; @@ -145,6 +145,122 @@ master-bin.000001 # Rotate 1 # master-bin.000002;pos=4 show binlog events in 'master-bin.000002' from 106; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000002 # Query 1 # use `test`; drop table t1 +set @ac = @@autocommit; +set autocommit= 0; +reset master; +create table t1(n int) engine=innodb; +begin; +insert into t1 values (1); +insert into t1 values (2); +insert into t1 values (3); +commit; +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb +master-bin.000001 205 Query 1 273 use `test`; BEGIN +master-bin.000001 273 Query 1 361 use `test`; insert into t1 values (1) +master-bin.000001 361 Query 1 449 use `test`; insert into t1 values (2) +master-bin.000001 449 Query 1 537 use `test`; insert into t1 values (3) +master-bin.000001 537 Xid 1 564 COMMIT /* XID */ +master-bin.000001 564 Query 1 640 use `test`; drop table t1 +set autocommit= 1; +reset master; +create table t1(n int) engine=innodb; +insert into t1 values (1); +insert into t1 values (2); +insert into t1 values (3); +commit; +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb +master-bin.000001 205 Query 1 293 use `test`; insert into t1 values (1) +master-bin.000001 293 Xid 1 320 COMMIT /* XID */ +master-bin.000001 320 Query 1 408 use `test`; insert into t1 values (2) +master-bin.000001 408 Xid 1 435 COMMIT /* XID */ +master-bin.000001 435 Query 1 523 use `test`; insert into t1 values (3) +master-bin.000001 523 Xid 1 550 COMMIT /* XID */ +master-bin.000001 550 Query 1 626 use `test`; drop table t1 +reset master; +create table t1(n int) engine=myisam; +begin; +insert into t1 values (4); +insert into t1 values (5); +insert into t1 values (6); +commit; +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=myisam +master-bin.000001 205 Query 1 293 use `test`; insert into t1 values (4) +master-bin.000001 293 Query 1 381 use `test`; insert into t1 values (5) +master-bin.000001 381 Query 1 469 use `test`; insert into t1 values (6) +master-bin.000001 469 Query 1 545 use `test`; drop table t1 +set autocommit= 1; +reset master; +create table t1(n int) engine=innodb; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 205 +insert into t1 values (1); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 320 +insert into t1 values (2); +insert into t1 values (3); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 550 +commit; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 550 +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb +master-bin.000001 205 Query 1 293 use `test`; insert into t1 values (1) +master-bin.000001 293 Xid 1 320 COMMIT /* XID */ +master-bin.000001 320 Query 1 408 use `test`; insert into t1 values (2) +master-bin.000001 408 Xid 1 435 COMMIT /* XID */ +master-bin.000001 435 Query 1 523 use `test`; insert into t1 values (3) +master-bin.000001 523 Xid 1 550 COMMIT /* XID */ +master-bin.000001 550 Query 1 626 use `test`; drop table t1 +set autocommit= 0; +reset master; +create table t1(n int) engine=myisam; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 205 +insert into t1 values (4); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 293 +insert into t1 values (5); +insert into t1 values (6); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 469 +commit; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 469 +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=myisam +master-bin.000001 205 Query 1 293 use `test`; insert into t1 values (4) +master-bin.000001 293 Query 1 381 use `test`; insert into t1 values (5) +master-bin.000001 381 Query 1 469 use `test`; insert into t1 values (6) +master-bin.000001 469 Query 1 545 use `test`; drop table t1 +set session autocommit = @ac; +End of 5.0 tests reset master; create table t1 (id tinyint auto_increment primary key); set insert_id=128; diff --git a/sql/log.cc b/sql/log.cc index 6dc204265b0..de5d94a2e93 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3945,9 +3945,65 @@ int MYSQL_BIN_LOG::write_cache(IO_CACHE *cache, bool lock_log, bool sync_log) if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0)) return ER_ERROR_ON_WRITE; - uint bytes= my_b_bytes_in_cache(cache); + uint bytes= my_b_bytes_in_cache(cache), group, carry, hdr_offs; + long val; + uchar header[LOG_EVENT_HEADER_LEN]; + + group= my_b_tell(&log_file); + hdr_offs= carry= 0; + do { + if (likely(carry > 0)) + { + DBUG_ASSERT(carry < LOG_EVENT_HEADER_LEN); + + memcpy(&header[carry], (char *)cache->read_pos, LOG_EVENT_HEADER_LEN - carry); + + val= uint4korr(&header[LOG_POS_OFFSET]) + group; + int4store(&header[LOG_POS_OFFSET], val); + + if (my_b_write(&log_file, header, carry)) + return ER_ERROR_ON_WRITE; + + memcpy((char *)cache->read_pos, &header[carry], LOG_EVENT_HEADER_LEN - carry); + + hdr_offs = LOG_EVENT_HEADER_LEN - carry + + uint4korr(&header[EVENT_LEN_OFFSET]); + + carry= 0; + } + + if(likely(bytes > 0)) + { + do { + DBUG_ASSERT((hdr_offs + max(EVENT_LEN_OFFSET, LOG_POS_OFFSET) + 4) <= bytes); + + val= uint4korr((char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET) + group; + int4store((char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET, val); + hdr_offs += uint4korr((char *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET); + + /* header beyond current read-buffer? */ + if (hdr_offs >= bytes) + { + hdr_offs -= bytes; + break; + } + + /* split header? */ + if (hdr_offs + LOG_EVENT_HEADER_LEN > bytes) + { + carry= bytes - hdr_offs; + + memcpy(header, (char *)cache->read_pos + hdr_offs, carry); + bytes -= carry; + } + + } while (hdr_offs < bytes); + } + + /* Write data to the binary log file */ + if (my_b_write(&log_file, cache->read_pos, bytes)) return ER_ERROR_ON_WRITE; cache->read_pos= cache->read_end; @@ -4028,7 +4084,7 @@ bool MYSQL_BIN_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) if ((write_error= write_cache(cache, false, false))) goto err; - + if (commit_event && commit_event->write(&log_file)) goto err; if (flush_and_sync()) From 874ccf025dcd9df0d6962306e810f299a49e9901 Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Mon, 25 Jun 2007 18:41:17 +0200 Subject: [PATCH 05/38] Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB end_log_pos data within a transaction are relative to the start of the transaction rather than absolute. we fix those groups in situ before writing the log out. additional comments and handling for groups with very large single events, as suggested by Guilhem. --- sql/log.cc | 90 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 68 insertions(+), 22 deletions(-) diff --git a/sql/log.cc b/sql/log.cc index 465d694ba10..a5c5f42a393 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1835,8 +1835,7 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) if (likely(is_open())) // Should always be true { - uint length, group, carry, hdr_offs; - long val; + uint length, group, carry, hdr_offs, val; byte header[LOG_EVENT_HEADER_LEN]; /* @@ -1873,57 +1872,104 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) length= my_b_bytes_in_cache(cache); DBUG_EXECUTE_IF("half_binlogged_transaction", length-=100;); + /* + The events in the buffer have incorrect end_log_pos data + (relative to beginning of group rather than absolute), + so we'll recalculate them in situ so the binlog is always + correct, even in the middle of a group. This is possible + because we now know the start position of the group (the + offset of this cache in the log, if you will); all we need + to do is to find all event-headers, and add the position of + the group to the end_log_pos of each event. This is pretty + straight forward, except that we read the cache in segments, + so an event-header might end up on the cache-border and get + split. + */ + group= my_b_tell(&log_file); hdr_offs= carry= 0; do { - if (likely(carry > 0)) + + /* + if we only got a partial header in the last iteration, + get the other half now and process a full header. + */ + if (unlikely(carry > 0)) { DBUG_ASSERT(carry < LOG_EVENT_HEADER_LEN); + /* assemble both halves */ memcpy(&header[carry], (char *)cache->read_pos, LOG_EVENT_HEADER_LEN - carry); + /* fix end_log_pos */ val= uint4korr(&header[LOG_POS_OFFSET]) + group; int4store(&header[LOG_POS_OFFSET], val); + /* write the first half of the split header */ if (my_b_write(&log_file, header, carry)) goto err; + /* + copy fixed second half of header to cache so the correct + version will be written later. + */ memcpy((char *)cache->read_pos, &header[carry], LOG_EVENT_HEADER_LEN - carry); + /* next event header at ... */ hdr_offs = LOG_EVENT_HEADER_LEN - carry + uint4korr(&header[EVENT_LEN_OFFSET]); carry= 0; } + /* if there is anything to write, process it. */ + if(likely(length > 0)) { - do { - DBUG_ASSERT((hdr_offs + max(EVENT_LEN_OFFSET, LOG_POS_OFFSET) + 4) <= length); + /* + next header beyond current read-buffer? we'll get it later + (though not necessarily in the very next iteration). + */ - val= uint4korr((char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET) + group; - int4store((char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET, val); - hdr_offs += uint4korr((char *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET); + if (hdr_offs >= length) + hdr_offs -= length; + else + { - /* header beyond current read-buffer? */ - if (hdr_offs >= length) - { - hdr_offs -= length; - break; - } + /* process all event-headers in this (partial) cache. */ - /* split header? */ - if (hdr_offs + LOG_EVENT_HEADER_LEN > length) - { - carry= length - hdr_offs; + do { - memcpy(header, (char *)cache->read_pos + hdr_offs, carry); - length -= carry; - } + /* + partial header only? save what we can get, process once + we get the rest. + */ - } while (hdr_offs < length); + if (hdr_offs + LOG_EVENT_HEADER_LEN > length) + { + carry= length - hdr_offs; + memcpy(header, (char *)cache->read_pos + hdr_offs, carry); + length= hdr_offs; + } + else + { + /* we've got a full event-header, and it came in one piece */ + + char *log_pos= cache->read_pos + hdr_offs + LOG_POS_OFFSET; + + /* fix end_log_pos */ + val= uint4korr(log_pos) + group; + int4store(log_pos, val); + + /* next event header at ... */ + log_pos= (char *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET; + hdr_offs += uint4korr(log_pos); + + } + } while (hdr_offs < length); + } } /* Write data to the binary log file */ From 5c3273f19d998ec650206ca324e8629895ca9187 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Tue, 26 Jun 2007 12:26:21 +0200 Subject: [PATCH 06/38] Bug#25657 mysql-test-run.pl kill itself under ActiveState perl - Various fixes for running mysql-test-run.pl on ActiveState perl for windows. Reading it's source in win32/win32.c helps... --- mysql-test/lib/mtr_process.pl | 17 ++++++++++++++++- mysql-test/lib/mtr_timer.pl | 9 +++++++-- mysql-test/mysql-test-run.pl | 27 ++++++++++++++++++--------- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index e4fd3390c5f..57f9cf571bb 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -611,6 +611,11 @@ sub mtr_check_stop_servers ($) { if ( $pid ) { # Server is still alive, put it in list to be hard killed + if ($::glob_win32_perl) + { + # Kill the real process if it's known + $pid= $srv->{'real_pid'} if ($srv->{'real_pid'}); + } $kill_pids{$pid}= 1; # Write a message to the process's error log (if it has one) @@ -664,6 +669,16 @@ sub mtr_check_stop_servers ($) { } } + if ($::glob_win32_perl and $srv->{'real_pid'}) + { + # Wait for the pseudo pid - if the real_pid was known + # the pseudo pid has not been waited for yet, wai blocking + # since it's "such a simple program" + mtr_verbose("Wait for pseudo process $srv->{'pid'}"); + my $ret_pid= waitpid($srv->{'pid'}, 0); + mtr_verbose("Pseudo process $ret_pid died"); + } + $srv->{'pid'}= 0; } } @@ -1041,7 +1056,7 @@ sub sleep_until_file_created ($$$) { { if ( -r $pidfile ) { - return $pid; + return 1; } # Check if it died after the fork() was successful diff --git a/mysql-test/lib/mtr_timer.pl b/mysql-test/lib/mtr_timer.pl index 523799f7cf5..86a9f58514f 100644 --- a/mysql-test/lib/mtr_timer.pl +++ b/mysql-test/lib/mtr_timer.pl @@ -97,9 +97,14 @@ sub mtr_timer_start($$$) { # clearing the signal handler. $SIG{INT}= 'DEFAULT'; + $SIG{TERM}= sub { + mtr_verbose("timer woke up, exiting!"); + exit(0); + }; + $0= "mtr_timer(timers,$name,$duration)"; - mtr_verbose("timer child $name, sleep $duration"); sleep($duration); + mtr_verbose("timer expired after $duration seconds"); exit(0); } } @@ -118,7 +123,7 @@ sub mtr_timer_stop ($$) { # FIXME as Cygwin reuses pids fast, maybe check that is # the expected process somehow?! - kill(9, $tpid); + kill(15, $tpid); # As the timers are so simple programs, we trust them to terminate, # and use blocking wait for it. We wait just to avoid a zombie. diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 08090e5b96f..c58ed308bd8 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2579,10 +2579,19 @@ sub ndbcluster_wait_started($$){ sub mysqld_wait_started($){ my $mysqld= shift; - my $res= sleep_until_file_created($mysqld->{'path_pid'}, - $mysqld->{'start_timeout'}, - $mysqld->{'pid'}); - return $res == 0; + if (sleep_until_file_created($mysqld->{'path_pid'}, + $mysqld->{'start_timeout'}, + $mysqld->{'pid'}) == 0) + { + # Failed to wait for pid file + return 1; + } + + # Get the "real pid" of the process, it will be used for killing + # the process in ActiveState's perl on windows + $mysqld->{'real_pid'}= mtr_get_pid_from_file($mysqld->{'path_pid'}); + + return 0; } @@ -3720,7 +3729,6 @@ sub mysqld_arguments ($$$$) { mtr_add_arg($args, "%s--no-defaults", $prefix); - mtr_add_arg($args, "%s--console", $prefix); mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir); mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir); @@ -4093,6 +4101,7 @@ sub stop_all_servers () { push(@kill_pids,{ pid => $mysqld->{'pid'}, + real_pid => $mysqld->{'real_pid'}, pidfile => $mysqld->{'path_pid'}, sockfile => $mysqld->{'path_sock'}, port => $mysqld->{'port'}, @@ -4300,6 +4309,7 @@ sub run_testcase_stop_servers($$$) { push(@kill_pids,{ pid => $mysqld->{'pid'}, + real_pid => $mysqld->{'real_pid'}, pidfile => $mysqld->{'path_pid'}, sockfile => $mysqld->{'path_sock'}, port => $mysqld->{'port'}, @@ -4351,6 +4361,7 @@ sub run_testcase_stop_servers($$$) { push(@kill_pids,{ pid => $mysqld->{'pid'}, + real_pid => $mysqld->{'real_pid'}, pidfile => $mysqld->{'path_pid'}, sockfile => $mysqld->{'path_sock'}, port => $mysqld->{'port'}, @@ -4775,12 +4786,10 @@ sub run_mysqltest ($) { mtr_add_arg($args, "%s", $_) for @args_saved; } - mtr_add_arg($args, "--test-file"); - mtr_add_arg($args, $tinfo->{'path'}); + mtr_add_arg($args, "--test-file=%s", $tinfo->{'path'}); if ( defined $tinfo->{'result_file'} ) { - mtr_add_arg($args, "--result-file"); - mtr_add_arg($args, $tinfo->{'result_file'}); + mtr_add_arg($args, "--result-file=%s", $tinfo->{'result_file'}); } if ( $opt_record ) From 058877e05ecd95969b8cb672bb6bc5ebae9f3de1 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Tue, 26 Jun 2007 14:18:53 +0200 Subject: [PATCH 07/38] Bug #29133 mysqld does not exit during shutdown - Fix faulty merge by adding back the 'pthread_kill' call that wakes up the select thread --- sql/mysqld.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 12cab1c6de6..cdb6ee616db 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -762,6 +762,7 @@ static void close_connections(void) DBUG_PRINT("info",("Waiting for select thread")); #ifndef DONT_USE_THR_ALARM + if (pthread_kill(select_thread, thr_client_alarm)) break; // allready dead #endif set_timespec(abstime, 2); From b1827ecb0420f597b5a2b3806fd7e57093bd434b Mon Sep 17 00:00:00 2001 From: "iggy@amd64.(none)" <> Date: Tue, 26 Jun 2007 11:26:01 -0400 Subject: [PATCH 08/38] Bug#24732 Executables do not include Vista manifests - Corrected manifest attributes. --- CMakeLists.txt | 2 +- win/create_manifest.js | 10 +++------- win/mysql_manifest.cmake | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54df0befad9..d2a828c1843 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,7 +161,7 @@ IF(EMBED_MANIFESTS) ENDIF(NOT tmp_manifest) # Set the processor architecture. IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") - SET(PROCESSOR_ARCH "X64") + SET(PROCESSOR_ARCH "amd64") ELSE(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") SET(PROCESSOR_ARCH "X86") ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") diff --git a/win/create_manifest.js b/win/create_manifest.js index 520ecec21b8..8569bd508ff 100755 --- a/win/create_manifest.js +++ b/win/create_manifest.js @@ -1,11 +1,10 @@ /* manifest.js - Writes a custom XML manifest for each executable/library - 6 command line options must be supplied: + 5 command line options must be supplied: name - Name of the executable/library into which the mainfest will be embedded. version - Version of the executable arch - Architecture intended. - type - Application type. exe_level - Application execution level. [asInvoker|highestAvailable|requireAdministrator] outfile - Final destination where mainfest will be written. @@ -37,9 +36,6 @@ try case "arch": var app_arch= parts[1]; break; - case "type": - var app_type= parts[1]; - break; case "exe_level": var app_exe_level= parts[1]; break; @@ -50,7 +46,7 @@ try WScript.echo("Invalid argument supplied."); } } - if (i != 6) + if (i != 5) throw new Error(1, "Incorrect number of arguments."); var manifest_xml= "\r\n"; @@ -61,7 +57,7 @@ try manifest_xml+= " version=\'" + app_version + "\'"; manifest_xml+= " processorArchitecture=\'" + app_arch + "\'"; // TOADD - Add publicKeyToken attribute once we have Authenticode key. - manifest_xml+= " type=\'" + app_type + "\' />\r\n"; + manifest_xml+= " type=\'win32\' />\r\n"; // Identify the application security requirements. manifest_xml+= "\t\r\n"; manifest_xml+= "\t\t\r\n\t\t\t\r\n\t\t\t\t"; diff --git a/win/mysql_manifest.cmake b/win/mysql_manifest.cmake index b5bb6fda8fb..4c88be1d800 100755 --- a/win/mysql_manifest.cmake +++ b/win/mysql_manifest.cmake @@ -9,7 +9,7 @@ MACRO(MYSQL_EMBED_MANIFEST _target_name _required_privs) TARGET ${_target_name} PRE_LINK COMMAND cscript.exe - ARGS "${PROJECT_SOURCE_DIR}/win/create_manifest.js" name=$(ProjectName) version=${VERSION} arch=${PROCESSOR_ARCH} type=$(PlatformName) exe_level=${_required_privs} outfile=$(IntDir)\\$(TargetFileName).intermediate.manifest + ARGS "${PROJECT_SOURCE_DIR}/win/create_manifest.js" name=$(ProjectName) version=${VERSION} arch=${PROCESSOR_ARCH} exe_level=${_required_privs} outfile=$(IntDir)\\$(TargetFileName).intermediate.manifest COMMENT "Generates the contents of the manifest contents.") ADD_CUSTOM_COMMAND( TARGET ${_target_name} From 7dddab867df320f28631241468b50ff63d7b01a3 Mon Sep 17 00:00:00 2001 From: "iggy@amd64.(none)" <> Date: Tue, 26 Jun 2007 14:24:01 -0400 Subject: [PATCH 09/38] Bug#24732 Executables do not include Vista manifests - Post Merge Fixup --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 538c5cb122e..1bdb1e01612 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -174,7 +174,7 @@ IF(EMBED_MANIFESTS) ENDIF(NOT tmp_manifest) # Set the processor architecture. IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") - SET(PROCESSOR_ARCH "X64") + SET(PROCESSOR_ARCH "amd64") ELSE(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") SET(PROCESSOR_ARCH "X86") ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") From d7ba5280260ed4da5a4d7e877fca44a566cca784 Mon Sep 17 00:00:00 2001 From: "dkatz@damien-katzs-computer.local" <> Date: Tue, 26 Jun 2007 20:33:53 -0400 Subject: [PATCH 10/38] Bug #29307 status.test fails with different Table_locks_immediate Added more sleep time befoe reap to allow query to be executed. --- mysql-test/t/status.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/t/status.test b/mysql-test/t/status.test index 3f7671b18d4..6fcb82e160d 100644 --- a/mysql-test/t/status.test +++ b/mysql-test/t/status.test @@ -25,7 +25,7 @@ connection con1; --send update t1 set n = 3; connection con2; -sleep 0.5; +sleep 1; unlock tables; connection con1; reap; From 31e98955a5aa1da0fbbd8cfcfc9e9c9c74907e60 Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Wed, 27 Jun 2007 08:18:24 +0200 Subject: [PATCH 11/38] Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into mysql.com:/home/ram/work/b29079/b29079.5.0 --- Bug #22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB fix binlog-writing so that end_log_pos is given correctly even within transactions for both SHOW BINLOG and SHOW MASTER STATUS, that is as absolute values (from log start) rather than relative values (from transaction's start). --- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 --- Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB end_log_pos data within a transaction are relative to the start of the transaction rather than absolute. we fix those groups in situ before writing the log out. additional comments and handling for groups with very large single events, as suggested by Guilhem. --- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint into amd64.(none):/src/bug24732/my50-bug24732 --- Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 into maint1.mysql.com:/data/localhome/tsmith/bk/maint/50 --- Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB end_log_pos data within a transaction are relative to the start of the transaction rather than absolute. we fix those groups in situ before writing the log out. additional comments and handling for groups with very large single events, as suggested by Guilhem. --- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint into sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 --- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint into sin.intern.azundris.com:/home/tnurnberg/22540/51-22540 --- Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 into sin.intern.azundris.com:/home/tnurnberg/22540/51-22540 --- mysql-test/r/rpl_truncate_7ndb.result | 40 ++++++------ sql/log.cc | 92 ++++++++++++++++++++------- 2 files changed, 89 insertions(+), 43 deletions(-) diff --git a/mysql-test/r/rpl_truncate_7ndb.result b/mysql-test/r/rpl_truncate_7ndb.result index 62ace911e45..602c4d55ac5 100644 --- a/mysql-test/r/rpl_truncate_7ndb.result +++ b/mysql-test/r/rpl_truncate_7ndb.result @@ -32,11 +32,11 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 4 Format_desc 1 106 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 106 Query 1 223 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB master-bin.000001 223 Query 1 287 BEGIN -master-bin.000001 287 Table_map 1 40 table_id: # (test.t1) -master-bin.000001 327 Table_map 1 98 table_id: # (mysql.ndb_apply_status) -master-bin.000001 385 Write_rows 1 157 table_id: # -master-bin.000001 444 Write_rows 1 195 table_id: # -master-bin.000001 482 Write_rows 1 233 table_id: # flags: STMT_END_F +master-bin.000001 287 Table_map 1 327 table_id: # (test.t1) +master-bin.000001 327 Table_map 1 385 table_id: # (mysql.ndb_apply_status) +master-bin.000001 385 Write_rows 1 444 table_id: # +master-bin.000001 444 Write_rows 1 482 table_id: # +master-bin.000001 482 Write_rows 1 520 table_id: # flags: STMT_END_F master-bin.000001 520 Query 1 585 COMMIT master-bin.000001 585 Query 1 665 use `test`; TRUNCATE TABLE t1 master-bin.000001 665 Query 1 741 use `test`; DROP TABLE t1 @@ -69,27 +69,27 @@ Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 4 Format_desc 1 106 Server ver: SERVER_VERSION, Binlog ver: 4 master-bin.000001 106 Query 1 223 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB master-bin.000001 223 Query 1 287 BEGIN -master-bin.000001 287 Table_map 1 40 table_id: # (test.t1) -master-bin.000001 327 Table_map 1 98 table_id: # (mysql.ndb_apply_status) -master-bin.000001 385 Write_rows 1 157 table_id: # -master-bin.000001 444 Write_rows 1 195 table_id: # -master-bin.000001 482 Write_rows 1 233 table_id: # flags: STMT_END_F +master-bin.000001 287 Table_map 1 327 table_id: # (test.t1) +master-bin.000001 327 Table_map 1 385 table_id: # (mysql.ndb_apply_status) +master-bin.000001 385 Write_rows 1 444 table_id: # +master-bin.000001 444 Write_rows 1 482 table_id: # +master-bin.000001 482 Write_rows 1 520 table_id: # flags: STMT_END_F master-bin.000001 520 Query 1 585 COMMIT master-bin.000001 585 Query 1 665 use `test`; TRUNCATE TABLE t1 master-bin.000001 665 Query 1 741 use `test`; DROP TABLE t1 master-bin.000001 741 Query 1 858 use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB master-bin.000001 858 Query 1 922 BEGIN -master-bin.000001 922 Table_map 1 40 table_id: # (test.t1) -master-bin.000001 962 Table_map 1 98 table_id: # (mysql.ndb_apply_status) -master-bin.000001 1020 Write_rows 1 157 table_id: # -master-bin.000001 1079 Write_rows 1 195 table_id: # -master-bin.000001 1117 Write_rows 1 233 table_id: # flags: STMT_END_F +master-bin.000001 922 Table_map 1 962 table_id: # (test.t1) +master-bin.000001 962 Table_map 1 1020 table_id: # (mysql.ndb_apply_status) +master-bin.000001 1020 Write_rows 1 1079 table_id: # +master-bin.000001 1079 Write_rows 1 1117 table_id: # +master-bin.000001 1117 Write_rows 1 1155 table_id: # flags: STMT_END_F master-bin.000001 1155 Query 1 1220 COMMIT master-bin.000001 1220 Query 1 1284 BEGIN -master-bin.000001 1284 Table_map 1 40 table_id: # (test.t1) -master-bin.000001 1324 Table_map 1 98 table_id: # (mysql.ndb_apply_status) -master-bin.000001 1382 Write_rows 1 157 table_id: # -master-bin.000001 1441 Delete_rows 1 191 table_id: # -master-bin.000001 1475 Delete_rows 1 225 table_id: # flags: STMT_END_F +master-bin.000001 1284 Table_map 1 1324 table_id: # (test.t1) +master-bin.000001 1324 Table_map 1 1382 table_id: # (mysql.ndb_apply_status) +master-bin.000001 1382 Write_rows 1 1441 table_id: # +master-bin.000001 1441 Delete_rows 1 1475 table_id: # +master-bin.000001 1475 Delete_rows 1 1509 table_id: # flags: STMT_END_F master-bin.000001 1509 Query 1 1574 COMMIT master-bin.000001 1574 Query 1 1650 use `test`; DROP TABLE t1 diff --git a/sql/log.cc b/sql/log.cc index de5d94a2e93..831066ab401 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3949,65 +3949,111 @@ int MYSQL_BIN_LOG::write_cache(IO_CACHE *cache, bool lock_log, bool sync_log) long val; uchar header[LOG_EVENT_HEADER_LEN]; + /* + The events in the buffer have incorrect end_log_pos data + (relative to beginning of group rather than absolute), + so we'll recalculate them in situ so the binlog is always + correct, even in the middle of a group. This is possible + because we now know the start position of the group (the + offset of this cache in the log, if you will); all we need + to do is to find all event-headers, and add the position of + the group to the end_log_pos of each event. This is pretty + straight forward, except that we read the cache in segments, + so an event-header might end up on the cache-border and get + split. + */ + group= my_b_tell(&log_file); hdr_offs= carry= 0; do { - if (likely(carry > 0)) + + /* + if we only got a partial header in the last iteration, + get the other half now and process a full header. + */ + if (unlikely(carry > 0)) { DBUG_ASSERT(carry < LOG_EVENT_HEADER_LEN); + /* assemble both halves */ memcpy(&header[carry], (char *)cache->read_pos, LOG_EVENT_HEADER_LEN - carry); + /* fix end_log_pos */ val= uint4korr(&header[LOG_POS_OFFSET]) + group; int4store(&header[LOG_POS_OFFSET], val); + /* write the first half of the split header */ if (my_b_write(&log_file, header, carry)) return ER_ERROR_ON_WRITE; + /* + copy fixed second half of header to cache so the correct + version will be written later. + */ memcpy((char *)cache->read_pos, &header[carry], LOG_EVENT_HEADER_LEN - carry); + /* next event header at ... */ hdr_offs = LOG_EVENT_HEADER_LEN - carry + uint4korr(&header[EVENT_LEN_OFFSET]); carry= 0; } + /* if there is anything to write, process it. */ + if(likely(bytes > 0)) { - do { - DBUG_ASSERT((hdr_offs + max(EVENT_LEN_OFFSET, LOG_POS_OFFSET) + 4) <= bytes); + /* + next header beyond current read-buffer? we'll get it later + (though not necessarily in the very next iteration). + */ - val= uint4korr((char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET) + group; - int4store((char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET, val); - hdr_offs += uint4korr((char *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET); + if (hdr_offs >= bytes) + hdr_offs -= bytes; + else + { - /* header beyond current read-buffer? */ - if (hdr_offs >= bytes) - { - hdr_offs -= bytes; - break; - } + /* process all event-headers in this (partial) cache. */ - /* split header? */ - if (hdr_offs + LOG_EVENT_HEADER_LEN > bytes) - { - carry= bytes - hdr_offs; + do { - memcpy(header, (char *)cache->read_pos + hdr_offs, carry); - bytes -= carry; - } + /* + partial header only? save what we can get, process once + we get the rest. + */ - } while (hdr_offs < bytes); + if (hdr_offs + LOG_EVENT_HEADER_LEN > bytes) + { + carry= bytes - hdr_offs; + memcpy(header, (char *)cache->read_pos + hdr_offs, carry); + bytes= hdr_offs; + } + else + { + /* we've got a full event-header, and it came in one piece */ + + uchar *log_pos= cache->read_pos + hdr_offs + LOG_POS_OFFSET; + + /* fix end_log_pos */ + val= uint4korr(log_pos) + group; + int4store(log_pos, val); + + /* next event header at ... */ + log_pos= (uchar *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET; + hdr_offs += uint4korr(log_pos); + + } + } while (hdr_offs < bytes); + } } /* Write data to the binary log file */ - if (my_b_write(&log_file, cache->read_pos, bytes)) return ER_ERROR_ON_WRITE; - cache->read_pos= cache->read_end; - } while ((bytes= my_b_fill(cache))); + cache->read_pos=cache->read_end; // Mark buffer used up + } while ((bytes=my_b_fill(cache))); if (sync_log) flush_and_sync(); From 131db8123fc0054db7e46e0e5154623da2d9d537 Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Wed, 27 Jun 2007 09:30:29 +0200 Subject: [PATCH 12/38] Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB windows fixies --- sql/log.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/log.cc b/sql/log.cc index a5c5f42a393..f682b9b206e 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1886,7 +1886,7 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) split. */ - group= my_b_tell(&log_file); + group= (uint)my_b_tell(&log_file); hdr_offs= carry= 0; do From dadc4c74994d189e12782c7ef6724e2cc17ca263 Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Wed, 27 Jun 2007 09:31:47 +0200 Subject: [PATCH 13/38] Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB windows fixies --- sql/log.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/log.cc b/sql/log.cc index 831066ab401..6e635ba581c 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3963,7 +3963,7 @@ int MYSQL_BIN_LOG::write_cache(IO_CACHE *cache, bool lock_log, bool sync_log) split. */ - group= my_b_tell(&log_file); + group= (uint)my_b_tell(&log_file); hdr_offs= carry= 0; do From ec22bd2355da5030a5eeb107aa1806fff3935dba Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Wed, 27 Jun 2007 13:19:28 +0200 Subject: [PATCH 14/38] Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB Windows fixies --- sql/log.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/log.cc b/sql/log.cc index f682b9b206e..af8168c6a46 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1957,7 +1957,7 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) { /* we've got a full event-header, and it came in one piece */ - char *log_pos= cache->read_pos + hdr_offs + LOG_POS_OFFSET; + char *log_pos= (char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET; /* fix end_log_pos */ val= uint4korr(log_pos) + group; From 2ca3289e3e750239c3ff891738e9af0ed0ae10e4 Mon Sep 17 00:00:00 2001 From: "ramil/ram@mysql.com/ramil.myoffice.izhnet.ru" <> Date: Wed, 27 Jun 2007 16:20:00 +0500 Subject: [PATCH 15/38] Fix for bug #29353: inserting a negative value to a csv table leads to the table corruption Problem: we believe a number cannot start with '-' ['+'] sign reading rows. Fix: let field->store() check given values. --- mysql-test/r/csv.result | 31 ++++++++++++++++++ mysql-test/t/csv.test | 25 +++++++++++++++ storage/csv/ha_tina.cc | 70 +++++++++++++++++++++-------------------- 3 files changed, 92 insertions(+), 34 deletions(-) diff --git a/mysql-test/r/csv.result b/mysql-test/r/csv.result index 34dc1cb5b2e..e7cdd612a25 100644 --- a/mysql-test/r/csv.result +++ b/mysql-test/r/csv.result @@ -5261,3 +5261,34 @@ CREATE TABLE `bug21328` ( insert into bug21328 values (1,NULL,NULL); alter table bug21328 engine=myisam; drop table bug21328; +create table t1(a int) engine=csv; +insert into t1 values(-1), (-123.34), (2), (-23); +select * from t1; +a +-1 +-123 +2 +-23 +check table t1; +Table Op Msg_type Msg_text +test.t1 check status OK +drop table t1; +create table t1(a int, b int) engine=csv; +repair table t1; +Table Op Msg_type Msg_text +test.t1 repair Warning Data truncated for column 'a' at row 1 +test.t1 repair status OK +check table t1; +Table Op Msg_type Msg_text +test.t1 check status OK +select * from t1; +a b +1 0 +-200 1 +-1 -1 +-1 -100 +check table t1; +Table Op Msg_type Msg_text +test.t1 check status OK +drop table t1; +End of 5.1 tests diff --git a/mysql-test/t/csv.test b/mysql-test/t/csv.test index c7c7f3e13ab..6d24b38ee10 100644 --- a/mysql-test/t/csv.test +++ b/mysql-test/t/csv.test @@ -1674,3 +1674,28 @@ CREATE TABLE `bug21328` ( insert into bug21328 values (1,NULL,NULL); alter table bug21328 engine=myisam; drop table bug21328; + +# +# Bug #29353: negative values +# +create table t1(a int) engine=csv; +insert into t1 values(-1), (-123.34), (2), (-23); +select * from t1; +check table t1; +drop table t1; + +create table t1(a int, b int) engine=csv; +--write_file $MYSQLTEST_VARDIR/master-data/test/t1.CSV +1, 1E-2 +-2E2, .9 +-10E-1, -.9 +-1, -100.1 +1a, -2b +EOF +repair table t1; +check table t1; +select * from t1; +check table t1; +drop table t1; + +--echo End of 5.1 tests diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index 6de153c82d7..239d47890ed 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -45,11 +45,12 @@ TODO: #pragma implementation // gcc: Class implementation #endif -#include "mysql_priv.h" +#define MYSQL_SERVER 1 +#include "mysql_priv.h" +#include #include "ha_tina.h" -#include /* uchar + uchar + ulonglong + ulonglong + ulonglong + ulonglong + uchar @@ -609,37 +610,41 @@ int ha_tina::find_current_row(uchar *buf) for (Field **field=table->field ; *field ; field++) { + char curr_char; + buffer.length(0); - if (curr_offset < end_offset && - file_buff->get_value(curr_offset) == '"') + if (curr_offset >= end_offset) + goto err; + curr_char= file_buff->get_value(curr_offset); + if (curr_char == '"') { curr_offset++; // Incrementpast the first quote - for(;curr_offset < end_offset; curr_offset++) + for(; curr_offset < end_offset; curr_offset++) { + curr_char= file_buff->get_value(curr_offset); // Need to convert line feeds! - if (file_buff->get_value(curr_offset) == '"' && - ((file_buff->get_value(curr_offset + 1) == ',') || - (curr_offset == end_offset -1 ))) + if (curr_char == '"' && + (curr_offset == end_offset - 1 || + file_buff->get_value(curr_offset + 1) == ',')) { curr_offset+= 2; // Move past the , and the " break; } - if (file_buff->get_value(curr_offset) == '\\' && - curr_offset != (end_offset - 1)) + if (curr_char == '\\' && curr_offset != (end_offset - 1)) { curr_offset++; - if (file_buff->get_value(curr_offset) == 'r') + curr_char= file_buff->get_value(curr_offset); + if (curr_char == 'r') buffer.append('\r'); - else if (file_buff->get_value(curr_offset) == 'n' ) + else if (curr_char == 'n' ) buffer.append('\n'); - else if ((file_buff->get_value(curr_offset) == '\\') || - (file_buff->get_value(curr_offset) == '"')) - buffer.append(file_buff->get_value(curr_offset)); + else if (curr_char == '\\' || curr_char == '"') + buffer.append(curr_char); else /* This could only happed with an externally created file */ { buffer.append('\\'); - buffer.append(file_buff->get_value(curr_offset)); + buffer.append(curr_char); } } else // ordinary symbol @@ -650,36 +655,29 @@ int ha_tina::find_current_row(uchar *buf) */ if (curr_offset == end_offset - 1) goto err; - buffer.append(file_buff->get_value(curr_offset)); + buffer.append(curr_char); } } } - else if (my_isdigit(system_charset_info, - file_buff->get_value(curr_offset))) + else { - for(;curr_offset < end_offset; curr_offset++) + for(; curr_offset < end_offset; curr_offset++) { - if (file_buff->get_value(curr_offset) == ',') + curr_char= file_buff->get_value(curr_offset); + if (curr_char == ',') { - curr_offset+= 1; // Move past the , + curr_offset++; // Skip the , break; } - - if (my_isdigit(system_charset_info, file_buff->get_value(curr_offset))) - buffer.append(file_buff->get_value(curr_offset)); - else if (file_buff->get_value(curr_offset) == '.') - buffer.append(file_buff->get_value(curr_offset)); - else - goto err; + buffer.append(curr_char); } } - else - { - goto err; - } if (bitmap_is_set(table->read_set, (*field)->field_index)) - (*field)->store(buffer.ptr(), buffer.length(), buffer.charset()); + { + if ((*field)->store(buffer.ptr(), buffer.length(), buffer.charset())) + goto err; + } } next_position= end_offset + eoln_len; error= 0; @@ -1004,6 +1002,7 @@ int ha_tina::delete_row(const uchar * buf) int ha_tina::rnd_init(bool scan) { + THD *thd= table ? table->in_use : current_thd; DBUG_ENTER("ha_tina::rnd_init"); /* set buffer to the beginning of the file */ @@ -1015,6 +1014,7 @@ int ha_tina::rnd_init(bool scan) stats.records= 0; records_is_known= 0; chain_ptr= chain; + thd->count_cuted_fields= CHECK_FIELD_WARN; // To find wrong values DBUG_RETURN(0); } @@ -1298,6 +1298,7 @@ int ha_tina::repair(THD* thd, HA_CHECK_OPT* check_opt) current_position= next_position= 0; /* Read the file row-by-row. If everything is ok, repair is not needed. */ + thd->count_cuted_fields= CHECK_FIELD_WARN; // To find wrong values while (!(rc= find_current_row(buf))) { rows_repaired++; @@ -1463,6 +1464,7 @@ int ha_tina::check(THD* thd, HA_CHECK_OPT* check_opt) /* set current position to the beginning of the file */ current_position= next_position= 0; /* Read the file row-by-row. If everything is ok, repair is not needed. */ + thd->count_cuted_fields= CHECK_FIELD_WARN; // To find wrong values while (!(rc= find_current_row(buf))) { count--; From 3b9e5093a3deb08bea44bb309d76abfe65df21a4 Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Wed, 27 Jun 2007 13:23:58 +0200 Subject: [PATCH 16/38] Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB windows fixies --- sql/log.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/log.cc b/sql/log.cc index 6e635ba581c..5f3ff9b10f7 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -4034,7 +4034,7 @@ int MYSQL_BIN_LOG::write_cache(IO_CACHE *cache, bool lock_log, bool sync_log) { /* we've got a full event-header, and it came in one piece */ - uchar *log_pos= cache->read_pos + hdr_offs + LOG_POS_OFFSET; + uchar *log_pos= (uchar *)cache->read_pos + hdr_offs + LOG_POS_OFFSET; /* fix end_log_pos */ val= uint4korr(log_pos) + group; From ba63d79e1485c349034283a77683849bcde2d8ec Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Wed, 27 Jun 2007 14:04:29 +0200 Subject: [PATCH 17/38] Bug#24924: shared-memory-base-name that is too long causes buffer overflow show that shm communication still works on windows, and that we can't overflow the base-name. --- mysql-test/r/windows_shm.result | 2 ++ mysql-test/t/windows_shm-master.opt | 1 + mysql-test/t/windows_shm.test | 9 +++++++++ 3 files changed, 12 insertions(+) create mode 100644 mysql-test/r/windows_shm.result create mode 100644 mysql-test/t/windows_shm-master.opt create mode 100644 mysql-test/t/windows_shm.test diff --git a/mysql-test/r/windows_shm.result b/mysql-test/r/windows_shm.result new file mode 100644 index 00000000000..c60049bece8 --- /dev/null +++ b/mysql-test/r/windows_shm.result @@ -0,0 +1,2 @@ +mysqld is alive +End of 5.0 tests. diff --git a/mysql-test/t/windows_shm-master.opt b/mysql-test/t/windows_shm-master.opt new file mode 100644 index 00000000000..4476ea16360 --- /dev/null +++ b/mysql-test/t/windows_shm-master.opt @@ -0,0 +1 @@ +--skip-grant-tables --loose-shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --loose-shared-memory=1 diff --git a/mysql-test/t/windows_shm.test b/mysql-test/t/windows_shm.test new file mode 100644 index 00000000000..203471aac56 --- /dev/null +++ b/mysql-test/t/windows_shm.test @@ -0,0 +1,9 @@ +# Windows-specific tests +--source include/windows.inc + +# +# Bug #24924: shared-memory-base-name that is too long causes buffer overflow +# +--exec $MYSQLADMIN --no-defaults --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ping + +--echo End of 5.0 tests. From 8661497e9bde1f42674b9789799d81b0ea2ba0d0 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Wed, 27 Jun 2007 14:28:02 +0200 Subject: [PATCH 18/38] WL#3933 Split main test suite to rpl, rpl_ndb and ndb - Update mysql-test-run.pl to collect tests from several suites - Group test into suites - Add suite.opt file --- mysql-test/lib/mtr_cases.pl | 311 +++++++++++------- mysql-test/lib/mtr_report.pl | 27 +- mysql-test/mysql-test-run.pl | 50 +-- .../{ => suite/binlog}/r/binlog_killed.result | 0 .../binlog}/r/binlog_row_binlog.result | 0 .../binlog}/r/binlog_row_blackhole.result | 0 .../binlog}/r/binlog_row_ctype_cp932.result | 0 .../binlog}/r/binlog_row_ctype_ucs.result | 0 .../binlog}/r/binlog_row_drop_tmp_tbl.result | 0 .../binlog}/r/binlog_row_innodb_stat.result | 0 .../binlog}/r/binlog_row_insert_select.result | 0 .../r/binlog_row_mix_innodb_myisam.result | 0 .../r/binlog_statement_insert_delayed.result | 0 .../binlog}/r/binlog_stm_binlog.result | 0 .../binlog}/r/binlog_stm_blackhole.result | 0 .../binlog}/r/binlog_stm_ctype_cp932.result | 0 .../binlog}/r/binlog_stm_ctype_ucs.result | 0 .../binlog}/r/binlog_stm_drop_tmp_tbl.result | 0 .../binlog}/r/binlog_stm_innodb_stat.result | 0 .../binlog}/r/binlog_stm_insert_select.result | 0 .../r/binlog_stm_mix_innodb_myisam.result | 0 .../{ => suite/binlog}/r/binlog_stm_ps.result | 0 .../{ => suite/binlog}/t/binlog_killed.test | 0 .../binlog}/t/binlog_row_binlog-master.opt | 0 .../binlog}/t/binlog_row_binlog.test | 0 .../binlog}/t/binlog_row_blackhole.test | 0 .../binlog}/t/binlog_row_ctype_cp932.test | 0 .../binlog}/t/binlog_row_ctype_ucs.test | 0 .../binlog}/t/binlog_row_drop_tmp_tbl.test | 0 .../t/binlog_row_innodb_stat-master.opt | 0 .../binlog}/t/binlog_row_innodb_stat.test | 0 .../binlog}/t/binlog_row_insert_select.test | 0 .../t/binlog_row_mix_innodb_myisam-master.opt | 0 .../t/binlog_row_mix_innodb_myisam.test | 0 .../t/binlog_statement_insert_delayed.test | 0 .../binlog}/t/binlog_stm_binlog-master.opt | 0 .../binlog}/t/binlog_stm_binlog.test | 0 .../binlog}/t/binlog_stm_blackhole.test | 0 .../binlog}/t/binlog_stm_ctype_cp932.test | 0 .../binlog}/t/binlog_stm_ctype_ucs.test | 0 .../binlog}/t/binlog_stm_drop_tmp_tbl.test | 0 .../t/binlog_stm_innodb_stat-master.opt | 0 .../binlog}/t/binlog_stm_innodb_stat.test | 0 .../binlog}/t/binlog_stm_insert_select.test | 0 .../t/binlog_stm_mix_innodb_myisam-master.opt | 0 .../t/binlog_stm_mix_innodb_myisam.test | 0 .../{ => suite/binlog}/t/binlog_stm_ps.test | 0 mysql-test/suite/funcs_1/t/suite.opt | 2 + mysql-test/suite/funcs_2/t/suite.opt | 2 + .../ndb}/r/loaddata_autocom_ndb.result | 0 .../{ => suite/ndb}/r/ndb_alter_table.result | 0 .../{ => suite/ndb}/r/ndb_alter_table2.result | 0 .../{ => suite/ndb}/r/ndb_alter_table3.result | 0 .../{ => suite/ndb}/r/ndb_autodiscover.result | 0 .../ndb}/r/ndb_autodiscover2.result | 0 .../ndb}/r/ndb_autodiscover3.result | 0 .../{ => suite/ndb}/r/ndb_backup_print.result | 0 mysql-test/{ => suite/ndb}/r/ndb_basic.result | 0 .../{ => suite/ndb}/r/ndb_binlog_basic.result | 0 .../ndb}/r/ndb_binlog_basic2.result | 0 .../ndb}/r/ndb_binlog_ddl_multi.result | 0 .../ndb}/r/ndb_binlog_discover.result | 0 .../ndb}/r/ndb_binlog_ignore_db.result | 0 .../ndb}/r/ndb_binlog_log_bin.result | 0 .../{ => suite/ndb}/r/ndb_binlog_multi.result | 0 .../{ => suite/ndb}/r/ndb_bitfield.result | 0 mysql-test/{ => suite/ndb}/r/ndb_blob.result | 0 .../ndb}/r/ndb_blob_partition.result | 0 mysql-test/{ => suite/ndb}/r/ndb_cache.result | 0 .../{ => suite/ndb}/r/ndb_cache2.result | 0 .../{ => suite/ndb}/r/ndb_cache_multi.result | 0 .../{ => suite/ndb}/r/ndb_cache_multi2.result | 0 .../{ => suite/ndb}/r/ndb_charset.result | 0 .../ndb}/r/ndb_condition_pushdown.result | 0 .../{ => suite/ndb}/r/ndb_config.result | 0 .../{ => suite/ndb}/r/ndb_config2.result | 0 .../{ => suite/ndb}/r/ndb_cursor.result | 0 .../{ => suite/ndb}/r/ndb_database.result | 0 .../{ => suite/ndb}/r/ndb_dd_alter.result | 0 .../ndb}/r/ndb_dd_backuprestore.result | 0 .../{ => suite/ndb}/r/ndb_dd_basic.result | 0 .../{ => suite/ndb}/r/ndb_dd_ddl.result | 0 .../ndb}/r/ndb_dd_disk2memory.result | 0 .../{ => suite/ndb}/r/ndb_dd_dump.result | 0 .../ndb}/r/ndb_dd_sql_features.result | 0 mysql-test/{ => suite/ndb}/r/ndb_gis.result | 0 mysql-test/{ => suite/ndb}/r/ndb_grant.result | 0 mysql-test/{ => suite/ndb}/r/ndb_index.result | 0 .../ndb}/r/ndb_index_ordered.result | 0 .../{ => suite/ndb}/r/ndb_index_unique.result | 0 .../{ => suite/ndb}/r/ndb_insert.result | 0 mysql-test/{ => suite/ndb}/r/ndb_limit.result | 0 mysql-test/{ => suite/ndb}/r/ndb_load.result | 0 .../ndb}/r/ndb_loaddatalocal.result | 0 mysql-test/{ => suite/ndb}/r/ndb_lock.result | 0 .../{ => suite/ndb}/r/ndb_minmax.result | 0 mysql-test/{ => suite/ndb}/r/ndb_multi.result | 0 .../{ => suite/ndb}/r/ndb_multi_row.result | 0 .../ndb}/r/ndb_partition_error.result | 0 .../ndb}/r/ndb_partition_error2.result | 0 .../ndb}/r/ndb_partition_key.result | 0 .../ndb}/r/ndb_partition_list.result | 0 .../ndb}/r/ndb_partition_range.result | 0 .../ndb}/r/ndb_read_multi_range.result | 0 .../{ => suite/ndb}/r/ndb_rename.result | 0 .../{ => suite/ndb}/r/ndb_replace.result | 0 .../{ => suite/ndb}/r/ndb_restore.result | 0 .../ndb}/r/ndb_restore_compat.result | 0 .../ndb}/r/ndb_restore_partition.result | 0 .../ndb}/r/ndb_restore_print.result | 0 .../{ => suite/ndb}/r/ndb_row_format.result | 0 .../{ => suite/ndb}/r/ndb_single_user.result | 0 mysql-test/{ => suite/ndb}/r/ndb_sp.result | 0 .../{ => suite/ndb}/r/ndb_subquery.result | 0 .../{ => suite/ndb}/r/ndb_temporary.result | 0 .../{ => suite/ndb}/r/ndb_transaction.result | 0 .../{ => suite/ndb}/r/ndb_trigger.result | 0 .../{ => suite/ndb}/r/ndb_truncate.result | 0 mysql-test/{ => suite/ndb}/r/ndb_types.result | 0 .../{ => suite/ndb}/r/ndb_update.result | 0 mysql-test/{ => suite/ndb}/r/ndb_view.result | 0 mysql-test/{ => suite/ndb}/r/ndbapi.result | 0 .../{ => suite/ndb}/r/partition_03ndb.result | 0 mysql-test/{ => suite/ndb}/r/ps_7ndb.result | 0 .../ndb}/r/strict_autoinc_5ndb.result | 0 mysql-test/suite/ndb/t/disabled.def | 23 ++ .../ndb}/t/loaddata_autocom_ndb.test | 0 .../{ => suite/ndb}/t/ndb_alter_table.test | 0 .../{ => suite/ndb}/t/ndb_alter_table2.test | 0 .../{ => suite/ndb}/t/ndb_alter_table3.test | 0 .../{ => suite/ndb}/t/ndb_autodiscover.test | 0 .../ndb}/t/ndb_autodiscover2-master.opt | 0 .../{ => suite/ndb}/t/ndb_autodiscover2.test | 0 .../{ => suite/ndb}/t/ndb_autodiscover3.test | 0 .../{ => suite/ndb}/t/ndb_backup_print.test | 0 mysql-test/{ => suite/ndb}/t/ndb_basic.test | 0 .../{ => suite/ndb}/t/ndb_binlog_basic.test | 0 .../{ => suite/ndb}/t/ndb_binlog_basic2.test | 0 .../ndb}/t/ndb_binlog_ddl_multi.test | 0 .../ndb}/t/ndb_binlog_discover.test | 0 .../ndb}/t/ndb_binlog_ignore_db-master.opt | 0 .../ndb}/t/ndb_binlog_ignore_db.test | 0 .../{ => suite/ndb}/t/ndb_binlog_log_bin.test | 0 .../{ => suite/ndb}/t/ndb_binlog_multi.test | 0 .../{ => suite/ndb}/t/ndb_bitfield.test | 0 mysql-test/{ => suite/ndb}/t/ndb_blob.test | 0 .../{ => suite/ndb}/t/ndb_blob_partition.test | 0 mysql-test/{ => suite/ndb}/t/ndb_cache.test | 0 mysql-test/{ => suite/ndb}/t/ndb_cache2.test | 0 .../{ => suite/ndb}/t/ndb_cache_multi.test | 0 .../{ => suite/ndb}/t/ndb_cache_multi2.test | 0 mysql-test/{ => suite/ndb}/t/ndb_charset.test | 0 .../ndb}/t/ndb_condition_pushdown.test | 0 mysql-test/{ => suite/ndb}/t/ndb_config.test | 0 mysql-test/{ => suite/ndb}/t/ndb_config2.test | 0 mysql-test/{ => suite/ndb}/t/ndb_cursor.test | 0 .../{ => suite/ndb}/t/ndb_database.test | 0 .../{ => suite/ndb}/t/ndb_dd_alter.test | 0 .../ndb}/t/ndb_dd_backuprestore.test | 0 .../{ => suite/ndb}/t/ndb_dd_basic.test | 0 mysql-test/{ => suite/ndb}/t/ndb_dd_ddl.test | 0 .../{ => suite/ndb}/t/ndb_dd_disk2memory.test | 0 mysql-test/{ => suite/ndb}/t/ndb_dd_dump.test | 0 .../ndb}/t/ndb_dd_sql_features.test | 0 mysql-test/{ => suite/ndb}/t/ndb_gis.test | 0 mysql-test/{ => suite/ndb}/t/ndb_grant.later | 0 mysql-test/{ => suite/ndb}/t/ndb_index.test | 0 .../{ => suite/ndb}/t/ndb_index_ordered.test | 0 .../{ => suite/ndb}/t/ndb_index_unique.test | 0 mysql-test/{ => suite/ndb}/t/ndb_insert.test | 0 mysql-test/{ => suite/ndb}/t/ndb_limit.test | 0 mysql-test/{ => suite/ndb}/t/ndb_load.test | 0 .../{ => suite/ndb}/t/ndb_loaddatalocal.test | 0 mysql-test/{ => suite/ndb}/t/ndb_lock.test | 0 mysql-test/{ => suite/ndb}/t/ndb_minmax.test | 0 mysql-test/{ => suite/ndb}/t/ndb_multi.test | 0 .../{ => suite/ndb}/t/ndb_multi_row.test | 0 .../ndb}/t/ndb_partition_error.test | 0 .../ndb}/t/ndb_partition_error2-master.opt | 0 .../ndb}/t/ndb_partition_error2.test | 0 .../{ => suite/ndb}/t/ndb_partition_key.test | 0 .../{ => suite/ndb}/t/ndb_partition_list.test | 0 .../ndb}/t/ndb_partition_range.test | 0 .../ndb}/t/ndb_read_multi_range.test | 0 mysql-test/{ => suite/ndb}/t/ndb_rename.test | 0 mysql-test/{ => suite/ndb}/t/ndb_replace.test | 0 mysql-test/{ => suite/ndb}/t/ndb_restore.test | 0 .../{ => suite/ndb}/t/ndb_restore_compat.test | 0 .../ndb}/t/ndb_restore_partition-master.opt | 0 .../ndb}/t/ndb_restore_partition.test | 0 .../{ => suite/ndb}/t/ndb_restore_print.test | 0 .../{ => suite/ndb}/t/ndb_row_format.test | 0 .../{ => suite/ndb}/t/ndb_single_user.test | 0 mysql-test/{ => suite/ndb}/t/ndb_sp.test | 0 .../{ => suite/ndb}/t/ndb_subquery.test | 0 .../{ => suite/ndb}/t/ndb_temporary.test | 0 .../{ => suite/ndb}/t/ndb_transaction.test | 0 mysql-test/{ => suite/ndb}/t/ndb_trigger.test | 0 .../{ => suite/ndb}/t/ndb_truncate.test | 0 mysql-test/{ => suite/ndb}/t/ndb_types.test | 0 mysql-test/{ => suite/ndb}/t/ndb_update.test | 0 mysql-test/{ => suite/ndb}/t/ndb_view.test | 0 mysql-test/{ => suite/ndb}/t/ndbapi.test | 0 .../{ => suite/ndb}/t/partition_03ndb.test | 0 mysql-test/{ => suite/ndb}/t/ps_7ndb.test | 0 .../ndb}/t/strict_autoinc_5ndb.test | 0 .../{ => suite/rpl}/r/rpl000001.a.result | 0 .../{ => suite/rpl}/r/rpl000001.b.result | 0 mysql-test/{ => suite/rpl}/r/rpl000010.result | 0 mysql-test/{ => suite/rpl}/r/rpl000011.result | 0 mysql-test/{ => suite/rpl}/r/rpl000013.result | 0 mysql-test/{ => suite/rpl}/r/rpl000017.result | 0 .../{ => suite/rpl}/r/rpl_000015.result | 0 .../{ => suite/rpl}/r/rpl_EE_err.result | 0 .../{ => suite/rpl}/r/rpl_LD_INFILE.result | 0 mysql-test/{ => suite/rpl}/r/rpl_alter.result | 0 .../{ => suite/rpl}/r/rpl_alter_db.result | 0 .../rpl}/r/rpl_auto_increment.result | 0 .../rpl}/r/rpl_auto_increment_11932.result | 0 mysql-test/{ => suite/rpl}/r/rpl_bit.result | 0 .../{ => suite/rpl}/r/rpl_bit_npk.result | 0 .../rpl}/r/rpl_change_master.result | 0 .../{ => suite/rpl}/r/rpl_charset_sjis.result | 0 .../rpl}/r/rpl_commit_after_flush.result | 0 .../rpl}/r/rpl_create_database.result | 0 .../rpl}/r/rpl_critical_errors.result | 0 .../rpl}/r/rpl_critical_errors.result.txt | 0 mysql-test/{ => suite/rpl}/r/rpl_ddl.result | 0 .../rpl}/r/rpl_deadlock_innodb.result | 0 .../rpl}/r/rpl_delete_no_where.result | 0 .../{ => suite/rpl}/r/rpl_do_grant.result | 0 mysql-test/{ => suite/rpl}/r/rpl_drop.result | 0 .../{ => suite/rpl}/r/rpl_drop_db.result | 0 .../{ => suite/rpl}/r/rpl_drop_temp.result | 0 .../rpl}/r/rpl_dual_pos_advance.result | 0 .../rpl}/r/rpl_empty_master_crash.result | 0 .../rpl}/r/rpl_err_ignoredtable.result | 0 .../{ => suite/rpl}/r/rpl_events.result | 0 .../rpl}/r/rpl_extraCol_innodb.result | 0 .../rpl}/r/rpl_extraCol_myisam.result | 0 .../rpl}/r/rpl_failed_optimize.result | 0 .../rpl}/r/rpl_flushlog_loop.result | 0 .../rpl}/r/rpl_foreign_key_innodb.result | 0 .../{ => suite/rpl}/r/rpl_free_items.result | 0 .../{ => suite/rpl}/r/rpl_get_lock.result | 0 .../{ => suite/rpl}/r/rpl_ignore_grant.result | 0 .../rpl}/r/rpl_ignore_revoke.result | 0 .../{ => suite/rpl}/r/rpl_ignore_table.result | 0 .../rpl}/r/rpl_ignore_table_update.result | 0 .../{ => suite/rpl}/r/rpl_incident.result | 0 .../{ => suite/rpl}/r/rpl_init_slave.result | 0 .../{ => suite/rpl}/r/rpl_innodb.result | 0 .../{ => suite/rpl}/r/rpl_insert.result | 0 .../{ => suite/rpl}/r/rpl_insert_id.result | 0 .../{ => suite/rpl}/r/rpl_insert_id_pk.result | 0 .../rpl}/r/rpl_insert_ignore.result | 0 .../rpl}/r/rpl_insert_select.result | 0 .../rpl}/r/rpl_known_bugs_detection.result | 0 .../rpl}/r/rpl_load_from_master.result | 0 .../rpl}/r/rpl_load_table_from_master.result | 0 .../{ => suite/rpl}/r/rpl_loaddata.result | 0 .../rpl}/r/rpl_loaddata_charset.result | 0 .../{ => suite/rpl}/r/rpl_loaddata_m.result | 0 .../{ => suite/rpl}/r/rpl_loaddata_s.result | 0 .../rpl}/r/rpl_loaddata_simple.result | 0 .../rpl}/r/rpl_loaddatalocal.result | 0 .../{ => suite/rpl}/r/rpl_loadfile.result | 0 .../{ => suite/rpl}/r/rpl_locale.result | 0 .../{ => suite/rpl}/r/rpl_log_pos.result | 0 .../rpl}/r/rpl_many_optimize.result | 0 .../rpl}/r/rpl_master_pos_wait.result | 0 .../rpl}/r/rpl_misc_functions.result | 0 .../rpl}/r/rpl_mixed_ddl_dml.result | 0 .../{ => suite/rpl}/r/rpl_multi_delete.result | 0 .../rpl}/r/rpl_multi_delete2.result | 0 .../{ => suite/rpl}/r/rpl_multi_engine.result | 0 .../{ => suite/rpl}/r/rpl_multi_update.result | 0 .../rpl}/r/rpl_multi_update2.result | 0 .../rpl}/r/rpl_multi_update3.result | 0 .../rpl}/r/rpl_multi_update4.result | 0 .../{ => suite/rpl}/r/rpl_optimize.result | 0 .../{ => suite/rpl}/r/rpl_packet.result | 0 mysql-test/{ => suite/rpl}/r/rpl_ps.result | 0 .../{ => suite/rpl}/r/rpl_rbr_to_sbr.result | 0 .../{ => suite/rpl}/r/rpl_read_only.result | 0 .../{ => suite/rpl}/r/rpl_redirect.result | 0 .../rpl}/r/rpl_relay_space_innodb.result | 0 .../rpl}/r/rpl_relay_space_myisam.result | 0 .../{ => suite/rpl}/r/rpl_relayrotate.result | 0 .../{ => suite/rpl}/r/rpl_relayspace.result | 0 .../{ => suite/rpl}/r/rpl_replicate_do.result | 0 .../rpl}/r/rpl_replicate_ignore_db.result | 0 .../{ => suite/rpl}/r/rpl_rewrt_db.result | 0 .../{ => suite/rpl}/r/rpl_rotate_logs.result | 0 .../{ => suite/rpl}/r/rpl_row_001.result | 0 .../{ => suite/rpl}/r/rpl_row_4_bytes.result | 0 .../{ => suite/rpl}/r/rpl_row_NOW.result | 0 .../{ => suite/rpl}/r/rpl_row_USER.result | 0 .../{ => suite/rpl}/r/rpl_row_UUID.result | 0 .../rpl}/r/rpl_row_basic_11bugs-master.opt | 0 .../rpl}/r/rpl_row_basic_11bugs-slave.opt | 0 .../rpl}/r/rpl_row_basic_11bugs.result | 0 .../rpl}/r/rpl_row_basic_2myisam.result | 0 .../rpl}/r/rpl_row_basic_3innodb.result | 0 .../rpl}/r/rpl_row_basic_8partition.result | 0 .../rpl}/r/rpl_row_blob_innodb.result | 0 .../rpl}/r/rpl_row_blob_myisam.result | 0 .../{ => suite/rpl}/r/rpl_row_charset.result | 0 .../rpl}/r/rpl_row_create_table.result | 0 .../rpl}/r/rpl_row_delayed_ins.result | 0 .../{ => suite/rpl}/r/rpl_row_drop.result | 0 .../rpl}/r/rpl_row_err_ignoredtable.result | 0 .../rpl}/r/rpl_row_flsh_tbls.result | 0 .../{ => suite/rpl}/r/rpl_row_func001.result | 0 .../{ => suite/rpl}/r/rpl_row_func002.result | 0 .../{ => suite/rpl}/r/rpl_row_func003.result | 0 .../rpl}/r/rpl_row_inexist_tbl.result | 0 .../rpl}/r/rpl_row_insert_delayed.result | 0 .../rpl}/r/rpl_row_loaddata_m.result | 0 .../{ => suite/rpl}/r/rpl_row_log.result | 0 .../rpl}/r/rpl_row_log_innodb.result | 0 .../rpl}/r/rpl_row_max_relay_size.result | 0 .../rpl}/r/rpl_row_multi_query.result | 0 .../rpl}/r/rpl_row_mysqlbinlog.result | 0 .../rpl}/r/rpl_row_mystery22.result | 0 .../rpl}/r/rpl_row_reset_slave.result | 0 .../{ => suite/rpl}/r/rpl_row_sp001.result | 0 .../rpl}/r/rpl_row_sp002_innodb.result | 0 .../{ => suite/rpl}/r/rpl_row_sp003.result | 0 .../{ => suite/rpl}/r/rpl_row_sp005.result | 0 .../rpl}/r/rpl_row_sp006_InnoDB.result | 0 .../rpl}/r/rpl_row_sp007_innodb.result | 0 .../{ => suite/rpl}/r/rpl_row_sp008.result | 0 .../{ => suite/rpl}/r/rpl_row_sp009.result | 0 .../{ => suite/rpl}/r/rpl_row_sp010.result | 0 .../{ => suite/rpl}/r/rpl_row_sp011.result | 0 .../{ => suite/rpl}/r/rpl_row_sp012.result | 0 .../rpl}/r/rpl_row_stop_middle.result | 0 .../rpl}/r/rpl_row_stop_middle_update.result | 0 .../rpl}/r/rpl_row_tabledefs_2myisam.result | 0 .../rpl}/r/rpl_row_tabledefs_3innodb.result | 0 .../rpl}/r/rpl_row_tabledefs_7ndb.result | 0 .../{ => suite/rpl}/r/rpl_row_trig001.result | 0 .../{ => suite/rpl}/r/rpl_row_trig002.result | 0 .../{ => suite/rpl}/r/rpl_row_trig003.result | 0 .../{ => suite/rpl}/r/rpl_row_trig004.result | 0 .../{ => suite/rpl}/r/rpl_row_until.result | 0 .../{ => suite/rpl}/r/rpl_row_view01.result | 0 .../{ => suite/rpl}/r/rpl_server_id1.result | 0 .../{ => suite/rpl}/r/rpl_server_id2.result | 0 .../{ => suite/rpl}/r/rpl_session_var.result | 0 .../{ => suite/rpl}/r/rpl_set_charset.result | 0 mysql-test/{ => suite/rpl}/r/rpl_sf.result | 0 .../{ => suite/rpl}/r/rpl_skip_error.result | 0 .../{ => suite/rpl}/r/rpl_slave_status.result | 0 mysql-test/{ => suite/rpl}/r/rpl_sp.result | 0 mysql-test/{ => suite/rpl}/r/rpl_sp004.result | 0 .../{ => suite/rpl}/r/rpl_sp_effects.result | 0 .../rpl}/r/rpl_sporadic_master.result | 0 mysql-test/{ => suite/rpl}/r/rpl_ssl.result | 0 mysql-test/{ => suite/rpl}/r/rpl_ssl1.result | 0 .../rpl}/r/rpl_start_stop_slave.result | 0 .../{ => suite/rpl}/r/rpl_stm_000001.result | 0 .../{ => suite/rpl}/r/rpl_stm_EE_err2.result | 0 .../{ => suite/rpl}/r/rpl_stm_charset.result | 0 .../rpl}/r/rpl_stm_flsh_tbls.result | 0 .../rpl}/r/rpl_stm_insert_delayed.result | 0 .../{ => suite/rpl}/r/rpl_stm_log.result | 0 .../rpl}/r/rpl_stm_max_relay_size.result | 0 .../rpl}/r/rpl_stm_multi_query.result | 0 .../rpl}/r/rpl_stm_mystery22.result | 0 .../{ => suite/rpl}/r/rpl_stm_no_op.result | 0 .../rpl}/r/rpl_stm_reset_slave.result | 0 .../{ => suite/rpl}/r/rpl_stm_until.result | 0 .../rpl}/r/rpl_switch_stm_row_mixed.result | 0 .../{ => suite/rpl}/r/rpl_temp_table.result | 0 .../{ => suite/rpl}/r/rpl_temporary.result | 0 .../{ => suite/rpl}/r/rpl_timezone.result | 0 .../{ => suite/rpl}/r/rpl_trigger.result | 0 .../{ => suite/rpl}/r/rpl_trunc_temp.result | 0 .../rpl}/r/rpl_truncate_2myisam.result | 0 .../rpl}/r/rpl_truncate_3innodb.result | 0 .../rpl}/r/rpl_truncate_7ndb_2.result | 0 mysql-test/{ => suite/rpl}/r/rpl_udf.result | 0 .../rpl}/r/rpl_user_variables.result | 0 .../{ => suite/rpl}/r/rpl_variables.result | 0 mysql-test/{ => suite/rpl}/r/rpl_view.result | 0 mysql-test/suite/rpl/t/disabled.def | 15 + .../{ => suite/rpl}/t/rpl000010-slave.opt | 0 mysql-test/{ => suite/rpl}/t/rpl000010.test | 0 mysql-test/{ => suite/rpl}/t/rpl000011.test | 0 mysql-test/{ => suite/rpl}/t/rpl000013.test | 0 .../{ => suite/rpl}/t/rpl000017-slave.opt | 0 .../{ => suite/rpl}/t/rpl000017-slave.sh | 0 mysql-test/{ => suite/rpl}/t/rpl000017.test | 0 .../{ => suite/rpl}/t/rpl000018-master.opt | 0 .../{ => suite/rpl}/t/rpl000018-slave.opt | 0 .../{ => suite/rpl}/t/rpl_000015-slave.sh | 0 .../{ => suite/rpl}/t/rpl_000015.slave-mi | 0 mysql-test/{ => suite/rpl}/t/rpl_000015.test | 0 mysql-test/{ => suite/rpl}/t/rpl_EE_err.test | 0 .../{ => suite/rpl}/t/rpl_LD_INFILE.test | 0 mysql-test/{ => suite/rpl}/t/rpl_alter.test | 0 .../{ => suite/rpl}/t/rpl_alter_db.test | 0 .../rpl}/t/rpl_auto_increment-master.opt | 0 .../rpl}/t/rpl_auto_increment-slave.opt | 0 .../{ => suite/rpl}/t/rpl_auto_increment.test | 0 .../rpl}/t/rpl_auto_increment_11932.test | 0 mysql-test/{ => suite/rpl}/t/rpl_bit.test | 0 mysql-test/{ => suite/rpl}/t/rpl_bit_npk.test | 0 .../{ => suite/rpl}/t/rpl_change_master.test | 0 .../{ => suite/rpl}/t/rpl_charset_sjis.test | 0 .../rpl}/t/rpl_commit_after_flush.test | 0 .../rpl}/t/rpl_create_database-master.opt | 0 .../rpl}/t/rpl_create_database-slave.opt | 0 .../rpl}/t/rpl_create_database.test | 0 .../rpl}/t/rpl_critical_errors.test | 0 mysql-test/{ => suite/rpl}/t/rpl_ddl.test | 0 .../rpl}/t/rpl_deadlock_innodb-slave.opt | 0 .../rpl}/t/rpl_deadlock_innodb.test | 0 .../rpl}/t/rpl_delete_no_where.test | 0 .../{ => suite/rpl}/t/rpl_do_grant.test | 0 mysql-test/{ => suite/rpl}/t/rpl_drop.test | 0 mysql-test/{ => suite/rpl}/t/rpl_drop_db.test | 0 .../{ => suite/rpl}/t/rpl_drop_temp-slave.opt | 0 .../{ => suite/rpl}/t/rpl_drop_temp.test | 0 .../rpl}/t/rpl_dual_pos_advance-master.opt | 0 .../rpl}/t/rpl_dual_pos_advance.test | 0 .../rpl}/t/rpl_empty_master_crash-master.opt | 0 .../rpl}/t/rpl_empty_master_crash.test | 0 .../rpl}/t/rpl_err_ignoredtable-slave.opt | 0 .../rpl}/t/rpl_err_ignoredtable.test | 0 mysql-test/{ => suite/rpl}/t/rpl_events.test | 0 .../rpl}/t/rpl_extraCol_innodb-master.opt | 0 .../rpl}/t/rpl_extraCol_innodb-slave.opt | 0 .../rpl}/t/rpl_extraCol_innodb.test | 0 .../rpl}/t/rpl_extraCol_myisam.test | 0 .../rpl}/t/rpl_failed_optimize-master.opt | 0 .../rpl}/t/rpl_failed_optimize.test | 0 .../rpl}/t/rpl_flushlog_loop-master.opt | 0 .../rpl}/t/rpl_flushlog_loop-master.sh | 0 .../rpl}/t/rpl_flushlog_loop-slave.opt | 0 .../rpl}/t/rpl_flushlog_loop-slave.sh | 0 .../{ => suite/rpl}/t/rpl_flushlog_loop.test | 0 .../rpl}/t/rpl_foreign_key_innodb-slave.opt | 0 .../rpl}/t/rpl_foreign_key_innodb.test | 0 .../rpl}/t/rpl_free_items-slave.opt | 0 .../{ => suite/rpl}/t/rpl_free_items.test | 0 .../{ => suite/rpl}/t/rpl_get_lock.test | 0 .../rpl}/t/rpl_ignore_grant-slave.opt | 0 .../{ => suite/rpl}/t/rpl_ignore_grant.test | 0 .../rpl}/t/rpl_ignore_revoke-slave.opt | 0 .../{ => suite/rpl}/t/rpl_ignore_revoke.test | 0 .../rpl}/t/rpl_ignore_table-slave.opt | 0 .../{ => suite/rpl}/t/rpl_ignore_table.test | 0 .../rpl}/t/rpl_ignore_table_update-slave.opt | 0 .../rpl}/t/rpl_ignore_table_update.test | 0 .../{ => suite/rpl}/t/rpl_incident-master.opt | 0 .../{ => suite/rpl}/t/rpl_incident.test | 0 .../rpl}/t/rpl_init_slave-slave.opt | 0 .../{ => suite/rpl}/t/rpl_init_slave.test | 0 mysql-test/{ => suite/rpl}/t/rpl_innodb.test | 0 mysql-test/{ => suite/rpl}/t/rpl_insert.test | 0 .../{ => suite/rpl}/t/rpl_insert_id-slave.opt | 0 .../{ => suite/rpl}/t/rpl_insert_id.test | 0 .../rpl}/t/rpl_insert_id_pk-slave.opt | 0 .../{ => suite/rpl}/t/rpl_insert_id_pk.test | 0 .../rpl}/t/rpl_insert_ignore-slave.opt | 0 .../{ => suite/rpl}/t/rpl_insert_ignore.test | 0 .../{ => suite/rpl}/t/rpl_insert_select.test | 0 .../t/rpl_known_bugs_detection-master.opt | 0 .../rpl}/t/rpl_known_bugs_detection.test | 0 .../rpl}/t/rpl_load_from_master-slave.opt | 0 .../rpl}/t/rpl_load_from_master.test | 0 .../rpl}/t/rpl_load_table_from_master.test | 0 .../{ => suite/rpl}/t/rpl_loaddata.test | 0 .../rpl}/t/rpl_loaddata_charset.test | 0 .../rpl}/t/rpl_loaddata_m-master.opt | 0 .../{ => suite/rpl}/t/rpl_loaddata_m.test | 0 .../rpl}/t/rpl_loaddata_s-slave.opt | 0 .../{ => suite/rpl}/t/rpl_loaddata_s.test | 0 .../rpl}/t/rpl_loaddata_simple.test | 0 .../{ => suite/rpl}/t/rpl_loaddatalocal.test | 0 .../{ => suite/rpl}/t/rpl_loadfile.test | 0 mysql-test/{ => suite/rpl}/t/rpl_locale.test | 0 mysql-test/{ => suite/rpl}/t/rpl_log_pos.test | 0 .../{ => suite/rpl}/t/rpl_many_optimize.test | 0 .../rpl}/t/rpl_master_pos_wait.test | 0 .../rpl}/t/rpl_misc_functions-slave.sh | 0 .../{ => suite/rpl}/t/rpl_misc_functions.test | 0 .../{ => suite/rpl}/t/rpl_mixed_ddl_dml.test | 0 .../rpl}/t/rpl_multi_delete-slave.opt | 0 .../{ => suite/rpl}/t/rpl_multi_delete.test | 0 .../rpl}/t/rpl_multi_delete2-slave.opt | 0 .../{ => suite/rpl}/t/rpl_multi_delete2.test | 0 .../rpl}/t/rpl_multi_engine-slave.opt | 0 .../{ => suite/rpl}/t/rpl_multi_engine.test | 0 .../{ => suite/rpl}/t/rpl_multi_update.test | 0 .../rpl}/t/rpl_multi_update2-slave.opt | 0 .../{ => suite/rpl}/t/rpl_multi_update2.test | 0 .../{ => suite/rpl}/t/rpl_multi_update3.test | 0 .../rpl}/t/rpl_multi_update4-slave.opt | 0 .../{ => suite/rpl}/t/rpl_multi_update4.test | 0 .../{ => suite/rpl}/t/rpl_optimize.test | 0 .../{ => suite/rpl}/t/rpl_packet-master.opt | 0 .../{ => suite/rpl}/t/rpl_packet-slave.opt | 0 mysql-test/{ => suite/rpl}/t/rpl_packet.test | 0 mysql-test/{ => suite/rpl}/t/rpl_ps.test | 0 .../{ => suite/rpl}/t/rpl_rbr_to_sbr.test | 0 .../{ => suite/rpl}/t/rpl_read_only-slave.opt | 0 .../{ => suite/rpl}/t/rpl_read_only.test | 0 .../{ => suite/rpl}/t/rpl_redirect.test | 0 .../rpl}/t/rpl_relay_space_innodb-master.opt | 0 .../rpl}/t/rpl_relay_space_innodb-slave.opt | 0 .../rpl}/t/rpl_relay_space_innodb.test | 0 .../rpl}/t/rpl_relay_space_myisam.test | 0 .../rpl}/t/rpl_relayrotate-slave.opt | 0 .../{ => suite/rpl}/t/rpl_relayrotate.test | 0 .../rpl}/t/rpl_relayspace-slave.opt | 0 .../{ => suite/rpl}/t/rpl_relayspace.test | 0 .../rpl}/t/rpl_replicate_do-slave.opt | 0 .../{ => suite/rpl}/t/rpl_replicate_do.test | 0 .../rpl}/t/rpl_replicate_ignore_db-slave.opt | 0 .../rpl}/t/rpl_replicate_ignore_db.test | 0 .../{ => suite/rpl}/t/rpl_rewrt_db-slave.opt | 0 .../{ => suite/rpl}/t/rpl_rewrt_db.test | 0 .../rpl}/t/rpl_rotate_logs-master.opt | 0 .../rpl}/t/rpl_rotate_logs-slave.sh | 0 .../rpl}/t/rpl_rotate_logs.slave-mi | 0 .../{ => suite/rpl}/t/rpl_rotate_logs.test | 0 mysql-test/{ => suite/rpl}/t/rpl_row_001.test | 0 .../rpl}/t/rpl_row_4_bytes-master.opt | 0 .../{ => suite/rpl}/t/rpl_row_4_bytes.test | 0 mysql-test/{ => suite/rpl}/t/rpl_row_NOW.test | 0 .../{ => suite/rpl}/t/rpl_row_USER.test | 0 .../{ => suite/rpl}/t/rpl_row_UUID.test | 0 .../rpl}/t/rpl_row_basic_11bugs-master.opt | 0 .../rpl}/t/rpl_row_basic_11bugs-slave.opt | 0 .../rpl}/t/rpl_row_basic_11bugs.test | 0 .../rpl}/t/rpl_row_basic_2myisam.test | 0 .../rpl}/t/rpl_row_basic_3innodb-slave.opt | 0 .../rpl}/t/rpl_row_basic_3innodb.test | 0 .../rpl}/t/rpl_row_basic_8partition.test | 0 .../rpl}/t/rpl_row_blob_innodb-slave.opt | 0 .../rpl}/t/rpl_row_blob_innodb.test | 0 .../rpl}/t/rpl_row_blob_myisam.test | 0 .../{ => suite/rpl}/t/rpl_row_charset.test | 0 .../rpl}/t/rpl_row_create_table-slave.opt | 0 .../rpl}/t/rpl_row_create_table.test | 0 .../rpl}/t/rpl_row_delayed_ins.test | 0 .../{ => suite/rpl}/t/rpl_row_drop.test | 0 .../rpl}/t/rpl_row_err_daisychain-master.opt | 0 .../rpl}/t/rpl_row_err_daisychain-slave.opt | 0 .../{ => suite/rpl}/t/rpl_row_flsh_tbls.test | 0 .../{ => suite/rpl}/t/rpl_row_func001.test | 0 .../{ => suite/rpl}/t/rpl_row_func002.test | 0 .../rpl}/t/rpl_row_func003-slave.opt | 0 .../{ => suite/rpl}/t/rpl_row_func003.test | 0 .../rpl}/t/rpl_row_inexist_tbl-slave.opt | 0 .../rpl}/t/rpl_row_inexist_tbl.test | 0 .../rpl}/t/rpl_row_insert_delayed.test | 0 .../{ => suite/rpl}/t/rpl_row_log-master.opt | 0 .../{ => suite/rpl}/t/rpl_row_log-slave.opt | 0 mysql-test/{ => suite/rpl}/t/rpl_row_log.test | 0 .../rpl}/t/rpl_row_log_innodb-master.opt | 0 .../rpl}/t/rpl_row_log_innodb-slave.opt | 0 .../{ => suite/rpl}/t/rpl_row_log_innodb.test | 0 .../rpl}/t/rpl_row_max_relay_size.test | 0 .../rpl}/t/rpl_row_mysqlbinlog-master.opt | 0 .../rpl}/t/rpl_row_mysqlbinlog.test | 0 .../{ => suite/rpl}/t/rpl_row_mystery22.test | 0 .../rpl}/t/rpl_row_reset_slave.test | 0 .../{ => suite/rpl}/t/rpl_row_sp001.test | 0 .../rpl}/t/rpl_row_sp002_innodb-master.opt | 0 .../rpl}/t/rpl_row_sp002_innodb-slave.opt | 0 .../rpl}/t/rpl_row_sp002_innodb.test | 0 .../rpl}/t/rpl_row_sp003-master.opt | 0 .../{ => suite/rpl}/t/rpl_row_sp003-slave.opt | 0 .../{ => suite/rpl}/t/rpl_row_sp003.test | 0 .../{ => suite/rpl}/t/rpl_row_sp005.test | 0 .../rpl}/t/rpl_row_sp006_InnoDB-slave.opt | 0 .../rpl}/t/rpl_row_sp006_InnoDB.test | 0 .../rpl}/t/rpl_row_sp007_innodb-slave.opt | 0 .../rpl}/t/rpl_row_sp007_innodb.test | 0 .../{ => suite/rpl}/t/rpl_row_sp008.test | 0 .../{ => suite/rpl}/t/rpl_row_sp009.test | 0 .../{ => suite/rpl}/t/rpl_row_sp010.test | 0 .../{ => suite/rpl}/t/rpl_row_sp011.test | 0 .../{ => suite/rpl}/t/rpl_row_sp012.test | 0 .../rpl}/t/rpl_row_stop_middle.test | 0 .../t/rpl_row_stop_middle_update-master.opt | 0 .../t/rpl_row_stop_middle_update-slave.opt | 0 .../rpl}/t/rpl_row_stop_middle_update.test | 0 .../rpl}/t/rpl_row_tabledefs_2myisam.test | 0 .../t/rpl_row_tabledefs_3innodb-slave.opt | 0 .../rpl}/t/rpl_row_tabledefs_3innodb.test | 0 .../{ => suite/rpl}/t/rpl_row_trig001.test | 0 .../{ => suite/rpl}/t/rpl_row_trig002.test | 0 .../{ => suite/rpl}/t/rpl_row_trig003.test | 0 .../{ => suite/rpl}/t/rpl_row_trig004.test | 0 .../{ => suite/rpl}/t/rpl_row_until.test | 0 .../{ => suite/rpl}/t/rpl_row_view01.test | 0 .../{ => suite/rpl}/t/rpl_server_id1.test | 0 .../rpl}/t/rpl_server_id2-slave.opt | 0 .../{ => suite/rpl}/t/rpl_server_id2.test | 0 .../{ => suite/rpl}/t/rpl_session_var.test | 0 .../{ => suite/rpl}/t/rpl_set_charset.test | 0 mysql-test/{ => suite/rpl}/t/rpl_sf.test | 0 .../rpl}/t/rpl_skip_error-slave.opt | 0 .../{ => suite/rpl}/t/rpl_skip_error.test | 0 .../{ => suite/rpl}/t/rpl_slave_status.test | 0 .../{ => suite/rpl}/t/rpl_sp-master.opt | 0 mysql-test/{ => suite/rpl}/t/rpl_sp-slave.opt | 0 mysql-test/{ => suite/rpl}/t/rpl_sp.test | 0 mysql-test/{ => suite/rpl}/t/rpl_sp004.test | 0 .../rpl}/t/rpl_sp_effects-master.opt | 0 .../rpl}/t/rpl_sp_effects-slave.opt | 0 .../{ => suite/rpl}/t/rpl_sp_effects.test | 0 .../rpl}/t/rpl_sporadic_master-master.opt | 0 .../rpl}/t/rpl_sporadic_master.test | 0 mysql-test/{ => suite/rpl}/t/rpl_ssl.test | 0 mysql-test/{ => suite/rpl}/t/rpl_ssl1.test | 0 .../rpl}/t/rpl_start_stop_slave.test | 0 .../rpl}/t/rpl_stm_000001-slave.opt | 0 .../{ => suite/rpl}/t/rpl_stm_000001.test | 0 .../{ => suite/rpl}/t/rpl_stm_EE_err2.test | 0 .../{ => suite/rpl}/t/rpl_stm_charset.test | 0 .../{ => suite/rpl}/t/rpl_stm_flsh_tbls.test | 0 .../rpl}/t/rpl_stm_insert_delayed.test | 0 .../{ => suite/rpl}/t/rpl_stm_log-master.opt | 0 .../{ => suite/rpl}/t/rpl_stm_log-slave.opt | 0 mysql-test/{ => suite/rpl}/t/rpl_stm_log.test | 0 .../rpl}/t/rpl_stm_max_relay_size.test | 0 .../rpl}/t/rpl_stm_multi_query.test | 0 .../{ => suite/rpl}/t/rpl_stm_mystery22.test | 0 .../{ => suite/rpl}/t/rpl_stm_no_op.test | 0 .../rpl}/t/rpl_stm_reset_slave.test | 0 .../{ => suite/rpl}/t/rpl_stm_until.test | 0 .../rpl}/t/rpl_switch_stm_row_mixed.test | 0 .../{ => suite/rpl}/t/rpl_temp_table.test | 0 .../{ => suite/rpl}/t/rpl_temporary.test | 0 .../{ => suite/rpl}/t/rpl_timezone-master.opt | 0 .../{ => suite/rpl}/t/rpl_timezone-slave.opt | 0 .../{ => suite/rpl}/t/rpl_timezone.test | 0 mysql-test/{ => suite/rpl}/t/rpl_trigger.test | 0 .../{ => suite/rpl}/t/rpl_trunc_temp.test | 0 .../rpl}/t/rpl_truncate_2myisam.test | 0 .../rpl}/t/rpl_truncate_3innodb.test | 0 .../rpl}/t/rpl_truncate_7ndb_2-master.opt | 0 .../rpl}/t/rpl_truncate_7ndb_2.test | 0 .../{ => suite/rpl}/t/rpl_udf-master.opt | 0 .../{ => suite/rpl}/t/rpl_udf-slave.opt | 0 mysql-test/{ => suite/rpl}/t/rpl_udf.test | 0 .../{ => suite/rpl}/t/rpl_user_variables.test | 0 .../rpl}/t/rpl_variables-master.opt | 0 .../{ => suite/rpl}/t/rpl_variables.test | 0 .../{ => suite/rpl}/t/rpl_view-slave.opt | 0 mysql-test/{ => suite/rpl}/t/rpl_view.test | 0 .../rpl_ndb}/r/rpl_ndb_2innodb.result | 0 .../rpl_ndb}/r/rpl_ndb_2myisam.result | 0 .../{ => suite/rpl_ndb}/r/rpl_ndb_UUID.result | 0 .../rpl_ndb}/r/rpl_ndb_auto_inc.result | 0 .../{ => suite/rpl_ndb}/r/rpl_ndb_bank.result | 0 .../rpl_ndb}/r/rpl_ndb_basic.result | 0 .../{ => suite/rpl_ndb}/r/rpl_ndb_blob.result | 0 .../rpl_ndb}/r/rpl_ndb_blob2.result | 0 .../rpl_ndb}/r/rpl_ndb_charset.result | 0 .../rpl_ndb}/r/rpl_ndb_circular.result | 0 .../r/rpl_ndb_circular_simplex.result | 0 .../r/rpl_ndb_commit_afterflush.result | 0 .../rpl_ndb}/r/rpl_ndb_dd_advance.result | 0 .../rpl_ndb}/r/rpl_ndb_dd_basic.result | 0 .../rpl_ndb}/r/rpl_ndb_dd_partitions.result | 0 .../{ => suite/rpl_ndb}/r/rpl_ndb_ddl.result | 0 .../rpl_ndb}/r/rpl_ndb_delete_nowhere.result | 0 .../rpl_ndb}/r/rpl_ndb_do_db.result | 0 .../rpl_ndb}/r/rpl_ndb_do_table.result | 0 .../rpl_ndb}/r/rpl_ndb_extraCol.result | 0 .../rpl_ndb}/r/rpl_ndb_func003.result | 0 .../rpl_ndb}/r/rpl_ndb_idempotent.result | 0 .../rpl_ndb}/r/rpl_ndb_innodb_trans.result | 0 .../rpl_ndb}/r/rpl_ndb_insert_ignore.result | 0 .../{ => suite/rpl_ndb}/r/rpl_ndb_load.result | 0 .../{ => suite/rpl_ndb}/r/rpl_ndb_log.result | 0 .../rpl_ndb}/r/rpl_ndb_multi.result | 0 .../rpl_ndb}/r/rpl_ndb_multi_update2.result | 0 .../rpl_ndb}/r/rpl_ndb_multi_update3.result | 0 .../rpl_ndb}/r/rpl_ndb_relayrotate.result | 0 .../rpl_ndb}/r/rpl_ndb_rep_ignore.result | 0 .../rpl_ndb}/r/rpl_ndb_row_001.result | 0 .../rpl_ndb}/r/rpl_ndb_sp003.result | 0 .../rpl_ndb}/r/rpl_ndb_sp006.result | 0 .../rpl_ndb}/r/rpl_ndb_stm_innodb.result | 0 .../{ => suite/rpl_ndb}/r/rpl_ndb_sync.result | 0 .../rpl_ndb}/r/rpl_ndb_trig004.result | 0 .../rpl_ndb}/r/rpl_ndbapi_multi.result | 0 .../rpl_ndb}/r/rpl_row_basic_7ndb.result | 0 .../rpl_ndb}/r/rpl_truncate_7ndb.result | 0 mysql-test/suite/rpl_ndb/t/disabled.def | 27 ++ .../rpl_ndb}/t/rpl_ndb_2innodb-master.opt | 0 .../rpl_ndb}/t/rpl_ndb_2innodb-slave.opt | 0 .../rpl_ndb}/t/rpl_ndb_2innodb.test | 0 .../rpl_ndb}/t/rpl_ndb_2myisam-master.opt | 0 .../rpl_ndb}/t/rpl_ndb_2myisam-slave.opt | 0 .../rpl_ndb}/t/rpl_ndb_2myisam.test | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_UUID.test | 0 .../rpl_ndb}/t/rpl_ndb_auto_inc.test | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_bank.test | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_basic.test | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_blob.test | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_blob2.test | 0 .../rpl_ndb}/t/rpl_ndb_charset.test | 0 .../rpl_ndb}/t/rpl_ndb_circular.test | 0 .../rpl_ndb}/t/rpl_ndb_circular_simplex.test | 0 .../rpl_ndb}/t/rpl_ndb_commit_afterflush.test | 0 .../rpl_ndb}/t/rpl_ndb_dd_advance.test | 0 .../rpl_ndb}/t/rpl_ndb_dd_basic.test | 0 .../rpl_ndb}/t/rpl_ndb_dd_partitions.test | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_ddl.test | 0 .../rpl_ndb}/t/rpl_ndb_delete_nowhere.test | 0 .../rpl_ndb}/t/rpl_ndb_do_db-slave.opt | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_do_db.test | 0 .../rpl_ndb}/t/rpl_ndb_do_table-slave.opt | 0 .../rpl_ndb}/t/rpl_ndb_do_table.test | 0 .../rpl_ndb}/t/rpl_ndb_extraCol.test | 0 .../rpl_ndb}/t/rpl_ndb_func003.test | 0 .../rpl_ndb}/t/rpl_ndb_idempotent.test | 0 .../rpl_ndb}/t/rpl_ndb_innodb2ndb-master.opt | 0 .../rpl_ndb}/t/rpl_ndb_innodb2ndb-slave.opt | 0 .../rpl_ndb}/t/rpl_ndb_innodb2ndb.test | 0 .../rpl_ndb}/t/rpl_ndb_innodb_trans-slave.opt | 0 .../rpl_ndb}/t/rpl_ndb_innodb_trans.test | 0 .../rpl_ndb}/t/rpl_ndb_insert_ignore.test | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_load.test | 0 .../rpl_ndb}/t/rpl_ndb_log-master.opt | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_log.test | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_multi.test | 0 .../t/rpl_ndb_multi_update2-slave.opt | 0 .../rpl_ndb}/t/rpl_ndb_multi_update2.test | 0 .../rpl_ndb}/t/rpl_ndb_multi_update3.test | 0 .../rpl_ndb}/t/rpl_ndb_myisam2ndb-master.opt | 0 .../rpl_ndb}/t/rpl_ndb_myisam2ndb-slave.opt | 0 .../rpl_ndb}/t/rpl_ndb_myisam2ndb.test | 0 .../rpl_ndb}/t/rpl_ndb_relayrotate-slave.opt | 0 .../rpl_ndb}/t/rpl_ndb_relayrotate.test | 0 .../rpl_ndb}/t/rpl_ndb_rep_ignore-slave.opt | 0 .../rpl_ndb}/t/rpl_ndb_rep_ignore.test | 0 .../rpl_ndb}/t/rpl_ndb_row_001.test | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_sp003.test | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_sp006.test | 0 .../rpl_ndb}/t/rpl_ndb_stm_innodb-master.opt | 0 .../rpl_ndb}/t/rpl_ndb_stm_innodb.test | 0 .../{ => suite/rpl_ndb}/t/rpl_ndb_sync.test | 0 .../rpl_ndb}/t/rpl_ndb_trig004.test | 0 .../rpl_ndb}/t/rpl_ndbapi_multi.test | 0 .../rpl_ndb}/t/rpl_row_basic_7ndb.test | 0 .../rpl_ndb}/t/rpl_truncate_7ndb.test | 0 mysql-test/t/disabled.def | 23 -- 758 files changed, 278 insertions(+), 202 deletions(-) rename mysql-test/{ => suite/binlog}/r/binlog_killed.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_row_binlog.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_row_blackhole.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_row_ctype_cp932.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_row_ctype_ucs.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_row_drop_tmp_tbl.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_row_innodb_stat.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_row_insert_select.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_row_mix_innodb_myisam.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_statement_insert_delayed.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_stm_binlog.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_stm_blackhole.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_stm_ctype_cp932.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_stm_ctype_ucs.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_stm_drop_tmp_tbl.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_stm_innodb_stat.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_stm_insert_select.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_stm_mix_innodb_myisam.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_stm_ps.result (100%) rename mysql-test/{ => suite/binlog}/t/binlog_killed.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_row_binlog-master.opt (100%) rename mysql-test/{ => suite/binlog}/t/binlog_row_binlog.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_row_blackhole.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_row_ctype_cp932.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_row_ctype_ucs.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_row_drop_tmp_tbl.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_row_innodb_stat-master.opt (100%) rename mysql-test/{ => suite/binlog}/t/binlog_row_innodb_stat.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_row_insert_select.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_row_mix_innodb_myisam-master.opt (100%) rename mysql-test/{ => suite/binlog}/t/binlog_row_mix_innodb_myisam.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_statement_insert_delayed.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_stm_binlog-master.opt (100%) rename mysql-test/{ => suite/binlog}/t/binlog_stm_binlog.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_stm_blackhole.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_stm_ctype_cp932.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_stm_ctype_ucs.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_stm_drop_tmp_tbl.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_stm_innodb_stat-master.opt (100%) rename mysql-test/{ => suite/binlog}/t/binlog_stm_innodb_stat.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_stm_insert_select.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_stm_mix_innodb_myisam-master.opt (100%) rename mysql-test/{ => suite/binlog}/t/binlog_stm_mix_innodb_myisam.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_stm_ps.test (100%) create mode 100644 mysql-test/suite/funcs_1/t/suite.opt create mode 100644 mysql-test/suite/funcs_2/t/suite.opt rename mysql-test/{ => suite/ndb}/r/loaddata_autocom_ndb.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_alter_table.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_alter_table2.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_alter_table3.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_autodiscover.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_autodiscover2.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_autodiscover3.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_backup_print.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_basic.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_binlog_basic.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_binlog_basic2.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_binlog_ddl_multi.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_binlog_discover.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_binlog_ignore_db.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_binlog_log_bin.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_binlog_multi.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_bitfield.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_blob.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_blob_partition.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_cache.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_cache2.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_cache_multi.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_cache_multi2.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_charset.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_condition_pushdown.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_config.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_config2.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_cursor.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_database.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_dd_alter.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_dd_backuprestore.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_dd_basic.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_dd_ddl.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_dd_disk2memory.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_dd_dump.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_dd_sql_features.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_gis.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_grant.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_index.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_index_ordered.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_index_unique.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_insert.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_limit.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_load.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_loaddatalocal.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_lock.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_minmax.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_multi.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_multi_row.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_partition_error.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_partition_error2.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_partition_key.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_partition_list.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_partition_range.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_read_multi_range.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_rename.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_replace.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_restore.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_restore_compat.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_restore_partition.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_restore_print.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_row_format.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_single_user.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_sp.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_subquery.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_temporary.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_transaction.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_trigger.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_truncate.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_types.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_update.result (100%) rename mysql-test/{ => suite/ndb}/r/ndb_view.result (100%) rename mysql-test/{ => suite/ndb}/r/ndbapi.result (100%) rename mysql-test/{ => suite/ndb}/r/partition_03ndb.result (100%) rename mysql-test/{ => suite/ndb}/r/ps_7ndb.result (100%) rename mysql-test/{ => suite/ndb}/r/strict_autoinc_5ndb.result (100%) create mode 100644 mysql-test/suite/ndb/t/disabled.def rename mysql-test/{ => suite/ndb}/t/loaddata_autocom_ndb.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_alter_table.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_alter_table2.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_alter_table3.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_autodiscover.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_autodiscover2-master.opt (100%) rename mysql-test/{ => suite/ndb}/t/ndb_autodiscover2.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_autodiscover3.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_backup_print.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_basic.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_binlog_basic.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_binlog_basic2.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_binlog_ddl_multi.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_binlog_discover.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_binlog_ignore_db-master.opt (100%) rename mysql-test/{ => suite/ndb}/t/ndb_binlog_ignore_db.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_binlog_log_bin.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_binlog_multi.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_bitfield.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_blob.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_blob_partition.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_cache.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_cache2.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_cache_multi.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_cache_multi2.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_charset.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_condition_pushdown.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_config.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_config2.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_cursor.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_database.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_dd_alter.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_dd_backuprestore.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_dd_basic.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_dd_ddl.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_dd_disk2memory.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_dd_dump.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_dd_sql_features.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_gis.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_grant.later (100%) rename mysql-test/{ => suite/ndb}/t/ndb_index.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_index_ordered.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_index_unique.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_insert.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_limit.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_load.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_loaddatalocal.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_lock.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_minmax.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_multi.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_multi_row.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_partition_error.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_partition_error2-master.opt (100%) rename mysql-test/{ => suite/ndb}/t/ndb_partition_error2.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_partition_key.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_partition_list.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_partition_range.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_read_multi_range.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_rename.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_replace.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_restore.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_restore_compat.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_restore_partition-master.opt (100%) rename mysql-test/{ => suite/ndb}/t/ndb_restore_partition.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_restore_print.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_row_format.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_single_user.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_sp.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_subquery.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_temporary.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_transaction.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_trigger.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_truncate.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_types.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_update.test (100%) rename mysql-test/{ => suite/ndb}/t/ndb_view.test (100%) rename mysql-test/{ => suite/ndb}/t/ndbapi.test (100%) rename mysql-test/{ => suite/ndb}/t/partition_03ndb.test (100%) rename mysql-test/{ => suite/ndb}/t/ps_7ndb.test (100%) rename mysql-test/{ => suite/ndb}/t/strict_autoinc_5ndb.test (100%) rename mysql-test/{ => suite/rpl}/r/rpl000001.a.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl000001.b.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl000010.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl000011.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl000013.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl000017.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_000015.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_EE_err.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_LD_INFILE.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_alter.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_alter_db.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_auto_increment.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_auto_increment_11932.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_bit.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_bit_npk.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_change_master.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_charset_sjis.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_commit_after_flush.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_create_database.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_critical_errors.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_critical_errors.result.txt (100%) rename mysql-test/{ => suite/rpl}/r/rpl_ddl.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_deadlock_innodb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_delete_no_where.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_do_grant.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_drop.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_drop_db.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_drop_temp.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_dual_pos_advance.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_empty_master_crash.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_err_ignoredtable.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_events.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_extraCol_innodb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_extraCol_myisam.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_failed_optimize.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_flushlog_loop.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_foreign_key_innodb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_free_items.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_get_lock.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_ignore_grant.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_ignore_revoke.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_ignore_table.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_ignore_table_update.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_incident.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_init_slave.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_innodb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_insert.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_insert_id.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_insert_id_pk.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_insert_ignore.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_insert_select.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_known_bugs_detection.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_load_from_master.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_load_table_from_master.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_loaddata.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_loaddata_charset.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_loaddata_m.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_loaddata_s.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_loaddata_simple.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_loaddatalocal.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_loadfile.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_locale.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_log_pos.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_many_optimize.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_master_pos_wait.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_misc_functions.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_mixed_ddl_dml.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_multi_delete.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_multi_delete2.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_multi_engine.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_multi_update.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_multi_update2.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_multi_update3.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_multi_update4.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_optimize.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_packet.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_ps.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_rbr_to_sbr.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_read_only.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_redirect.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_relay_space_innodb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_relay_space_myisam.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_relayrotate.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_relayspace.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_replicate_do.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_replicate_ignore_db.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_rewrt_db.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_rotate_logs.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_001.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_4_bytes.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_NOW.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_USER.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_UUID.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_basic_11bugs-master.opt (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_basic_11bugs-slave.opt (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_basic_11bugs.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_basic_2myisam.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_basic_3innodb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_basic_8partition.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_blob_innodb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_blob_myisam.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_charset.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_create_table.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_delayed_ins.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_drop.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_err_ignoredtable.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_flsh_tbls.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_func001.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_func002.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_func003.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_inexist_tbl.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_insert_delayed.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_loaddata_m.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_log.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_log_innodb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_max_relay_size.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_multi_query.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_mysqlbinlog.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_mystery22.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_reset_slave.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_sp001.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_sp002_innodb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_sp003.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_sp005.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_sp006_InnoDB.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_sp007_innodb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_sp008.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_sp009.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_sp010.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_sp011.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_sp012.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_stop_middle.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_stop_middle_update.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_tabledefs_2myisam.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_tabledefs_3innodb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_tabledefs_7ndb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_trig001.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_trig002.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_trig003.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_trig004.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_until.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_row_view01.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_server_id1.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_server_id2.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_session_var.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_set_charset.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_sf.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_skip_error.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_slave_status.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_sp.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_sp004.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_sp_effects.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_sporadic_master.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_ssl.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_ssl1.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_start_stop_slave.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_stm_000001.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_stm_EE_err2.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_stm_charset.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_stm_flsh_tbls.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_stm_insert_delayed.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_stm_log.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_stm_max_relay_size.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_stm_multi_query.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_stm_mystery22.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_stm_no_op.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_stm_reset_slave.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_stm_until.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_switch_stm_row_mixed.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_temp_table.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_temporary.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_timezone.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_trigger.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_trunc_temp.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_truncate_2myisam.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_truncate_3innodb.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_truncate_7ndb_2.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_udf.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_user_variables.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_variables.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_view.result (100%) create mode 100644 mysql-test/suite/rpl/t/disabled.def rename mysql-test/{ => suite/rpl}/t/rpl000010-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl000010.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl000011.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl000013.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl000017-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl000017-slave.sh (100%) rename mysql-test/{ => suite/rpl}/t/rpl000017.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl000018-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl000018-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_000015-slave.sh (100%) rename mysql-test/{ => suite/rpl}/t/rpl_000015.slave-mi (100%) rename mysql-test/{ => suite/rpl}/t/rpl_000015.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_EE_err.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_LD_INFILE.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_alter.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_alter_db.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_auto_increment-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_auto_increment-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_auto_increment.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_auto_increment_11932.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_bit.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_bit_npk.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_change_master.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_charset_sjis.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_commit_after_flush.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_create_database-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_create_database-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_create_database.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_critical_errors.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_ddl.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_deadlock_innodb-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_deadlock_innodb.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_delete_no_where.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_do_grant.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_drop.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_drop_db.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_drop_temp-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_drop_temp.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_dual_pos_advance-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_dual_pos_advance.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_empty_master_crash-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_empty_master_crash.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_err_ignoredtable-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_err_ignoredtable.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_events.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_extraCol_innodb-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_extraCol_innodb-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_extraCol_innodb.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_extraCol_myisam.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_failed_optimize-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_failed_optimize.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_flushlog_loop-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_flushlog_loop-master.sh (100%) rename mysql-test/{ => suite/rpl}/t/rpl_flushlog_loop-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_flushlog_loop-slave.sh (100%) rename mysql-test/{ => suite/rpl}/t/rpl_flushlog_loop.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_foreign_key_innodb-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_foreign_key_innodb.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_free_items-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_free_items.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_get_lock.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_ignore_grant-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_ignore_grant.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_ignore_revoke-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_ignore_revoke.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_ignore_table-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_ignore_table.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_ignore_table_update-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_ignore_table_update.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_incident-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_incident.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_init_slave-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_init_slave.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_innodb.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_insert.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_insert_id-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_insert_id.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_insert_id_pk-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_insert_id_pk.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_insert_ignore-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_insert_ignore.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_insert_select.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_known_bugs_detection-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_known_bugs_detection.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_load_from_master-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_load_from_master.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_load_table_from_master.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_loaddata.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_loaddata_charset.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_loaddata_m-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_loaddata_m.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_loaddata_s-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_loaddata_s.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_loaddata_simple.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_loaddatalocal.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_loadfile.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_locale.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_log_pos.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_many_optimize.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_master_pos_wait.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_misc_functions-slave.sh (100%) rename mysql-test/{ => suite/rpl}/t/rpl_misc_functions.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_mixed_ddl_dml.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_multi_delete-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_multi_delete.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_multi_delete2-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_multi_delete2.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_multi_engine-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_multi_engine.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_multi_update.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_multi_update2-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_multi_update2.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_multi_update3.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_multi_update4-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_multi_update4.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_optimize.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_packet-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_packet-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_packet.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_ps.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_rbr_to_sbr.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_read_only-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_read_only.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_redirect.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_relay_space_innodb-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_relay_space_innodb-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_relay_space_innodb.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_relay_space_myisam.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_relayrotate-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_relayrotate.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_relayspace-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_relayspace.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_replicate_do-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_replicate_do.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_replicate_ignore_db-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_replicate_ignore_db.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_rewrt_db-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_rewrt_db.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_rotate_logs-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_rotate_logs-slave.sh (100%) rename mysql-test/{ => suite/rpl}/t/rpl_rotate_logs.slave-mi (100%) rename mysql-test/{ => suite/rpl}/t/rpl_rotate_logs.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_001.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_4_bytes-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_4_bytes.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_NOW.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_USER.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_UUID.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_basic_11bugs-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_basic_11bugs-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_basic_11bugs.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_basic_2myisam.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_basic_3innodb-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_basic_3innodb.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_basic_8partition.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_blob_innodb-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_blob_innodb.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_blob_myisam.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_charset.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_create_table-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_create_table.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_delayed_ins.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_drop.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_err_daisychain-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_err_daisychain-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_flsh_tbls.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_func001.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_func002.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_func003-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_func003.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_inexist_tbl-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_inexist_tbl.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_insert_delayed.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_log-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_log-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_log.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_log_innodb-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_log_innodb-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_log_innodb.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_max_relay_size.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_mysqlbinlog-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_mysqlbinlog.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_mystery22.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_reset_slave.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp001.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp002_innodb-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp002_innodb-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp002_innodb.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp003-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp003-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp003.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp005.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp006_InnoDB-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp006_InnoDB.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp007_innodb-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp007_innodb.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp008.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp009.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp010.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp011.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_sp012.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_stop_middle.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_stop_middle_update-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_stop_middle_update-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_stop_middle_update.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_tabledefs_2myisam.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_tabledefs_3innodb-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_tabledefs_3innodb.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_trig001.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_trig002.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_trig003.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_trig004.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_until.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_row_view01.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_server_id1.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_server_id2-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_server_id2.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_session_var.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_set_charset.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_sf.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_skip_error-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_skip_error.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_slave_status.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_sp-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_sp-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_sp.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_sp004.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_sp_effects-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_sp_effects-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_sp_effects.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_sporadic_master-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_sporadic_master.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_ssl.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_ssl1.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_start_stop_slave.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_000001-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_000001.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_EE_err2.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_charset.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_flsh_tbls.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_insert_delayed.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_log-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_log-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_log.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_max_relay_size.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_multi_query.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_mystery22.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_no_op.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_reset_slave.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_stm_until.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_switch_stm_row_mixed.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_temp_table.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_temporary.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_timezone-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_timezone-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_timezone.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_trigger.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_trunc_temp.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_truncate_2myisam.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_truncate_3innodb.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_truncate_7ndb_2-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_truncate_7ndb_2.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_udf-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_udf-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_udf.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_user_variables.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_variables-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_variables.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_view-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_view.test (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_2innodb.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_2myisam.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_UUID.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_auto_inc.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_bank.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_basic.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_blob.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_blob2.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_charset.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_circular.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_circular_simplex.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_commit_afterflush.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_dd_advance.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_dd_basic.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_dd_partitions.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_ddl.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_delete_nowhere.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_do_db.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_do_table.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_extraCol.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_func003.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_idempotent.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_innodb_trans.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_insert_ignore.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_load.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_log.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_multi.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_multi_update2.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_multi_update3.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_relayrotate.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_rep_ignore.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_row_001.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_sp003.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_sp006.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_stm_innodb.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_sync.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndb_trig004.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_ndbapi_multi.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_row_basic_7ndb.result (100%) rename mysql-test/{ => suite/rpl_ndb}/r/rpl_truncate_7ndb.result (100%) create mode 100644 mysql-test/suite/rpl_ndb/t/disabled.def rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_2innodb-master.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_2innodb-slave.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_2innodb.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_2myisam-master.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_2myisam-slave.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_2myisam.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_UUID.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_auto_inc.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_bank.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_basic.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_blob.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_blob2.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_charset.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_circular.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_circular_simplex.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_commit_afterflush.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_dd_advance.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_dd_basic.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_dd_partitions.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_ddl.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_delete_nowhere.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_do_db-slave.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_do_db.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_do_table-slave.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_do_table.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_extraCol.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_func003.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_idempotent.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_innodb2ndb-master.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_innodb2ndb-slave.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_innodb2ndb.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_innodb_trans-slave.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_innodb_trans.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_insert_ignore.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_load.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_log-master.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_log.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_multi.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_multi_update2-slave.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_multi_update2.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_multi_update3.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_myisam2ndb-master.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_myisam2ndb-slave.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_myisam2ndb.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_relayrotate-slave.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_relayrotate.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_rep_ignore-slave.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_rep_ignore.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_row_001.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_sp003.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_sp006.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_stm_innodb-master.opt (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_stm_innodb.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_sync.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndb_trig004.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_ndbapi_multi.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_row_basic_7ndb.test (100%) rename mysql-test/{ => suite/rpl_ndb}/t/rpl_truncate_7ndb.test (100%) diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl index 11ff85818a7..13708a5a3af 100644 --- a/mysql-test/lib/mtr_cases.pl +++ b/mysql-test/lib/mtr_cases.pl @@ -23,7 +23,8 @@ use IO::File(); use strict; sub collect_test_cases ($); -sub collect_one_test_case ($$$$$$$); +sub collect_one_suite ($$); +sub collect_one_test_case ($$$$$$$$$); sub mtr_options_from_test_file($$); @@ -34,147 +35,39 @@ sub mtr_options_from_test_file($$); ############################################################################## sub collect_test_cases ($) { - my $suite= shift; # Test suite name + my $suites= shift; # Semicolon separated list of test suites + my $cases = []; # Array of hash - my $testdir; - my $resdir; - - if ( $suite eq "main" ) + foreach my $suite (split(",", $suites)) { - $testdir= "$::glob_mysql_test_dir/t"; - $resdir= "$::glob_mysql_test_dir/r"; - } - else - { - $testdir= "$::glob_mysql_test_dir/suite/$suite/t"; - $resdir= "$::glob_mysql_test_dir/suite/$suite/r"; + collect_one_suite($suite, $cases); } - my $cases = []; # Array of hash, will be array of C struct - - opendir(TESTDIR, $testdir) or mtr_error("Can't open dir \"$testdir\": $!"); - - # ---------------------------------------------------------------------- - # Disable some tests listed in disabled.def - # ---------------------------------------------------------------------- - my %disabled; - if ( open(DISABLED, "$testdir/disabled.def" ) ) - { - while ( ) - { - chomp; - if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ ) - { - $disabled{$1}= $2; - } - } - close DISABLED; - } if ( @::opt_cases ) { + # Check that the tests specified was found + # in at least one suite foreach my $tname ( @::opt_cases ) { - # Run in specified order, no sort - my $elem= undef; - my $component_id= undef; - - # Get rid of directory part (path). Leave the extension since it is used - # to understand type of the test. - - $tname = basename($tname); - - # Check if the extenstion has been specified. - - if ( mtr_match_extension($tname, "test") ) + my $found= 0; + foreach my $test ( @$cases ) { - $elem= $tname; - $tname=~ s/\.test$//; - $component_id= 'mysqld'; + if ( mtr_match_extension($test->{'name'}, $tname) ) + { + $found= 1; + } } - elsif ( mtr_match_extension($tname, "imtest") ) + if ( not $found ) { - $elem= $tname; - $tname =~ s/\.imtest$//; - $component_id= 'im'; + mtr_error("Could not find $tname in any suite"); } - - # If target component is known, check that the specified test case - # exists. - # - # Otherwise, try to guess the target component. - - if ( $component_id ) - { - if ( ! -f "$testdir/$elem") - { - mtr_error("Test case $tname ($testdir/$elem) is not found"); - } - } - else - { - my $mysqld_test_exists = -f "$testdir/$tname.test"; - my $im_test_exists = -f "$testdir/$tname.imtest"; - - if ( $mysqld_test_exists and $im_test_exists ) - { - mtr_error("Ambiguous test case name ($tname)"); - } - elsif ( ! $mysqld_test_exists and ! $im_test_exists ) - { - mtr_error("Test case $tname is not found"); - } - elsif ( $mysqld_test_exists ) - { - $elem= "$tname.test"; - $component_id= 'mysqld'; - } - elsif ( $im_test_exists ) - { - $elem= "$tname.imtest"; - $component_id= 'im'; - } - } - - collect_one_test_case($testdir,$resdir,$tname,$elem,$cases,\%disabled, - $component_id); } - closedir TESTDIR; - } - else - { - foreach my $elem ( sort readdir(TESTDIR) ) - { - my $component_id= undef; - my $tname= undef; - - if ($tname= mtr_match_extension($elem, 'test')) - { - $component_id = 'mysqld'; - } - elsif ($tname= mtr_match_extension($elem, 'imtest')) - { - $component_id = 'im'; - } - else - { - next; - } - - # Skip tests that does not match the --do-test= filter - next if $::opt_do_test and - ! defined mtr_match_prefix($elem,$::opt_do_test); - - collect_one_test_case($testdir,$resdir,$tname,$elem,$cases,\%disabled, - $component_id); - } - closedir TESTDIR; } - # Reorder the test cases in an order that will make them faster to run if ( $::opt_reorder ) { - + # Reorder the test cases in an order that will make them faster to run my %sort_criteria; # Make a mapping of test name to a string that represents how that test @@ -246,6 +139,160 @@ sub collect_test_cases ($) { } } + return $cases; + +} + +sub collect_one_suite($$) +{ + my $suite= shift; # Test suite name + my $cases= shift; # List of test cases + + mtr_verbose("Collecting: $suite"); + + my $testdir; + my $resdir; + + if ( $suite eq "main" ) + { + $testdir= "$::glob_mysql_test_dir/t"; + $resdir= "$::glob_mysql_test_dir/r"; + } + else + { + $testdir= "$::glob_mysql_test_dir/suite/$suite/t"; + $resdir= "$::glob_mysql_test_dir/suite/$suite/r"; + } + + # ---------------------------------------------------------------------- + # Build a hash of disabled testcases for this suite + # ---------------------------------------------------------------------- + my %disabled; + if ( open(DISABLED, "$testdir/disabled.def" ) ) + { + while ( ) + { + chomp; + if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ ) + { + $disabled{$1}= $2; + } + } + close DISABLED; + } + + # Read suite.opt file + my $suite_opt_file= "$testdir/suite.opt"; + my $suite_opts= []; + if ( -f $suite_opt_file ) + { + $suite_opts= mtr_get_opts_from_file($suite_opt_file); + } + + if ( @::opt_cases ) + { + # Collect in specified order, no sort + foreach my $tname ( @::opt_cases ) + { + my $elem= undef; + my $component_id= undef; + + # Get rid of directory part (path). Leave the extension since it is used + # to understand type of the test. + + $tname = basename($tname); + + # Check if the extenstion has been specified. + + if ( mtr_match_extension($tname, "test") ) + { + $elem= $tname; + $tname=~ s/\.test$//; + $component_id= 'mysqld'; + } + elsif ( mtr_match_extension($tname, "imtest") ) + { + $elem= $tname; + $tname =~ s/\.imtest$//; + $component_id= 'im'; + } + + # If target component is known, check that the specified test case + # exists. + # + # Otherwise, try to guess the target component. + + if ( $component_id ) + { + if ( ! -f "$testdir/$elem") + { + mtr_error("Test case $tname ($testdir/$elem) is not found"); + } + } + else + { + my $mysqld_test_exists = -f "$testdir/$tname.test"; + my $im_test_exists = -f "$testdir/$tname.imtest"; + + if ( $mysqld_test_exists and $im_test_exists ) + { + mtr_error("Ambiguous test case name ($tname)"); + } + elsif ( ! $mysqld_test_exists and ! $im_test_exists ) + { + # Silently skip, could exist in another suite + next; + } + elsif ( $mysqld_test_exists ) + { + $elem= "$tname.test"; + $component_id= 'mysqld'; + } + elsif ( $im_test_exists ) + { + $elem= "$tname.imtest"; + $component_id= 'im'; + } + } + + collect_one_test_case($testdir,$resdir,$suite,$tname, + $elem,$cases,\%disabled,$component_id, + $suite_opts); + } + } + else + { + opendir(TESTDIR, $testdir) or mtr_error("Can't open dir \"$testdir\": $!"); + + foreach my $elem ( sort readdir(TESTDIR) ) + { + my $component_id= undef; + my $tname= undef; + + if ($tname= mtr_match_extension($elem, 'test')) + { + $component_id = 'mysqld'; + } + elsif ($tname= mtr_match_extension($elem, 'imtest')) + { + $component_id = 'im'; + } + else + { + next; + } + + # Skip tests that does not match the --do-test= filter + next if $::opt_do_test and + ! defined mtr_match_prefix($elem,$::opt_do_test); + + collect_one_test_case($testdir,$resdir,$suite,$tname, + $elem,$cases,\%disabled,$component_id, + $suite_opts); + } + closedir TESTDIR; + } + return $cases; } @@ -257,14 +304,16 @@ sub collect_test_cases ($) { ############################################################################## -sub collect_one_test_case($$$$$$$) { +sub collect_one_test_case($$$$$$$$$) { my $testdir= shift; my $resdir= shift; + my $suite= shift; my $tname= shift; my $elem= shift; my $cases= shift; my $disabled=shift; my $component_id= shift; + my $suite_opts= shift; my $path= "$testdir/$elem"; @@ -279,7 +328,7 @@ sub collect_one_test_case($$$$$$$) { my $tinfo= {}; - $tinfo->{'name'}= $tname; + $tinfo->{'name'}= "$suite.$tname"; $tinfo->{'result_file'}= "$resdir/$tname.result"; $tinfo->{'component_id'} = $component_id; push(@$cases, $tinfo); @@ -334,6 +383,15 @@ sub collect_one_test_case($$$$$$$) { $tinfo->{'slave_opt'}= []; $tinfo->{'slave_mi'}= []; + # Add suite opts + foreach my $opt ( @$suite_opts ) + { + mtr_verbose($opt); + push(@{$tinfo->{'master_opt'}}, $opt); + push(@{$tinfo->{'slave_opt'}}, $opt); + } + + # Add master opts if ( -f $master_opt_file ) { @@ -394,6 +452,7 @@ sub collect_one_test_case($$$$$$$) { } } + # Add slave opts if ( -f $slave_opt_file ) { my $slave_opt= mtr_get_opts_from_file($slave_opt_file); diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl index 096840eb559..d60f8967256 100644 --- a/mysql-test/lib/mtr_report.pl +++ b/mysql-test/lib/mtr_report.pl @@ -48,30 +48,15 @@ sub mtr_verbose (@); # We can't use diff -u or diff -a as these are not portable sub mtr_show_failed_diff ($) { - my $result_file_name= shift; + my $tinfo= shift; # The reject and log files have been dumped to # to filenames based on the result_file's name - my $tname= basename($result_file_name); - $tname=~ s/\..*$//; - - my $reject_file= "r/$tname.reject"; - my $result_file= "r/$tname.result"; - my $log_file= "$::opt_vardir/log/$tname.log"; - my $eval_file= "r/$tname.eval"; - - if ( $::opt_suite ne "main" ) - { - $reject_file= "$::glob_mysql_test_dir/suite/$::opt_suite/$reject_file"; - $result_file= "$::glob_mysql_test_dir/suite/$::opt_suite/$result_file"; - $eval_file= "$::glob_mysql_test_dir/suite/$::opt_suite/$eval_file"; - $log_file= "$::glob_mysql_test_dir/suite/$::opt_suite/$log_file"; - } - - if ( -f $eval_file ) - { - $result_file= $eval_file; - } + my $base_file= mtr_match_extension($tinfo->{'result_file'}, + "result"); # Trim extension + my $reject_file= "$base_file.reject"; + my $result_file= "$base_file.result"; + my $log_file= "$base_file.log"; my $diffopts= $::opt_udiff ? "-u" : "-c"; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 970790f4141..085feb524c4 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -132,7 +132,7 @@ our $opt_vs_config = $ENV{'MTR_VS_CONFIG'}; our $default_vardir; our $opt_usage; -our $opt_suite; +our $opt_suites= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run our $opt_script_debug= 0; # Script debugging, enable with --script-debug our $opt_verbose= 0; # Verbose output, enable with --verbose @@ -404,7 +404,7 @@ sub main () { else { # Figure out which tests we are going to run - my $tests= collect_test_cases($opt_suite); + my $tests= collect_test_cases($opt_suites); # Turn off NDB and other similar options if no tests use it my ($need_ndbcluster,$need_im); @@ -458,7 +458,7 @@ sub main () { run_report_features(); } - run_suite($opt_suite, $tests); + run_tests($tests); } mtr_exit(0); @@ -474,7 +474,6 @@ sub command_line_setup () { # These are defaults for things that are set on the command line - $opt_suite= "main"; # Special default suite my $opt_comment; $opt_master_myport= 9306; @@ -534,7 +533,7 @@ sub command_line_setup () { 'skip-slave-binlog' => \$opt_skip_slave_binlog, 'do-test=s' => \$opt_do_test, 'start-from=s' => \$opt_start_from, - 'suite=s' => \$opt_suite, + 'suite|suites=s' => \$opt_suites, 'skip-rpl' => \$opt_skip_rpl, 'skip-im' => \$opt_skip_im, 'skip-test=s' => \$opt_skip_test, @@ -2797,19 +2796,17 @@ sub run_benchmarks ($) { ############################################################################## # -# Run the test suite +# Run the tests # ############################################################################## -sub run_suite () { - my ($suite, $tests)= @_; +sub run_tests () { + my ($tests)= @_; mtr_print_thick_line(); mtr_timer_start($glob_timers,"suite", 60 * $opt_suite_timeout); - mtr_report("Starting Tests in the '$suite' suite"); - mtr_report_tests_not_skipped_though_disabled($tests); mtr_print_header(); @@ -3272,18 +3269,14 @@ sub run_testcase_check_skip_test($) sub do_before_run_mysqltest($) { my $tinfo= shift; - my $tname= $tinfo->{'name'}; # Remove old files produced by mysqltest - my $result_dir= "r"; - if ( $opt_suite ne "main" ) - { - $result_dir= "suite/$opt_suite/r"; - } - unlink("$result_dir/$tname.reject"); - unlink("$result_dir/$tname.progress"); - unlink("$result_dir/$tname.log"); - unlink("$result_dir/$tname.warnings"); + my $base_file= mtr_match_extension($tinfo->{'result_file'}, + "result"); # Trim extension + unlink("$base_file.reject"); + unlink("$base_file.progress"); + unlink("$base_file.log"); + unlink("$base_file.warnings"); if (!$opt_extern) { @@ -3302,7 +3295,6 @@ sub do_before_run_mysqltest($) sub do_after_run_mysqltest($) { my $tinfo= shift; - my $tname= $tinfo->{'name'}; # Save info from this testcase run to mysqltest.log mtr_appendfile_to_file($path_current_test_log, $path_mysqltest_log) @@ -3626,7 +3618,7 @@ sub report_failure_and_restart ($) { my $tinfo= shift; mtr_report_test_failed($tinfo); - mtr_show_failed_diff($tinfo->{'result_file'}); + mtr_show_failed_diff($tinfo); print "\n"; if ( $opt_force ) { @@ -3766,15 +3758,7 @@ sub mysqld_arguments ($$$$) { if ( $mysql_version_id >= 50036) { # By default, prevent the started mysqld to access files outside of vardir - my $secure_file_dir= $opt_vardir; - if ( $opt_suite ne "main" ) - { - # When running a suite other than default allow the mysqld - # access to subdirs of mysql-test/ in order to make it possible - # to "load data" from the suites data/ directory. - $secure_file_dir= $glob_mysql_test_dir; - } - mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $secure_file_dir); + mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $opt_vardir); } if ( $mysql_version_id >= 50000 ) @@ -5147,7 +5131,9 @@ Options to control what test suites or cases to run ndb-extra Run extra tests from ndb directory do-test=PREFIX Run test cases which name are prefixed with PREFIX start-from=PREFIX Run test cases starting from test prefixed with PREFIX - suite=NAME Run the test suite named NAME. The default is "main" + suite[s]=NAME1,..,NAMEN Collect tests in suites from the comma separated + list of suite names. + The default is: "$opt_suites" skip-rpl Skip the replication test cases. skip-im Don't start IM, and skip the IM test cases skip-test=PREFIX Skip test cases which name are prefixed with PREFIX diff --git a/mysql-test/r/binlog_killed.result b/mysql-test/suite/binlog/r/binlog_killed.result similarity index 100% rename from mysql-test/r/binlog_killed.result rename to mysql-test/suite/binlog/r/binlog_killed.result diff --git a/mysql-test/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result similarity index 100% rename from mysql-test/r/binlog_row_binlog.result rename to mysql-test/suite/binlog/r/binlog_row_binlog.result diff --git a/mysql-test/r/binlog_row_blackhole.result b/mysql-test/suite/binlog/r/binlog_row_blackhole.result similarity index 100% rename from mysql-test/r/binlog_row_blackhole.result rename to mysql-test/suite/binlog/r/binlog_row_blackhole.result diff --git a/mysql-test/r/binlog_row_ctype_cp932.result b/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result similarity index 100% rename from mysql-test/r/binlog_row_ctype_cp932.result rename to mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result diff --git a/mysql-test/r/binlog_row_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result similarity index 100% rename from mysql-test/r/binlog_row_ctype_ucs.result rename to mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result diff --git a/mysql-test/r/binlog_row_drop_tmp_tbl.result b/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result similarity index 100% rename from mysql-test/r/binlog_row_drop_tmp_tbl.result rename to mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result diff --git a/mysql-test/r/binlog_row_innodb_stat.result b/mysql-test/suite/binlog/r/binlog_row_innodb_stat.result similarity index 100% rename from mysql-test/r/binlog_row_innodb_stat.result rename to mysql-test/suite/binlog/r/binlog_row_innodb_stat.result diff --git a/mysql-test/r/binlog_row_insert_select.result b/mysql-test/suite/binlog/r/binlog_row_insert_select.result similarity index 100% rename from mysql-test/r/binlog_row_insert_select.result rename to mysql-test/suite/binlog/r/binlog_row_insert_select.result diff --git a/mysql-test/r/binlog_row_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result similarity index 100% rename from mysql-test/r/binlog_row_mix_innodb_myisam.result rename to mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result diff --git a/mysql-test/r/binlog_statement_insert_delayed.result b/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result similarity index 100% rename from mysql-test/r/binlog_statement_insert_delayed.result rename to mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result diff --git a/mysql-test/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result similarity index 100% rename from mysql-test/r/binlog_stm_binlog.result rename to mysql-test/suite/binlog/r/binlog_stm_binlog.result diff --git a/mysql-test/r/binlog_stm_blackhole.result b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result similarity index 100% rename from mysql-test/r/binlog_stm_blackhole.result rename to mysql-test/suite/binlog/r/binlog_stm_blackhole.result diff --git a/mysql-test/r/binlog_stm_ctype_cp932.result b/mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result similarity index 100% rename from mysql-test/r/binlog_stm_ctype_cp932.result rename to mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result diff --git a/mysql-test/r/binlog_stm_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result similarity index 100% rename from mysql-test/r/binlog_stm_ctype_ucs.result rename to mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result diff --git a/mysql-test/r/binlog_stm_drop_tmp_tbl.result b/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result similarity index 100% rename from mysql-test/r/binlog_stm_drop_tmp_tbl.result rename to mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result diff --git a/mysql-test/r/binlog_stm_innodb_stat.result b/mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result similarity index 100% rename from mysql-test/r/binlog_stm_innodb_stat.result rename to mysql-test/suite/binlog/r/binlog_stm_innodb_stat.result diff --git a/mysql-test/r/binlog_stm_insert_select.result b/mysql-test/suite/binlog/r/binlog_stm_insert_select.result similarity index 100% rename from mysql-test/r/binlog_stm_insert_select.result rename to mysql-test/suite/binlog/r/binlog_stm_insert_select.result diff --git a/mysql-test/r/binlog_stm_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result similarity index 100% rename from mysql-test/r/binlog_stm_mix_innodb_myisam.result rename to mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result diff --git a/mysql-test/r/binlog_stm_ps.result b/mysql-test/suite/binlog/r/binlog_stm_ps.result similarity index 100% rename from mysql-test/r/binlog_stm_ps.result rename to mysql-test/suite/binlog/r/binlog_stm_ps.result diff --git a/mysql-test/t/binlog_killed.test b/mysql-test/suite/binlog/t/binlog_killed.test similarity index 100% rename from mysql-test/t/binlog_killed.test rename to mysql-test/suite/binlog/t/binlog_killed.test diff --git a/mysql-test/t/binlog_row_binlog-master.opt b/mysql-test/suite/binlog/t/binlog_row_binlog-master.opt similarity index 100% rename from mysql-test/t/binlog_row_binlog-master.opt rename to mysql-test/suite/binlog/t/binlog_row_binlog-master.opt diff --git a/mysql-test/t/binlog_row_binlog.test b/mysql-test/suite/binlog/t/binlog_row_binlog.test similarity index 100% rename from mysql-test/t/binlog_row_binlog.test rename to mysql-test/suite/binlog/t/binlog_row_binlog.test diff --git a/mysql-test/t/binlog_row_blackhole.test b/mysql-test/suite/binlog/t/binlog_row_blackhole.test similarity index 100% rename from mysql-test/t/binlog_row_blackhole.test rename to mysql-test/suite/binlog/t/binlog_row_blackhole.test diff --git a/mysql-test/t/binlog_row_ctype_cp932.test b/mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test similarity index 100% rename from mysql-test/t/binlog_row_ctype_cp932.test rename to mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test diff --git a/mysql-test/t/binlog_row_ctype_ucs.test b/mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test similarity index 100% rename from mysql-test/t/binlog_row_ctype_ucs.test rename to mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test diff --git a/mysql-test/t/binlog_row_drop_tmp_tbl.test b/mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test similarity index 100% rename from mysql-test/t/binlog_row_drop_tmp_tbl.test rename to mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test diff --git a/mysql-test/t/binlog_row_innodb_stat-master.opt b/mysql-test/suite/binlog/t/binlog_row_innodb_stat-master.opt similarity index 100% rename from mysql-test/t/binlog_row_innodb_stat-master.opt rename to mysql-test/suite/binlog/t/binlog_row_innodb_stat-master.opt diff --git a/mysql-test/t/binlog_row_innodb_stat.test b/mysql-test/suite/binlog/t/binlog_row_innodb_stat.test similarity index 100% rename from mysql-test/t/binlog_row_innodb_stat.test rename to mysql-test/suite/binlog/t/binlog_row_innodb_stat.test diff --git a/mysql-test/t/binlog_row_insert_select.test b/mysql-test/suite/binlog/t/binlog_row_insert_select.test similarity index 100% rename from mysql-test/t/binlog_row_insert_select.test rename to mysql-test/suite/binlog/t/binlog_row_insert_select.test diff --git a/mysql-test/t/binlog_row_mix_innodb_myisam-master.opt b/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt similarity index 100% rename from mysql-test/t/binlog_row_mix_innodb_myisam-master.opt rename to mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt diff --git a/mysql-test/t/binlog_row_mix_innodb_myisam.test b/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test similarity index 100% rename from mysql-test/t/binlog_row_mix_innodb_myisam.test rename to mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test diff --git a/mysql-test/t/binlog_statement_insert_delayed.test b/mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test similarity index 100% rename from mysql-test/t/binlog_statement_insert_delayed.test rename to mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test diff --git a/mysql-test/t/binlog_stm_binlog-master.opt b/mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt similarity index 100% rename from mysql-test/t/binlog_stm_binlog-master.opt rename to mysql-test/suite/binlog/t/binlog_stm_binlog-master.opt diff --git a/mysql-test/t/binlog_stm_binlog.test b/mysql-test/suite/binlog/t/binlog_stm_binlog.test similarity index 100% rename from mysql-test/t/binlog_stm_binlog.test rename to mysql-test/suite/binlog/t/binlog_stm_binlog.test diff --git a/mysql-test/t/binlog_stm_blackhole.test b/mysql-test/suite/binlog/t/binlog_stm_blackhole.test similarity index 100% rename from mysql-test/t/binlog_stm_blackhole.test rename to mysql-test/suite/binlog/t/binlog_stm_blackhole.test diff --git a/mysql-test/t/binlog_stm_ctype_cp932.test b/mysql-test/suite/binlog/t/binlog_stm_ctype_cp932.test similarity index 100% rename from mysql-test/t/binlog_stm_ctype_cp932.test rename to mysql-test/suite/binlog/t/binlog_stm_ctype_cp932.test diff --git a/mysql-test/t/binlog_stm_ctype_ucs.test b/mysql-test/suite/binlog/t/binlog_stm_ctype_ucs.test similarity index 100% rename from mysql-test/t/binlog_stm_ctype_ucs.test rename to mysql-test/suite/binlog/t/binlog_stm_ctype_ucs.test diff --git a/mysql-test/t/binlog_stm_drop_tmp_tbl.test b/mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test similarity index 100% rename from mysql-test/t/binlog_stm_drop_tmp_tbl.test rename to mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test diff --git a/mysql-test/t/binlog_stm_innodb_stat-master.opt b/mysql-test/suite/binlog/t/binlog_stm_innodb_stat-master.opt similarity index 100% rename from mysql-test/t/binlog_stm_innodb_stat-master.opt rename to mysql-test/suite/binlog/t/binlog_stm_innodb_stat-master.opt diff --git a/mysql-test/t/binlog_stm_innodb_stat.test b/mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test similarity index 100% rename from mysql-test/t/binlog_stm_innodb_stat.test rename to mysql-test/suite/binlog/t/binlog_stm_innodb_stat.test diff --git a/mysql-test/t/binlog_stm_insert_select.test b/mysql-test/suite/binlog/t/binlog_stm_insert_select.test similarity index 100% rename from mysql-test/t/binlog_stm_insert_select.test rename to mysql-test/suite/binlog/t/binlog_stm_insert_select.test diff --git a/mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt similarity index 100% rename from mysql-test/t/binlog_stm_mix_innodb_myisam-master.opt rename to mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt diff --git a/mysql-test/t/binlog_stm_mix_innodb_myisam.test b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test similarity index 100% rename from mysql-test/t/binlog_stm_mix_innodb_myisam.test rename to mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test diff --git a/mysql-test/t/binlog_stm_ps.test b/mysql-test/suite/binlog/t/binlog_stm_ps.test similarity index 100% rename from mysql-test/t/binlog_stm_ps.test rename to mysql-test/suite/binlog/t/binlog_stm_ps.test diff --git a/mysql-test/suite/funcs_1/t/suite.opt b/mysql-test/suite/funcs_1/t/suite.opt new file mode 100644 index 00000000000..9b22c677b83 --- /dev/null +++ b/mysql-test/suite/funcs_1/t/suite.opt @@ -0,0 +1,2 @@ +--secure-file-priv=$MYSQL_TEST_DIR + diff --git a/mysql-test/suite/funcs_2/t/suite.opt b/mysql-test/suite/funcs_2/t/suite.opt new file mode 100644 index 00000000000..9b22c677b83 --- /dev/null +++ b/mysql-test/suite/funcs_2/t/suite.opt @@ -0,0 +1,2 @@ +--secure-file-priv=$MYSQL_TEST_DIR + diff --git a/mysql-test/r/loaddata_autocom_ndb.result b/mysql-test/suite/ndb/r/loaddata_autocom_ndb.result similarity index 100% rename from mysql-test/r/loaddata_autocom_ndb.result rename to mysql-test/suite/ndb/r/loaddata_autocom_ndb.result diff --git a/mysql-test/r/ndb_alter_table.result b/mysql-test/suite/ndb/r/ndb_alter_table.result similarity index 100% rename from mysql-test/r/ndb_alter_table.result rename to mysql-test/suite/ndb/r/ndb_alter_table.result diff --git a/mysql-test/r/ndb_alter_table2.result b/mysql-test/suite/ndb/r/ndb_alter_table2.result similarity index 100% rename from mysql-test/r/ndb_alter_table2.result rename to mysql-test/suite/ndb/r/ndb_alter_table2.result diff --git a/mysql-test/r/ndb_alter_table3.result b/mysql-test/suite/ndb/r/ndb_alter_table3.result similarity index 100% rename from mysql-test/r/ndb_alter_table3.result rename to mysql-test/suite/ndb/r/ndb_alter_table3.result diff --git a/mysql-test/r/ndb_autodiscover.result b/mysql-test/suite/ndb/r/ndb_autodiscover.result similarity index 100% rename from mysql-test/r/ndb_autodiscover.result rename to mysql-test/suite/ndb/r/ndb_autodiscover.result diff --git a/mysql-test/r/ndb_autodiscover2.result b/mysql-test/suite/ndb/r/ndb_autodiscover2.result similarity index 100% rename from mysql-test/r/ndb_autodiscover2.result rename to mysql-test/suite/ndb/r/ndb_autodiscover2.result diff --git a/mysql-test/r/ndb_autodiscover3.result b/mysql-test/suite/ndb/r/ndb_autodiscover3.result similarity index 100% rename from mysql-test/r/ndb_autodiscover3.result rename to mysql-test/suite/ndb/r/ndb_autodiscover3.result diff --git a/mysql-test/r/ndb_backup_print.result b/mysql-test/suite/ndb/r/ndb_backup_print.result similarity index 100% rename from mysql-test/r/ndb_backup_print.result rename to mysql-test/suite/ndb/r/ndb_backup_print.result diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/suite/ndb/r/ndb_basic.result similarity index 100% rename from mysql-test/r/ndb_basic.result rename to mysql-test/suite/ndb/r/ndb_basic.result diff --git a/mysql-test/r/ndb_binlog_basic.result b/mysql-test/suite/ndb/r/ndb_binlog_basic.result similarity index 100% rename from mysql-test/r/ndb_binlog_basic.result rename to mysql-test/suite/ndb/r/ndb_binlog_basic.result diff --git a/mysql-test/r/ndb_binlog_basic2.result b/mysql-test/suite/ndb/r/ndb_binlog_basic2.result similarity index 100% rename from mysql-test/r/ndb_binlog_basic2.result rename to mysql-test/suite/ndb/r/ndb_binlog_basic2.result diff --git a/mysql-test/r/ndb_binlog_ddl_multi.result b/mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result similarity index 100% rename from mysql-test/r/ndb_binlog_ddl_multi.result rename to mysql-test/suite/ndb/r/ndb_binlog_ddl_multi.result diff --git a/mysql-test/r/ndb_binlog_discover.result b/mysql-test/suite/ndb/r/ndb_binlog_discover.result similarity index 100% rename from mysql-test/r/ndb_binlog_discover.result rename to mysql-test/suite/ndb/r/ndb_binlog_discover.result diff --git a/mysql-test/r/ndb_binlog_ignore_db.result b/mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result similarity index 100% rename from mysql-test/r/ndb_binlog_ignore_db.result rename to mysql-test/suite/ndb/r/ndb_binlog_ignore_db.result diff --git a/mysql-test/r/ndb_binlog_log_bin.result b/mysql-test/suite/ndb/r/ndb_binlog_log_bin.result similarity index 100% rename from mysql-test/r/ndb_binlog_log_bin.result rename to mysql-test/suite/ndb/r/ndb_binlog_log_bin.result diff --git a/mysql-test/r/ndb_binlog_multi.result b/mysql-test/suite/ndb/r/ndb_binlog_multi.result similarity index 100% rename from mysql-test/r/ndb_binlog_multi.result rename to mysql-test/suite/ndb/r/ndb_binlog_multi.result diff --git a/mysql-test/r/ndb_bitfield.result b/mysql-test/suite/ndb/r/ndb_bitfield.result similarity index 100% rename from mysql-test/r/ndb_bitfield.result rename to mysql-test/suite/ndb/r/ndb_bitfield.result diff --git a/mysql-test/r/ndb_blob.result b/mysql-test/suite/ndb/r/ndb_blob.result similarity index 100% rename from mysql-test/r/ndb_blob.result rename to mysql-test/suite/ndb/r/ndb_blob.result diff --git a/mysql-test/r/ndb_blob_partition.result b/mysql-test/suite/ndb/r/ndb_blob_partition.result similarity index 100% rename from mysql-test/r/ndb_blob_partition.result rename to mysql-test/suite/ndb/r/ndb_blob_partition.result diff --git a/mysql-test/r/ndb_cache.result b/mysql-test/suite/ndb/r/ndb_cache.result similarity index 100% rename from mysql-test/r/ndb_cache.result rename to mysql-test/suite/ndb/r/ndb_cache.result diff --git a/mysql-test/r/ndb_cache2.result b/mysql-test/suite/ndb/r/ndb_cache2.result similarity index 100% rename from mysql-test/r/ndb_cache2.result rename to mysql-test/suite/ndb/r/ndb_cache2.result diff --git a/mysql-test/r/ndb_cache_multi.result b/mysql-test/suite/ndb/r/ndb_cache_multi.result similarity index 100% rename from mysql-test/r/ndb_cache_multi.result rename to mysql-test/suite/ndb/r/ndb_cache_multi.result diff --git a/mysql-test/r/ndb_cache_multi2.result b/mysql-test/suite/ndb/r/ndb_cache_multi2.result similarity index 100% rename from mysql-test/r/ndb_cache_multi2.result rename to mysql-test/suite/ndb/r/ndb_cache_multi2.result diff --git a/mysql-test/r/ndb_charset.result b/mysql-test/suite/ndb/r/ndb_charset.result similarity index 100% rename from mysql-test/r/ndb_charset.result rename to mysql-test/suite/ndb/r/ndb_charset.result diff --git a/mysql-test/r/ndb_condition_pushdown.result b/mysql-test/suite/ndb/r/ndb_condition_pushdown.result similarity index 100% rename from mysql-test/r/ndb_condition_pushdown.result rename to mysql-test/suite/ndb/r/ndb_condition_pushdown.result diff --git a/mysql-test/r/ndb_config.result b/mysql-test/suite/ndb/r/ndb_config.result similarity index 100% rename from mysql-test/r/ndb_config.result rename to mysql-test/suite/ndb/r/ndb_config.result diff --git a/mysql-test/r/ndb_config2.result b/mysql-test/suite/ndb/r/ndb_config2.result similarity index 100% rename from mysql-test/r/ndb_config2.result rename to mysql-test/suite/ndb/r/ndb_config2.result diff --git a/mysql-test/r/ndb_cursor.result b/mysql-test/suite/ndb/r/ndb_cursor.result similarity index 100% rename from mysql-test/r/ndb_cursor.result rename to mysql-test/suite/ndb/r/ndb_cursor.result diff --git a/mysql-test/r/ndb_database.result b/mysql-test/suite/ndb/r/ndb_database.result similarity index 100% rename from mysql-test/r/ndb_database.result rename to mysql-test/suite/ndb/r/ndb_database.result diff --git a/mysql-test/r/ndb_dd_alter.result b/mysql-test/suite/ndb/r/ndb_dd_alter.result similarity index 100% rename from mysql-test/r/ndb_dd_alter.result rename to mysql-test/suite/ndb/r/ndb_dd_alter.result diff --git a/mysql-test/r/ndb_dd_backuprestore.result b/mysql-test/suite/ndb/r/ndb_dd_backuprestore.result similarity index 100% rename from mysql-test/r/ndb_dd_backuprestore.result rename to mysql-test/suite/ndb/r/ndb_dd_backuprestore.result diff --git a/mysql-test/r/ndb_dd_basic.result b/mysql-test/suite/ndb/r/ndb_dd_basic.result similarity index 100% rename from mysql-test/r/ndb_dd_basic.result rename to mysql-test/suite/ndb/r/ndb_dd_basic.result diff --git a/mysql-test/r/ndb_dd_ddl.result b/mysql-test/suite/ndb/r/ndb_dd_ddl.result similarity index 100% rename from mysql-test/r/ndb_dd_ddl.result rename to mysql-test/suite/ndb/r/ndb_dd_ddl.result diff --git a/mysql-test/r/ndb_dd_disk2memory.result b/mysql-test/suite/ndb/r/ndb_dd_disk2memory.result similarity index 100% rename from mysql-test/r/ndb_dd_disk2memory.result rename to mysql-test/suite/ndb/r/ndb_dd_disk2memory.result diff --git a/mysql-test/r/ndb_dd_dump.result b/mysql-test/suite/ndb/r/ndb_dd_dump.result similarity index 100% rename from mysql-test/r/ndb_dd_dump.result rename to mysql-test/suite/ndb/r/ndb_dd_dump.result diff --git a/mysql-test/r/ndb_dd_sql_features.result b/mysql-test/suite/ndb/r/ndb_dd_sql_features.result similarity index 100% rename from mysql-test/r/ndb_dd_sql_features.result rename to mysql-test/suite/ndb/r/ndb_dd_sql_features.result diff --git a/mysql-test/r/ndb_gis.result b/mysql-test/suite/ndb/r/ndb_gis.result similarity index 100% rename from mysql-test/r/ndb_gis.result rename to mysql-test/suite/ndb/r/ndb_gis.result diff --git a/mysql-test/r/ndb_grant.result b/mysql-test/suite/ndb/r/ndb_grant.result similarity index 100% rename from mysql-test/r/ndb_grant.result rename to mysql-test/suite/ndb/r/ndb_grant.result diff --git a/mysql-test/r/ndb_index.result b/mysql-test/suite/ndb/r/ndb_index.result similarity index 100% rename from mysql-test/r/ndb_index.result rename to mysql-test/suite/ndb/r/ndb_index.result diff --git a/mysql-test/r/ndb_index_ordered.result b/mysql-test/suite/ndb/r/ndb_index_ordered.result similarity index 100% rename from mysql-test/r/ndb_index_ordered.result rename to mysql-test/suite/ndb/r/ndb_index_ordered.result diff --git a/mysql-test/r/ndb_index_unique.result b/mysql-test/suite/ndb/r/ndb_index_unique.result similarity index 100% rename from mysql-test/r/ndb_index_unique.result rename to mysql-test/suite/ndb/r/ndb_index_unique.result diff --git a/mysql-test/r/ndb_insert.result b/mysql-test/suite/ndb/r/ndb_insert.result similarity index 100% rename from mysql-test/r/ndb_insert.result rename to mysql-test/suite/ndb/r/ndb_insert.result diff --git a/mysql-test/r/ndb_limit.result b/mysql-test/suite/ndb/r/ndb_limit.result similarity index 100% rename from mysql-test/r/ndb_limit.result rename to mysql-test/suite/ndb/r/ndb_limit.result diff --git a/mysql-test/r/ndb_load.result b/mysql-test/suite/ndb/r/ndb_load.result similarity index 100% rename from mysql-test/r/ndb_load.result rename to mysql-test/suite/ndb/r/ndb_load.result diff --git a/mysql-test/r/ndb_loaddatalocal.result b/mysql-test/suite/ndb/r/ndb_loaddatalocal.result similarity index 100% rename from mysql-test/r/ndb_loaddatalocal.result rename to mysql-test/suite/ndb/r/ndb_loaddatalocal.result diff --git a/mysql-test/r/ndb_lock.result b/mysql-test/suite/ndb/r/ndb_lock.result similarity index 100% rename from mysql-test/r/ndb_lock.result rename to mysql-test/suite/ndb/r/ndb_lock.result diff --git a/mysql-test/r/ndb_minmax.result b/mysql-test/suite/ndb/r/ndb_minmax.result similarity index 100% rename from mysql-test/r/ndb_minmax.result rename to mysql-test/suite/ndb/r/ndb_minmax.result diff --git a/mysql-test/r/ndb_multi.result b/mysql-test/suite/ndb/r/ndb_multi.result similarity index 100% rename from mysql-test/r/ndb_multi.result rename to mysql-test/suite/ndb/r/ndb_multi.result diff --git a/mysql-test/r/ndb_multi_row.result b/mysql-test/suite/ndb/r/ndb_multi_row.result similarity index 100% rename from mysql-test/r/ndb_multi_row.result rename to mysql-test/suite/ndb/r/ndb_multi_row.result diff --git a/mysql-test/r/ndb_partition_error.result b/mysql-test/suite/ndb/r/ndb_partition_error.result similarity index 100% rename from mysql-test/r/ndb_partition_error.result rename to mysql-test/suite/ndb/r/ndb_partition_error.result diff --git a/mysql-test/r/ndb_partition_error2.result b/mysql-test/suite/ndb/r/ndb_partition_error2.result similarity index 100% rename from mysql-test/r/ndb_partition_error2.result rename to mysql-test/suite/ndb/r/ndb_partition_error2.result diff --git a/mysql-test/r/ndb_partition_key.result b/mysql-test/suite/ndb/r/ndb_partition_key.result similarity index 100% rename from mysql-test/r/ndb_partition_key.result rename to mysql-test/suite/ndb/r/ndb_partition_key.result diff --git a/mysql-test/r/ndb_partition_list.result b/mysql-test/suite/ndb/r/ndb_partition_list.result similarity index 100% rename from mysql-test/r/ndb_partition_list.result rename to mysql-test/suite/ndb/r/ndb_partition_list.result diff --git a/mysql-test/r/ndb_partition_range.result b/mysql-test/suite/ndb/r/ndb_partition_range.result similarity index 100% rename from mysql-test/r/ndb_partition_range.result rename to mysql-test/suite/ndb/r/ndb_partition_range.result diff --git a/mysql-test/r/ndb_read_multi_range.result b/mysql-test/suite/ndb/r/ndb_read_multi_range.result similarity index 100% rename from mysql-test/r/ndb_read_multi_range.result rename to mysql-test/suite/ndb/r/ndb_read_multi_range.result diff --git a/mysql-test/r/ndb_rename.result b/mysql-test/suite/ndb/r/ndb_rename.result similarity index 100% rename from mysql-test/r/ndb_rename.result rename to mysql-test/suite/ndb/r/ndb_rename.result diff --git a/mysql-test/r/ndb_replace.result b/mysql-test/suite/ndb/r/ndb_replace.result similarity index 100% rename from mysql-test/r/ndb_replace.result rename to mysql-test/suite/ndb/r/ndb_replace.result diff --git a/mysql-test/r/ndb_restore.result b/mysql-test/suite/ndb/r/ndb_restore.result similarity index 100% rename from mysql-test/r/ndb_restore.result rename to mysql-test/suite/ndb/r/ndb_restore.result diff --git a/mysql-test/r/ndb_restore_compat.result b/mysql-test/suite/ndb/r/ndb_restore_compat.result similarity index 100% rename from mysql-test/r/ndb_restore_compat.result rename to mysql-test/suite/ndb/r/ndb_restore_compat.result diff --git a/mysql-test/r/ndb_restore_partition.result b/mysql-test/suite/ndb/r/ndb_restore_partition.result similarity index 100% rename from mysql-test/r/ndb_restore_partition.result rename to mysql-test/suite/ndb/r/ndb_restore_partition.result diff --git a/mysql-test/r/ndb_restore_print.result b/mysql-test/suite/ndb/r/ndb_restore_print.result similarity index 100% rename from mysql-test/r/ndb_restore_print.result rename to mysql-test/suite/ndb/r/ndb_restore_print.result diff --git a/mysql-test/r/ndb_row_format.result b/mysql-test/suite/ndb/r/ndb_row_format.result similarity index 100% rename from mysql-test/r/ndb_row_format.result rename to mysql-test/suite/ndb/r/ndb_row_format.result diff --git a/mysql-test/r/ndb_single_user.result b/mysql-test/suite/ndb/r/ndb_single_user.result similarity index 100% rename from mysql-test/r/ndb_single_user.result rename to mysql-test/suite/ndb/r/ndb_single_user.result diff --git a/mysql-test/r/ndb_sp.result b/mysql-test/suite/ndb/r/ndb_sp.result similarity index 100% rename from mysql-test/r/ndb_sp.result rename to mysql-test/suite/ndb/r/ndb_sp.result diff --git a/mysql-test/r/ndb_subquery.result b/mysql-test/suite/ndb/r/ndb_subquery.result similarity index 100% rename from mysql-test/r/ndb_subquery.result rename to mysql-test/suite/ndb/r/ndb_subquery.result diff --git a/mysql-test/r/ndb_temporary.result b/mysql-test/suite/ndb/r/ndb_temporary.result similarity index 100% rename from mysql-test/r/ndb_temporary.result rename to mysql-test/suite/ndb/r/ndb_temporary.result diff --git a/mysql-test/r/ndb_transaction.result b/mysql-test/suite/ndb/r/ndb_transaction.result similarity index 100% rename from mysql-test/r/ndb_transaction.result rename to mysql-test/suite/ndb/r/ndb_transaction.result diff --git a/mysql-test/r/ndb_trigger.result b/mysql-test/suite/ndb/r/ndb_trigger.result similarity index 100% rename from mysql-test/r/ndb_trigger.result rename to mysql-test/suite/ndb/r/ndb_trigger.result diff --git a/mysql-test/r/ndb_truncate.result b/mysql-test/suite/ndb/r/ndb_truncate.result similarity index 100% rename from mysql-test/r/ndb_truncate.result rename to mysql-test/suite/ndb/r/ndb_truncate.result diff --git a/mysql-test/r/ndb_types.result b/mysql-test/suite/ndb/r/ndb_types.result similarity index 100% rename from mysql-test/r/ndb_types.result rename to mysql-test/suite/ndb/r/ndb_types.result diff --git a/mysql-test/r/ndb_update.result b/mysql-test/suite/ndb/r/ndb_update.result similarity index 100% rename from mysql-test/r/ndb_update.result rename to mysql-test/suite/ndb/r/ndb_update.result diff --git a/mysql-test/r/ndb_view.result b/mysql-test/suite/ndb/r/ndb_view.result similarity index 100% rename from mysql-test/r/ndb_view.result rename to mysql-test/suite/ndb/r/ndb_view.result diff --git a/mysql-test/r/ndbapi.result b/mysql-test/suite/ndb/r/ndbapi.result similarity index 100% rename from mysql-test/r/ndbapi.result rename to mysql-test/suite/ndb/r/ndbapi.result diff --git a/mysql-test/r/partition_03ndb.result b/mysql-test/suite/ndb/r/partition_03ndb.result similarity index 100% rename from mysql-test/r/partition_03ndb.result rename to mysql-test/suite/ndb/r/partition_03ndb.result diff --git a/mysql-test/r/ps_7ndb.result b/mysql-test/suite/ndb/r/ps_7ndb.result similarity index 100% rename from mysql-test/r/ps_7ndb.result rename to mysql-test/suite/ndb/r/ps_7ndb.result diff --git a/mysql-test/r/strict_autoinc_5ndb.result b/mysql-test/suite/ndb/r/strict_autoinc_5ndb.result similarity index 100% rename from mysql-test/r/strict_autoinc_5ndb.result rename to mysql-test/suite/ndb/r/strict_autoinc_5ndb.result diff --git a/mysql-test/suite/ndb/t/disabled.def b/mysql-test/suite/ndb/t/disabled.def new file mode 100644 index 00000000000..ec1dc26039f --- /dev/null +++ b/mysql-test/suite/ndb/t/disabled.def @@ -0,0 +1,23 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# : BUG# +# +# Do not use any TAB characters for whitespace. +# +############################################################################## +ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog +ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog +ndb_load : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed + +partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table + +ndb_partition_error2 : HF is not sure if the test can work as internded on all the platforms + +# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open +#ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events +#ndb_binlog_discover : bug#21806 2006-08-24 +#ndb_autodiscover3 : bug#21806 diff --git a/mysql-test/t/loaddata_autocom_ndb.test b/mysql-test/suite/ndb/t/loaddata_autocom_ndb.test similarity index 100% rename from mysql-test/t/loaddata_autocom_ndb.test rename to mysql-test/suite/ndb/t/loaddata_autocom_ndb.test diff --git a/mysql-test/t/ndb_alter_table.test b/mysql-test/suite/ndb/t/ndb_alter_table.test similarity index 100% rename from mysql-test/t/ndb_alter_table.test rename to mysql-test/suite/ndb/t/ndb_alter_table.test diff --git a/mysql-test/t/ndb_alter_table2.test b/mysql-test/suite/ndb/t/ndb_alter_table2.test similarity index 100% rename from mysql-test/t/ndb_alter_table2.test rename to mysql-test/suite/ndb/t/ndb_alter_table2.test diff --git a/mysql-test/t/ndb_alter_table3.test b/mysql-test/suite/ndb/t/ndb_alter_table3.test similarity index 100% rename from mysql-test/t/ndb_alter_table3.test rename to mysql-test/suite/ndb/t/ndb_alter_table3.test diff --git a/mysql-test/t/ndb_autodiscover.test b/mysql-test/suite/ndb/t/ndb_autodiscover.test similarity index 100% rename from mysql-test/t/ndb_autodiscover.test rename to mysql-test/suite/ndb/t/ndb_autodiscover.test diff --git a/mysql-test/t/ndb_autodiscover2-master.opt b/mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt similarity index 100% rename from mysql-test/t/ndb_autodiscover2-master.opt rename to mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt diff --git a/mysql-test/t/ndb_autodiscover2.test b/mysql-test/suite/ndb/t/ndb_autodiscover2.test similarity index 100% rename from mysql-test/t/ndb_autodiscover2.test rename to mysql-test/suite/ndb/t/ndb_autodiscover2.test diff --git a/mysql-test/t/ndb_autodiscover3.test b/mysql-test/suite/ndb/t/ndb_autodiscover3.test similarity index 100% rename from mysql-test/t/ndb_autodiscover3.test rename to mysql-test/suite/ndb/t/ndb_autodiscover3.test diff --git a/mysql-test/t/ndb_backup_print.test b/mysql-test/suite/ndb/t/ndb_backup_print.test similarity index 100% rename from mysql-test/t/ndb_backup_print.test rename to mysql-test/suite/ndb/t/ndb_backup_print.test diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/suite/ndb/t/ndb_basic.test similarity index 100% rename from mysql-test/t/ndb_basic.test rename to mysql-test/suite/ndb/t/ndb_basic.test diff --git a/mysql-test/t/ndb_binlog_basic.test b/mysql-test/suite/ndb/t/ndb_binlog_basic.test similarity index 100% rename from mysql-test/t/ndb_binlog_basic.test rename to mysql-test/suite/ndb/t/ndb_binlog_basic.test diff --git a/mysql-test/t/ndb_binlog_basic2.test b/mysql-test/suite/ndb/t/ndb_binlog_basic2.test similarity index 100% rename from mysql-test/t/ndb_binlog_basic2.test rename to mysql-test/suite/ndb/t/ndb_binlog_basic2.test diff --git a/mysql-test/t/ndb_binlog_ddl_multi.test b/mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test similarity index 100% rename from mysql-test/t/ndb_binlog_ddl_multi.test rename to mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test diff --git a/mysql-test/t/ndb_binlog_discover.test b/mysql-test/suite/ndb/t/ndb_binlog_discover.test similarity index 100% rename from mysql-test/t/ndb_binlog_discover.test rename to mysql-test/suite/ndb/t/ndb_binlog_discover.test diff --git a/mysql-test/t/ndb_binlog_ignore_db-master.opt b/mysql-test/suite/ndb/t/ndb_binlog_ignore_db-master.opt similarity index 100% rename from mysql-test/t/ndb_binlog_ignore_db-master.opt rename to mysql-test/suite/ndb/t/ndb_binlog_ignore_db-master.opt diff --git a/mysql-test/t/ndb_binlog_ignore_db.test b/mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test similarity index 100% rename from mysql-test/t/ndb_binlog_ignore_db.test rename to mysql-test/suite/ndb/t/ndb_binlog_ignore_db.test diff --git a/mysql-test/t/ndb_binlog_log_bin.test b/mysql-test/suite/ndb/t/ndb_binlog_log_bin.test similarity index 100% rename from mysql-test/t/ndb_binlog_log_bin.test rename to mysql-test/suite/ndb/t/ndb_binlog_log_bin.test diff --git a/mysql-test/t/ndb_binlog_multi.test b/mysql-test/suite/ndb/t/ndb_binlog_multi.test similarity index 100% rename from mysql-test/t/ndb_binlog_multi.test rename to mysql-test/suite/ndb/t/ndb_binlog_multi.test diff --git a/mysql-test/t/ndb_bitfield.test b/mysql-test/suite/ndb/t/ndb_bitfield.test similarity index 100% rename from mysql-test/t/ndb_bitfield.test rename to mysql-test/suite/ndb/t/ndb_bitfield.test diff --git a/mysql-test/t/ndb_blob.test b/mysql-test/suite/ndb/t/ndb_blob.test similarity index 100% rename from mysql-test/t/ndb_blob.test rename to mysql-test/suite/ndb/t/ndb_blob.test diff --git a/mysql-test/t/ndb_blob_partition.test b/mysql-test/suite/ndb/t/ndb_blob_partition.test similarity index 100% rename from mysql-test/t/ndb_blob_partition.test rename to mysql-test/suite/ndb/t/ndb_blob_partition.test diff --git a/mysql-test/t/ndb_cache.test b/mysql-test/suite/ndb/t/ndb_cache.test similarity index 100% rename from mysql-test/t/ndb_cache.test rename to mysql-test/suite/ndb/t/ndb_cache.test diff --git a/mysql-test/t/ndb_cache2.test b/mysql-test/suite/ndb/t/ndb_cache2.test similarity index 100% rename from mysql-test/t/ndb_cache2.test rename to mysql-test/suite/ndb/t/ndb_cache2.test diff --git a/mysql-test/t/ndb_cache_multi.test b/mysql-test/suite/ndb/t/ndb_cache_multi.test similarity index 100% rename from mysql-test/t/ndb_cache_multi.test rename to mysql-test/suite/ndb/t/ndb_cache_multi.test diff --git a/mysql-test/t/ndb_cache_multi2.test b/mysql-test/suite/ndb/t/ndb_cache_multi2.test similarity index 100% rename from mysql-test/t/ndb_cache_multi2.test rename to mysql-test/suite/ndb/t/ndb_cache_multi2.test diff --git a/mysql-test/t/ndb_charset.test b/mysql-test/suite/ndb/t/ndb_charset.test similarity index 100% rename from mysql-test/t/ndb_charset.test rename to mysql-test/suite/ndb/t/ndb_charset.test diff --git a/mysql-test/t/ndb_condition_pushdown.test b/mysql-test/suite/ndb/t/ndb_condition_pushdown.test similarity index 100% rename from mysql-test/t/ndb_condition_pushdown.test rename to mysql-test/suite/ndb/t/ndb_condition_pushdown.test diff --git a/mysql-test/t/ndb_config.test b/mysql-test/suite/ndb/t/ndb_config.test similarity index 100% rename from mysql-test/t/ndb_config.test rename to mysql-test/suite/ndb/t/ndb_config.test diff --git a/mysql-test/t/ndb_config2.test b/mysql-test/suite/ndb/t/ndb_config2.test similarity index 100% rename from mysql-test/t/ndb_config2.test rename to mysql-test/suite/ndb/t/ndb_config2.test diff --git a/mysql-test/t/ndb_cursor.test b/mysql-test/suite/ndb/t/ndb_cursor.test similarity index 100% rename from mysql-test/t/ndb_cursor.test rename to mysql-test/suite/ndb/t/ndb_cursor.test diff --git a/mysql-test/t/ndb_database.test b/mysql-test/suite/ndb/t/ndb_database.test similarity index 100% rename from mysql-test/t/ndb_database.test rename to mysql-test/suite/ndb/t/ndb_database.test diff --git a/mysql-test/t/ndb_dd_alter.test b/mysql-test/suite/ndb/t/ndb_dd_alter.test similarity index 100% rename from mysql-test/t/ndb_dd_alter.test rename to mysql-test/suite/ndb/t/ndb_dd_alter.test diff --git a/mysql-test/t/ndb_dd_backuprestore.test b/mysql-test/suite/ndb/t/ndb_dd_backuprestore.test similarity index 100% rename from mysql-test/t/ndb_dd_backuprestore.test rename to mysql-test/suite/ndb/t/ndb_dd_backuprestore.test diff --git a/mysql-test/t/ndb_dd_basic.test b/mysql-test/suite/ndb/t/ndb_dd_basic.test similarity index 100% rename from mysql-test/t/ndb_dd_basic.test rename to mysql-test/suite/ndb/t/ndb_dd_basic.test diff --git a/mysql-test/t/ndb_dd_ddl.test b/mysql-test/suite/ndb/t/ndb_dd_ddl.test similarity index 100% rename from mysql-test/t/ndb_dd_ddl.test rename to mysql-test/suite/ndb/t/ndb_dd_ddl.test diff --git a/mysql-test/t/ndb_dd_disk2memory.test b/mysql-test/suite/ndb/t/ndb_dd_disk2memory.test similarity index 100% rename from mysql-test/t/ndb_dd_disk2memory.test rename to mysql-test/suite/ndb/t/ndb_dd_disk2memory.test diff --git a/mysql-test/t/ndb_dd_dump.test b/mysql-test/suite/ndb/t/ndb_dd_dump.test similarity index 100% rename from mysql-test/t/ndb_dd_dump.test rename to mysql-test/suite/ndb/t/ndb_dd_dump.test diff --git a/mysql-test/t/ndb_dd_sql_features.test b/mysql-test/suite/ndb/t/ndb_dd_sql_features.test similarity index 100% rename from mysql-test/t/ndb_dd_sql_features.test rename to mysql-test/suite/ndb/t/ndb_dd_sql_features.test diff --git a/mysql-test/t/ndb_gis.test b/mysql-test/suite/ndb/t/ndb_gis.test similarity index 100% rename from mysql-test/t/ndb_gis.test rename to mysql-test/suite/ndb/t/ndb_gis.test diff --git a/mysql-test/t/ndb_grant.later b/mysql-test/suite/ndb/t/ndb_grant.later similarity index 100% rename from mysql-test/t/ndb_grant.later rename to mysql-test/suite/ndb/t/ndb_grant.later diff --git a/mysql-test/t/ndb_index.test b/mysql-test/suite/ndb/t/ndb_index.test similarity index 100% rename from mysql-test/t/ndb_index.test rename to mysql-test/suite/ndb/t/ndb_index.test diff --git a/mysql-test/t/ndb_index_ordered.test b/mysql-test/suite/ndb/t/ndb_index_ordered.test similarity index 100% rename from mysql-test/t/ndb_index_ordered.test rename to mysql-test/suite/ndb/t/ndb_index_ordered.test diff --git a/mysql-test/t/ndb_index_unique.test b/mysql-test/suite/ndb/t/ndb_index_unique.test similarity index 100% rename from mysql-test/t/ndb_index_unique.test rename to mysql-test/suite/ndb/t/ndb_index_unique.test diff --git a/mysql-test/t/ndb_insert.test b/mysql-test/suite/ndb/t/ndb_insert.test similarity index 100% rename from mysql-test/t/ndb_insert.test rename to mysql-test/suite/ndb/t/ndb_insert.test diff --git a/mysql-test/t/ndb_limit.test b/mysql-test/suite/ndb/t/ndb_limit.test similarity index 100% rename from mysql-test/t/ndb_limit.test rename to mysql-test/suite/ndb/t/ndb_limit.test diff --git a/mysql-test/t/ndb_load.test b/mysql-test/suite/ndb/t/ndb_load.test similarity index 100% rename from mysql-test/t/ndb_load.test rename to mysql-test/suite/ndb/t/ndb_load.test diff --git a/mysql-test/t/ndb_loaddatalocal.test b/mysql-test/suite/ndb/t/ndb_loaddatalocal.test similarity index 100% rename from mysql-test/t/ndb_loaddatalocal.test rename to mysql-test/suite/ndb/t/ndb_loaddatalocal.test diff --git a/mysql-test/t/ndb_lock.test b/mysql-test/suite/ndb/t/ndb_lock.test similarity index 100% rename from mysql-test/t/ndb_lock.test rename to mysql-test/suite/ndb/t/ndb_lock.test diff --git a/mysql-test/t/ndb_minmax.test b/mysql-test/suite/ndb/t/ndb_minmax.test similarity index 100% rename from mysql-test/t/ndb_minmax.test rename to mysql-test/suite/ndb/t/ndb_minmax.test diff --git a/mysql-test/t/ndb_multi.test b/mysql-test/suite/ndb/t/ndb_multi.test similarity index 100% rename from mysql-test/t/ndb_multi.test rename to mysql-test/suite/ndb/t/ndb_multi.test diff --git a/mysql-test/t/ndb_multi_row.test b/mysql-test/suite/ndb/t/ndb_multi_row.test similarity index 100% rename from mysql-test/t/ndb_multi_row.test rename to mysql-test/suite/ndb/t/ndb_multi_row.test diff --git a/mysql-test/t/ndb_partition_error.test b/mysql-test/suite/ndb/t/ndb_partition_error.test similarity index 100% rename from mysql-test/t/ndb_partition_error.test rename to mysql-test/suite/ndb/t/ndb_partition_error.test diff --git a/mysql-test/t/ndb_partition_error2-master.opt b/mysql-test/suite/ndb/t/ndb_partition_error2-master.opt similarity index 100% rename from mysql-test/t/ndb_partition_error2-master.opt rename to mysql-test/suite/ndb/t/ndb_partition_error2-master.opt diff --git a/mysql-test/t/ndb_partition_error2.test b/mysql-test/suite/ndb/t/ndb_partition_error2.test similarity index 100% rename from mysql-test/t/ndb_partition_error2.test rename to mysql-test/suite/ndb/t/ndb_partition_error2.test diff --git a/mysql-test/t/ndb_partition_key.test b/mysql-test/suite/ndb/t/ndb_partition_key.test similarity index 100% rename from mysql-test/t/ndb_partition_key.test rename to mysql-test/suite/ndb/t/ndb_partition_key.test diff --git a/mysql-test/t/ndb_partition_list.test b/mysql-test/suite/ndb/t/ndb_partition_list.test similarity index 100% rename from mysql-test/t/ndb_partition_list.test rename to mysql-test/suite/ndb/t/ndb_partition_list.test diff --git a/mysql-test/t/ndb_partition_range.test b/mysql-test/suite/ndb/t/ndb_partition_range.test similarity index 100% rename from mysql-test/t/ndb_partition_range.test rename to mysql-test/suite/ndb/t/ndb_partition_range.test diff --git a/mysql-test/t/ndb_read_multi_range.test b/mysql-test/suite/ndb/t/ndb_read_multi_range.test similarity index 100% rename from mysql-test/t/ndb_read_multi_range.test rename to mysql-test/suite/ndb/t/ndb_read_multi_range.test diff --git a/mysql-test/t/ndb_rename.test b/mysql-test/suite/ndb/t/ndb_rename.test similarity index 100% rename from mysql-test/t/ndb_rename.test rename to mysql-test/suite/ndb/t/ndb_rename.test diff --git a/mysql-test/t/ndb_replace.test b/mysql-test/suite/ndb/t/ndb_replace.test similarity index 100% rename from mysql-test/t/ndb_replace.test rename to mysql-test/suite/ndb/t/ndb_replace.test diff --git a/mysql-test/t/ndb_restore.test b/mysql-test/suite/ndb/t/ndb_restore.test similarity index 100% rename from mysql-test/t/ndb_restore.test rename to mysql-test/suite/ndb/t/ndb_restore.test diff --git a/mysql-test/t/ndb_restore_compat.test b/mysql-test/suite/ndb/t/ndb_restore_compat.test similarity index 100% rename from mysql-test/t/ndb_restore_compat.test rename to mysql-test/suite/ndb/t/ndb_restore_compat.test diff --git a/mysql-test/t/ndb_restore_partition-master.opt b/mysql-test/suite/ndb/t/ndb_restore_partition-master.opt similarity index 100% rename from mysql-test/t/ndb_restore_partition-master.opt rename to mysql-test/suite/ndb/t/ndb_restore_partition-master.opt diff --git a/mysql-test/t/ndb_restore_partition.test b/mysql-test/suite/ndb/t/ndb_restore_partition.test similarity index 100% rename from mysql-test/t/ndb_restore_partition.test rename to mysql-test/suite/ndb/t/ndb_restore_partition.test diff --git a/mysql-test/t/ndb_restore_print.test b/mysql-test/suite/ndb/t/ndb_restore_print.test similarity index 100% rename from mysql-test/t/ndb_restore_print.test rename to mysql-test/suite/ndb/t/ndb_restore_print.test diff --git a/mysql-test/t/ndb_row_format.test b/mysql-test/suite/ndb/t/ndb_row_format.test similarity index 100% rename from mysql-test/t/ndb_row_format.test rename to mysql-test/suite/ndb/t/ndb_row_format.test diff --git a/mysql-test/t/ndb_single_user.test b/mysql-test/suite/ndb/t/ndb_single_user.test similarity index 100% rename from mysql-test/t/ndb_single_user.test rename to mysql-test/suite/ndb/t/ndb_single_user.test diff --git a/mysql-test/t/ndb_sp.test b/mysql-test/suite/ndb/t/ndb_sp.test similarity index 100% rename from mysql-test/t/ndb_sp.test rename to mysql-test/suite/ndb/t/ndb_sp.test diff --git a/mysql-test/t/ndb_subquery.test b/mysql-test/suite/ndb/t/ndb_subquery.test similarity index 100% rename from mysql-test/t/ndb_subquery.test rename to mysql-test/suite/ndb/t/ndb_subquery.test diff --git a/mysql-test/t/ndb_temporary.test b/mysql-test/suite/ndb/t/ndb_temporary.test similarity index 100% rename from mysql-test/t/ndb_temporary.test rename to mysql-test/suite/ndb/t/ndb_temporary.test diff --git a/mysql-test/t/ndb_transaction.test b/mysql-test/suite/ndb/t/ndb_transaction.test similarity index 100% rename from mysql-test/t/ndb_transaction.test rename to mysql-test/suite/ndb/t/ndb_transaction.test diff --git a/mysql-test/t/ndb_trigger.test b/mysql-test/suite/ndb/t/ndb_trigger.test similarity index 100% rename from mysql-test/t/ndb_trigger.test rename to mysql-test/suite/ndb/t/ndb_trigger.test diff --git a/mysql-test/t/ndb_truncate.test b/mysql-test/suite/ndb/t/ndb_truncate.test similarity index 100% rename from mysql-test/t/ndb_truncate.test rename to mysql-test/suite/ndb/t/ndb_truncate.test diff --git a/mysql-test/t/ndb_types.test b/mysql-test/suite/ndb/t/ndb_types.test similarity index 100% rename from mysql-test/t/ndb_types.test rename to mysql-test/suite/ndb/t/ndb_types.test diff --git a/mysql-test/t/ndb_update.test b/mysql-test/suite/ndb/t/ndb_update.test similarity index 100% rename from mysql-test/t/ndb_update.test rename to mysql-test/suite/ndb/t/ndb_update.test diff --git a/mysql-test/t/ndb_view.test b/mysql-test/suite/ndb/t/ndb_view.test similarity index 100% rename from mysql-test/t/ndb_view.test rename to mysql-test/suite/ndb/t/ndb_view.test diff --git a/mysql-test/t/ndbapi.test b/mysql-test/suite/ndb/t/ndbapi.test similarity index 100% rename from mysql-test/t/ndbapi.test rename to mysql-test/suite/ndb/t/ndbapi.test diff --git a/mysql-test/t/partition_03ndb.test b/mysql-test/suite/ndb/t/partition_03ndb.test similarity index 100% rename from mysql-test/t/partition_03ndb.test rename to mysql-test/suite/ndb/t/partition_03ndb.test diff --git a/mysql-test/t/ps_7ndb.test b/mysql-test/suite/ndb/t/ps_7ndb.test similarity index 100% rename from mysql-test/t/ps_7ndb.test rename to mysql-test/suite/ndb/t/ps_7ndb.test diff --git a/mysql-test/t/strict_autoinc_5ndb.test b/mysql-test/suite/ndb/t/strict_autoinc_5ndb.test similarity index 100% rename from mysql-test/t/strict_autoinc_5ndb.test rename to mysql-test/suite/ndb/t/strict_autoinc_5ndb.test diff --git a/mysql-test/r/rpl000001.a.result b/mysql-test/suite/rpl/r/rpl000001.a.result similarity index 100% rename from mysql-test/r/rpl000001.a.result rename to mysql-test/suite/rpl/r/rpl000001.a.result diff --git a/mysql-test/r/rpl000001.b.result b/mysql-test/suite/rpl/r/rpl000001.b.result similarity index 100% rename from mysql-test/r/rpl000001.b.result rename to mysql-test/suite/rpl/r/rpl000001.b.result diff --git a/mysql-test/r/rpl000010.result b/mysql-test/suite/rpl/r/rpl000010.result similarity index 100% rename from mysql-test/r/rpl000010.result rename to mysql-test/suite/rpl/r/rpl000010.result diff --git a/mysql-test/r/rpl000011.result b/mysql-test/suite/rpl/r/rpl000011.result similarity index 100% rename from mysql-test/r/rpl000011.result rename to mysql-test/suite/rpl/r/rpl000011.result diff --git a/mysql-test/r/rpl000013.result b/mysql-test/suite/rpl/r/rpl000013.result similarity index 100% rename from mysql-test/r/rpl000013.result rename to mysql-test/suite/rpl/r/rpl000013.result diff --git a/mysql-test/r/rpl000017.result b/mysql-test/suite/rpl/r/rpl000017.result similarity index 100% rename from mysql-test/r/rpl000017.result rename to mysql-test/suite/rpl/r/rpl000017.result diff --git a/mysql-test/r/rpl_000015.result b/mysql-test/suite/rpl/r/rpl_000015.result similarity index 100% rename from mysql-test/r/rpl_000015.result rename to mysql-test/suite/rpl/r/rpl_000015.result diff --git a/mysql-test/r/rpl_EE_err.result b/mysql-test/suite/rpl/r/rpl_EE_err.result similarity index 100% rename from mysql-test/r/rpl_EE_err.result rename to mysql-test/suite/rpl/r/rpl_EE_err.result diff --git a/mysql-test/r/rpl_LD_INFILE.result b/mysql-test/suite/rpl/r/rpl_LD_INFILE.result similarity index 100% rename from mysql-test/r/rpl_LD_INFILE.result rename to mysql-test/suite/rpl/r/rpl_LD_INFILE.result diff --git a/mysql-test/r/rpl_alter.result b/mysql-test/suite/rpl/r/rpl_alter.result similarity index 100% rename from mysql-test/r/rpl_alter.result rename to mysql-test/suite/rpl/r/rpl_alter.result diff --git a/mysql-test/r/rpl_alter_db.result b/mysql-test/suite/rpl/r/rpl_alter_db.result similarity index 100% rename from mysql-test/r/rpl_alter_db.result rename to mysql-test/suite/rpl/r/rpl_alter_db.result diff --git a/mysql-test/r/rpl_auto_increment.result b/mysql-test/suite/rpl/r/rpl_auto_increment.result similarity index 100% rename from mysql-test/r/rpl_auto_increment.result rename to mysql-test/suite/rpl/r/rpl_auto_increment.result diff --git a/mysql-test/r/rpl_auto_increment_11932.result b/mysql-test/suite/rpl/r/rpl_auto_increment_11932.result similarity index 100% rename from mysql-test/r/rpl_auto_increment_11932.result rename to mysql-test/suite/rpl/r/rpl_auto_increment_11932.result diff --git a/mysql-test/r/rpl_bit.result b/mysql-test/suite/rpl/r/rpl_bit.result similarity index 100% rename from mysql-test/r/rpl_bit.result rename to mysql-test/suite/rpl/r/rpl_bit.result diff --git a/mysql-test/r/rpl_bit_npk.result b/mysql-test/suite/rpl/r/rpl_bit_npk.result similarity index 100% rename from mysql-test/r/rpl_bit_npk.result rename to mysql-test/suite/rpl/r/rpl_bit_npk.result diff --git a/mysql-test/r/rpl_change_master.result b/mysql-test/suite/rpl/r/rpl_change_master.result similarity index 100% rename from mysql-test/r/rpl_change_master.result rename to mysql-test/suite/rpl/r/rpl_change_master.result diff --git a/mysql-test/r/rpl_charset_sjis.result b/mysql-test/suite/rpl/r/rpl_charset_sjis.result similarity index 100% rename from mysql-test/r/rpl_charset_sjis.result rename to mysql-test/suite/rpl/r/rpl_charset_sjis.result diff --git a/mysql-test/r/rpl_commit_after_flush.result b/mysql-test/suite/rpl/r/rpl_commit_after_flush.result similarity index 100% rename from mysql-test/r/rpl_commit_after_flush.result rename to mysql-test/suite/rpl/r/rpl_commit_after_flush.result diff --git a/mysql-test/r/rpl_create_database.result b/mysql-test/suite/rpl/r/rpl_create_database.result similarity index 100% rename from mysql-test/r/rpl_create_database.result rename to mysql-test/suite/rpl/r/rpl_create_database.result diff --git a/mysql-test/r/rpl_critical_errors.result b/mysql-test/suite/rpl/r/rpl_critical_errors.result similarity index 100% rename from mysql-test/r/rpl_critical_errors.result rename to mysql-test/suite/rpl/r/rpl_critical_errors.result diff --git a/mysql-test/r/rpl_critical_errors.result.txt b/mysql-test/suite/rpl/r/rpl_critical_errors.result.txt similarity index 100% rename from mysql-test/r/rpl_critical_errors.result.txt rename to mysql-test/suite/rpl/r/rpl_critical_errors.result.txt diff --git a/mysql-test/r/rpl_ddl.result b/mysql-test/suite/rpl/r/rpl_ddl.result similarity index 100% rename from mysql-test/r/rpl_ddl.result rename to mysql-test/suite/rpl/r/rpl_ddl.result diff --git a/mysql-test/r/rpl_deadlock_innodb.result b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result similarity index 100% rename from mysql-test/r/rpl_deadlock_innodb.result rename to mysql-test/suite/rpl/r/rpl_deadlock_innodb.result diff --git a/mysql-test/r/rpl_delete_no_where.result b/mysql-test/suite/rpl/r/rpl_delete_no_where.result similarity index 100% rename from mysql-test/r/rpl_delete_no_where.result rename to mysql-test/suite/rpl/r/rpl_delete_no_where.result diff --git a/mysql-test/r/rpl_do_grant.result b/mysql-test/suite/rpl/r/rpl_do_grant.result similarity index 100% rename from mysql-test/r/rpl_do_grant.result rename to mysql-test/suite/rpl/r/rpl_do_grant.result diff --git a/mysql-test/r/rpl_drop.result b/mysql-test/suite/rpl/r/rpl_drop.result similarity index 100% rename from mysql-test/r/rpl_drop.result rename to mysql-test/suite/rpl/r/rpl_drop.result diff --git a/mysql-test/r/rpl_drop_db.result b/mysql-test/suite/rpl/r/rpl_drop_db.result similarity index 100% rename from mysql-test/r/rpl_drop_db.result rename to mysql-test/suite/rpl/r/rpl_drop_db.result diff --git a/mysql-test/r/rpl_drop_temp.result b/mysql-test/suite/rpl/r/rpl_drop_temp.result similarity index 100% rename from mysql-test/r/rpl_drop_temp.result rename to mysql-test/suite/rpl/r/rpl_drop_temp.result diff --git a/mysql-test/r/rpl_dual_pos_advance.result b/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result similarity index 100% rename from mysql-test/r/rpl_dual_pos_advance.result rename to mysql-test/suite/rpl/r/rpl_dual_pos_advance.result diff --git a/mysql-test/r/rpl_empty_master_crash.result b/mysql-test/suite/rpl/r/rpl_empty_master_crash.result similarity index 100% rename from mysql-test/r/rpl_empty_master_crash.result rename to mysql-test/suite/rpl/r/rpl_empty_master_crash.result diff --git a/mysql-test/r/rpl_err_ignoredtable.result b/mysql-test/suite/rpl/r/rpl_err_ignoredtable.result similarity index 100% rename from mysql-test/r/rpl_err_ignoredtable.result rename to mysql-test/suite/rpl/r/rpl_err_ignoredtable.result diff --git a/mysql-test/r/rpl_events.result b/mysql-test/suite/rpl/r/rpl_events.result similarity index 100% rename from mysql-test/r/rpl_events.result rename to mysql-test/suite/rpl/r/rpl_events.result diff --git a/mysql-test/r/rpl_extraCol_innodb.result b/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result similarity index 100% rename from mysql-test/r/rpl_extraCol_innodb.result rename to mysql-test/suite/rpl/r/rpl_extraCol_innodb.result diff --git a/mysql-test/r/rpl_extraCol_myisam.result b/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result similarity index 100% rename from mysql-test/r/rpl_extraCol_myisam.result rename to mysql-test/suite/rpl/r/rpl_extraCol_myisam.result diff --git a/mysql-test/r/rpl_failed_optimize.result b/mysql-test/suite/rpl/r/rpl_failed_optimize.result similarity index 100% rename from mysql-test/r/rpl_failed_optimize.result rename to mysql-test/suite/rpl/r/rpl_failed_optimize.result diff --git a/mysql-test/r/rpl_flushlog_loop.result b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result similarity index 100% rename from mysql-test/r/rpl_flushlog_loop.result rename to mysql-test/suite/rpl/r/rpl_flushlog_loop.result diff --git a/mysql-test/r/rpl_foreign_key_innodb.result b/mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result similarity index 100% rename from mysql-test/r/rpl_foreign_key_innodb.result rename to mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result diff --git a/mysql-test/r/rpl_free_items.result b/mysql-test/suite/rpl/r/rpl_free_items.result similarity index 100% rename from mysql-test/r/rpl_free_items.result rename to mysql-test/suite/rpl/r/rpl_free_items.result diff --git a/mysql-test/r/rpl_get_lock.result b/mysql-test/suite/rpl/r/rpl_get_lock.result similarity index 100% rename from mysql-test/r/rpl_get_lock.result rename to mysql-test/suite/rpl/r/rpl_get_lock.result diff --git a/mysql-test/r/rpl_ignore_grant.result b/mysql-test/suite/rpl/r/rpl_ignore_grant.result similarity index 100% rename from mysql-test/r/rpl_ignore_grant.result rename to mysql-test/suite/rpl/r/rpl_ignore_grant.result diff --git a/mysql-test/r/rpl_ignore_revoke.result b/mysql-test/suite/rpl/r/rpl_ignore_revoke.result similarity index 100% rename from mysql-test/r/rpl_ignore_revoke.result rename to mysql-test/suite/rpl/r/rpl_ignore_revoke.result diff --git a/mysql-test/r/rpl_ignore_table.result b/mysql-test/suite/rpl/r/rpl_ignore_table.result similarity index 100% rename from mysql-test/r/rpl_ignore_table.result rename to mysql-test/suite/rpl/r/rpl_ignore_table.result diff --git a/mysql-test/r/rpl_ignore_table_update.result b/mysql-test/suite/rpl/r/rpl_ignore_table_update.result similarity index 100% rename from mysql-test/r/rpl_ignore_table_update.result rename to mysql-test/suite/rpl/r/rpl_ignore_table_update.result diff --git a/mysql-test/r/rpl_incident.result b/mysql-test/suite/rpl/r/rpl_incident.result similarity index 100% rename from mysql-test/r/rpl_incident.result rename to mysql-test/suite/rpl/r/rpl_incident.result diff --git a/mysql-test/r/rpl_init_slave.result b/mysql-test/suite/rpl/r/rpl_init_slave.result similarity index 100% rename from mysql-test/r/rpl_init_slave.result rename to mysql-test/suite/rpl/r/rpl_init_slave.result diff --git a/mysql-test/r/rpl_innodb.result b/mysql-test/suite/rpl/r/rpl_innodb.result similarity index 100% rename from mysql-test/r/rpl_innodb.result rename to mysql-test/suite/rpl/r/rpl_innodb.result diff --git a/mysql-test/r/rpl_insert.result b/mysql-test/suite/rpl/r/rpl_insert.result similarity index 100% rename from mysql-test/r/rpl_insert.result rename to mysql-test/suite/rpl/r/rpl_insert.result diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/suite/rpl/r/rpl_insert_id.result similarity index 100% rename from mysql-test/r/rpl_insert_id.result rename to mysql-test/suite/rpl/r/rpl_insert_id.result diff --git a/mysql-test/r/rpl_insert_id_pk.result b/mysql-test/suite/rpl/r/rpl_insert_id_pk.result similarity index 100% rename from mysql-test/r/rpl_insert_id_pk.result rename to mysql-test/suite/rpl/r/rpl_insert_id_pk.result diff --git a/mysql-test/r/rpl_insert_ignore.result b/mysql-test/suite/rpl/r/rpl_insert_ignore.result similarity index 100% rename from mysql-test/r/rpl_insert_ignore.result rename to mysql-test/suite/rpl/r/rpl_insert_ignore.result diff --git a/mysql-test/r/rpl_insert_select.result b/mysql-test/suite/rpl/r/rpl_insert_select.result similarity index 100% rename from mysql-test/r/rpl_insert_select.result rename to mysql-test/suite/rpl/r/rpl_insert_select.result diff --git a/mysql-test/r/rpl_known_bugs_detection.result b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result similarity index 100% rename from mysql-test/r/rpl_known_bugs_detection.result rename to mysql-test/suite/rpl/r/rpl_known_bugs_detection.result diff --git a/mysql-test/r/rpl_load_from_master.result b/mysql-test/suite/rpl/r/rpl_load_from_master.result similarity index 100% rename from mysql-test/r/rpl_load_from_master.result rename to mysql-test/suite/rpl/r/rpl_load_from_master.result diff --git a/mysql-test/r/rpl_load_table_from_master.result b/mysql-test/suite/rpl/r/rpl_load_table_from_master.result similarity index 100% rename from mysql-test/r/rpl_load_table_from_master.result rename to mysql-test/suite/rpl/r/rpl_load_table_from_master.result diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/suite/rpl/r/rpl_loaddata.result similarity index 100% rename from mysql-test/r/rpl_loaddata.result rename to mysql-test/suite/rpl/r/rpl_loaddata.result diff --git a/mysql-test/r/rpl_loaddata_charset.result b/mysql-test/suite/rpl/r/rpl_loaddata_charset.result similarity index 100% rename from mysql-test/r/rpl_loaddata_charset.result rename to mysql-test/suite/rpl/r/rpl_loaddata_charset.result diff --git a/mysql-test/r/rpl_loaddata_m.result b/mysql-test/suite/rpl/r/rpl_loaddata_m.result similarity index 100% rename from mysql-test/r/rpl_loaddata_m.result rename to mysql-test/suite/rpl/r/rpl_loaddata_m.result diff --git a/mysql-test/r/rpl_loaddata_s.result b/mysql-test/suite/rpl/r/rpl_loaddata_s.result similarity index 100% rename from mysql-test/r/rpl_loaddata_s.result rename to mysql-test/suite/rpl/r/rpl_loaddata_s.result diff --git a/mysql-test/r/rpl_loaddata_simple.result b/mysql-test/suite/rpl/r/rpl_loaddata_simple.result similarity index 100% rename from mysql-test/r/rpl_loaddata_simple.result rename to mysql-test/suite/rpl/r/rpl_loaddata_simple.result diff --git a/mysql-test/r/rpl_loaddatalocal.result b/mysql-test/suite/rpl/r/rpl_loaddatalocal.result similarity index 100% rename from mysql-test/r/rpl_loaddatalocal.result rename to mysql-test/suite/rpl/r/rpl_loaddatalocal.result diff --git a/mysql-test/r/rpl_loadfile.result b/mysql-test/suite/rpl/r/rpl_loadfile.result similarity index 100% rename from mysql-test/r/rpl_loadfile.result rename to mysql-test/suite/rpl/r/rpl_loadfile.result diff --git a/mysql-test/r/rpl_locale.result b/mysql-test/suite/rpl/r/rpl_locale.result similarity index 100% rename from mysql-test/r/rpl_locale.result rename to mysql-test/suite/rpl/r/rpl_locale.result diff --git a/mysql-test/r/rpl_log_pos.result b/mysql-test/suite/rpl/r/rpl_log_pos.result similarity index 100% rename from mysql-test/r/rpl_log_pos.result rename to mysql-test/suite/rpl/r/rpl_log_pos.result diff --git a/mysql-test/r/rpl_many_optimize.result b/mysql-test/suite/rpl/r/rpl_many_optimize.result similarity index 100% rename from mysql-test/r/rpl_many_optimize.result rename to mysql-test/suite/rpl/r/rpl_many_optimize.result diff --git a/mysql-test/r/rpl_master_pos_wait.result b/mysql-test/suite/rpl/r/rpl_master_pos_wait.result similarity index 100% rename from mysql-test/r/rpl_master_pos_wait.result rename to mysql-test/suite/rpl/r/rpl_master_pos_wait.result diff --git a/mysql-test/r/rpl_misc_functions.result b/mysql-test/suite/rpl/r/rpl_misc_functions.result similarity index 100% rename from mysql-test/r/rpl_misc_functions.result rename to mysql-test/suite/rpl/r/rpl_misc_functions.result diff --git a/mysql-test/r/rpl_mixed_ddl_dml.result b/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result similarity index 100% rename from mysql-test/r/rpl_mixed_ddl_dml.result rename to mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result diff --git a/mysql-test/r/rpl_multi_delete.result b/mysql-test/suite/rpl/r/rpl_multi_delete.result similarity index 100% rename from mysql-test/r/rpl_multi_delete.result rename to mysql-test/suite/rpl/r/rpl_multi_delete.result diff --git a/mysql-test/r/rpl_multi_delete2.result b/mysql-test/suite/rpl/r/rpl_multi_delete2.result similarity index 100% rename from mysql-test/r/rpl_multi_delete2.result rename to mysql-test/suite/rpl/r/rpl_multi_delete2.result diff --git a/mysql-test/r/rpl_multi_engine.result b/mysql-test/suite/rpl/r/rpl_multi_engine.result similarity index 100% rename from mysql-test/r/rpl_multi_engine.result rename to mysql-test/suite/rpl/r/rpl_multi_engine.result diff --git a/mysql-test/r/rpl_multi_update.result b/mysql-test/suite/rpl/r/rpl_multi_update.result similarity index 100% rename from mysql-test/r/rpl_multi_update.result rename to mysql-test/suite/rpl/r/rpl_multi_update.result diff --git a/mysql-test/r/rpl_multi_update2.result b/mysql-test/suite/rpl/r/rpl_multi_update2.result similarity index 100% rename from mysql-test/r/rpl_multi_update2.result rename to mysql-test/suite/rpl/r/rpl_multi_update2.result diff --git a/mysql-test/r/rpl_multi_update3.result b/mysql-test/suite/rpl/r/rpl_multi_update3.result similarity index 100% rename from mysql-test/r/rpl_multi_update3.result rename to mysql-test/suite/rpl/r/rpl_multi_update3.result diff --git a/mysql-test/r/rpl_multi_update4.result b/mysql-test/suite/rpl/r/rpl_multi_update4.result similarity index 100% rename from mysql-test/r/rpl_multi_update4.result rename to mysql-test/suite/rpl/r/rpl_multi_update4.result diff --git a/mysql-test/r/rpl_optimize.result b/mysql-test/suite/rpl/r/rpl_optimize.result similarity index 100% rename from mysql-test/r/rpl_optimize.result rename to mysql-test/suite/rpl/r/rpl_optimize.result diff --git a/mysql-test/r/rpl_packet.result b/mysql-test/suite/rpl/r/rpl_packet.result similarity index 100% rename from mysql-test/r/rpl_packet.result rename to mysql-test/suite/rpl/r/rpl_packet.result diff --git a/mysql-test/r/rpl_ps.result b/mysql-test/suite/rpl/r/rpl_ps.result similarity index 100% rename from mysql-test/r/rpl_ps.result rename to mysql-test/suite/rpl/r/rpl_ps.result diff --git a/mysql-test/r/rpl_rbr_to_sbr.result b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result similarity index 100% rename from mysql-test/r/rpl_rbr_to_sbr.result rename to mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result diff --git a/mysql-test/r/rpl_read_only.result b/mysql-test/suite/rpl/r/rpl_read_only.result similarity index 100% rename from mysql-test/r/rpl_read_only.result rename to mysql-test/suite/rpl/r/rpl_read_only.result diff --git a/mysql-test/r/rpl_redirect.result b/mysql-test/suite/rpl/r/rpl_redirect.result similarity index 100% rename from mysql-test/r/rpl_redirect.result rename to mysql-test/suite/rpl/r/rpl_redirect.result diff --git a/mysql-test/r/rpl_relay_space_innodb.result b/mysql-test/suite/rpl/r/rpl_relay_space_innodb.result similarity index 100% rename from mysql-test/r/rpl_relay_space_innodb.result rename to mysql-test/suite/rpl/r/rpl_relay_space_innodb.result diff --git a/mysql-test/r/rpl_relay_space_myisam.result b/mysql-test/suite/rpl/r/rpl_relay_space_myisam.result similarity index 100% rename from mysql-test/r/rpl_relay_space_myisam.result rename to mysql-test/suite/rpl/r/rpl_relay_space_myisam.result diff --git a/mysql-test/r/rpl_relayrotate.result b/mysql-test/suite/rpl/r/rpl_relayrotate.result similarity index 100% rename from mysql-test/r/rpl_relayrotate.result rename to mysql-test/suite/rpl/r/rpl_relayrotate.result diff --git a/mysql-test/r/rpl_relayspace.result b/mysql-test/suite/rpl/r/rpl_relayspace.result similarity index 100% rename from mysql-test/r/rpl_relayspace.result rename to mysql-test/suite/rpl/r/rpl_relayspace.result diff --git a/mysql-test/r/rpl_replicate_do.result b/mysql-test/suite/rpl/r/rpl_replicate_do.result similarity index 100% rename from mysql-test/r/rpl_replicate_do.result rename to mysql-test/suite/rpl/r/rpl_replicate_do.result diff --git a/mysql-test/r/rpl_replicate_ignore_db.result b/mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result similarity index 100% rename from mysql-test/r/rpl_replicate_ignore_db.result rename to mysql-test/suite/rpl/r/rpl_replicate_ignore_db.result diff --git a/mysql-test/r/rpl_rewrt_db.result b/mysql-test/suite/rpl/r/rpl_rewrt_db.result similarity index 100% rename from mysql-test/r/rpl_rewrt_db.result rename to mysql-test/suite/rpl/r/rpl_rewrt_db.result diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/suite/rpl/r/rpl_rotate_logs.result similarity index 100% rename from mysql-test/r/rpl_rotate_logs.result rename to mysql-test/suite/rpl/r/rpl_rotate_logs.result diff --git a/mysql-test/r/rpl_row_001.result b/mysql-test/suite/rpl/r/rpl_row_001.result similarity index 100% rename from mysql-test/r/rpl_row_001.result rename to mysql-test/suite/rpl/r/rpl_row_001.result diff --git a/mysql-test/r/rpl_row_4_bytes.result b/mysql-test/suite/rpl/r/rpl_row_4_bytes.result similarity index 100% rename from mysql-test/r/rpl_row_4_bytes.result rename to mysql-test/suite/rpl/r/rpl_row_4_bytes.result diff --git a/mysql-test/r/rpl_row_NOW.result b/mysql-test/suite/rpl/r/rpl_row_NOW.result similarity index 100% rename from mysql-test/r/rpl_row_NOW.result rename to mysql-test/suite/rpl/r/rpl_row_NOW.result diff --git a/mysql-test/r/rpl_row_USER.result b/mysql-test/suite/rpl/r/rpl_row_USER.result similarity index 100% rename from mysql-test/r/rpl_row_USER.result rename to mysql-test/suite/rpl/r/rpl_row_USER.result diff --git a/mysql-test/r/rpl_row_UUID.result b/mysql-test/suite/rpl/r/rpl_row_UUID.result similarity index 100% rename from mysql-test/r/rpl_row_UUID.result rename to mysql-test/suite/rpl/r/rpl_row_UUID.result diff --git a/mysql-test/r/rpl_row_basic_11bugs-master.opt b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs-master.opt similarity index 100% rename from mysql-test/r/rpl_row_basic_11bugs-master.opt rename to mysql-test/suite/rpl/r/rpl_row_basic_11bugs-master.opt diff --git a/mysql-test/r/rpl_row_basic_11bugs-slave.opt b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs-slave.opt similarity index 100% rename from mysql-test/r/rpl_row_basic_11bugs-slave.opt rename to mysql-test/suite/rpl/r/rpl_row_basic_11bugs-slave.opt diff --git a/mysql-test/r/rpl_row_basic_11bugs.result b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result similarity index 100% rename from mysql-test/r/rpl_row_basic_11bugs.result rename to mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result diff --git a/mysql-test/r/rpl_row_basic_2myisam.result b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result similarity index 100% rename from mysql-test/r/rpl_row_basic_2myisam.result rename to mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result diff --git a/mysql-test/r/rpl_row_basic_3innodb.result b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result similarity index 100% rename from mysql-test/r/rpl_row_basic_3innodb.result rename to mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result diff --git a/mysql-test/r/rpl_row_basic_8partition.result b/mysql-test/suite/rpl/r/rpl_row_basic_8partition.result similarity index 100% rename from mysql-test/r/rpl_row_basic_8partition.result rename to mysql-test/suite/rpl/r/rpl_row_basic_8partition.result diff --git a/mysql-test/r/rpl_row_blob_innodb.result b/mysql-test/suite/rpl/r/rpl_row_blob_innodb.result similarity index 100% rename from mysql-test/r/rpl_row_blob_innodb.result rename to mysql-test/suite/rpl/r/rpl_row_blob_innodb.result diff --git a/mysql-test/r/rpl_row_blob_myisam.result b/mysql-test/suite/rpl/r/rpl_row_blob_myisam.result similarity index 100% rename from mysql-test/r/rpl_row_blob_myisam.result rename to mysql-test/suite/rpl/r/rpl_row_blob_myisam.result diff --git a/mysql-test/r/rpl_row_charset.result b/mysql-test/suite/rpl/r/rpl_row_charset.result similarity index 100% rename from mysql-test/r/rpl_row_charset.result rename to mysql-test/suite/rpl/r/rpl_row_charset.result diff --git a/mysql-test/r/rpl_row_create_table.result b/mysql-test/suite/rpl/r/rpl_row_create_table.result similarity index 100% rename from mysql-test/r/rpl_row_create_table.result rename to mysql-test/suite/rpl/r/rpl_row_create_table.result diff --git a/mysql-test/r/rpl_row_delayed_ins.result b/mysql-test/suite/rpl/r/rpl_row_delayed_ins.result similarity index 100% rename from mysql-test/r/rpl_row_delayed_ins.result rename to mysql-test/suite/rpl/r/rpl_row_delayed_ins.result diff --git a/mysql-test/r/rpl_row_drop.result b/mysql-test/suite/rpl/r/rpl_row_drop.result similarity index 100% rename from mysql-test/r/rpl_row_drop.result rename to mysql-test/suite/rpl/r/rpl_row_drop.result diff --git a/mysql-test/r/rpl_row_err_ignoredtable.result b/mysql-test/suite/rpl/r/rpl_row_err_ignoredtable.result similarity index 100% rename from mysql-test/r/rpl_row_err_ignoredtable.result rename to mysql-test/suite/rpl/r/rpl_row_err_ignoredtable.result diff --git a/mysql-test/r/rpl_row_flsh_tbls.result b/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result similarity index 100% rename from mysql-test/r/rpl_row_flsh_tbls.result rename to mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result diff --git a/mysql-test/r/rpl_row_func001.result b/mysql-test/suite/rpl/r/rpl_row_func001.result similarity index 100% rename from mysql-test/r/rpl_row_func001.result rename to mysql-test/suite/rpl/r/rpl_row_func001.result diff --git a/mysql-test/r/rpl_row_func002.result b/mysql-test/suite/rpl/r/rpl_row_func002.result similarity index 100% rename from mysql-test/r/rpl_row_func002.result rename to mysql-test/suite/rpl/r/rpl_row_func002.result diff --git a/mysql-test/r/rpl_row_func003.result b/mysql-test/suite/rpl/r/rpl_row_func003.result similarity index 100% rename from mysql-test/r/rpl_row_func003.result rename to mysql-test/suite/rpl/r/rpl_row_func003.result diff --git a/mysql-test/r/rpl_row_inexist_tbl.result b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result similarity index 100% rename from mysql-test/r/rpl_row_inexist_tbl.result rename to mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result diff --git a/mysql-test/r/rpl_row_insert_delayed.result b/mysql-test/suite/rpl/r/rpl_row_insert_delayed.result similarity index 100% rename from mysql-test/r/rpl_row_insert_delayed.result rename to mysql-test/suite/rpl/r/rpl_row_insert_delayed.result diff --git a/mysql-test/r/rpl_row_loaddata_m.result b/mysql-test/suite/rpl/r/rpl_row_loaddata_m.result similarity index 100% rename from mysql-test/r/rpl_row_loaddata_m.result rename to mysql-test/suite/rpl/r/rpl_row_loaddata_m.result diff --git a/mysql-test/r/rpl_row_log.result b/mysql-test/suite/rpl/r/rpl_row_log.result similarity index 100% rename from mysql-test/r/rpl_row_log.result rename to mysql-test/suite/rpl/r/rpl_row_log.result diff --git a/mysql-test/r/rpl_row_log_innodb.result b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result similarity index 100% rename from mysql-test/r/rpl_row_log_innodb.result rename to mysql-test/suite/rpl/r/rpl_row_log_innodb.result diff --git a/mysql-test/r/rpl_row_max_relay_size.result b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result similarity index 100% rename from mysql-test/r/rpl_row_max_relay_size.result rename to mysql-test/suite/rpl/r/rpl_row_max_relay_size.result diff --git a/mysql-test/r/rpl_row_multi_query.result b/mysql-test/suite/rpl/r/rpl_row_multi_query.result similarity index 100% rename from mysql-test/r/rpl_row_multi_query.result rename to mysql-test/suite/rpl/r/rpl_row_multi_query.result diff --git a/mysql-test/r/rpl_row_mysqlbinlog.result b/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result similarity index 100% rename from mysql-test/r/rpl_row_mysqlbinlog.result rename to mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result diff --git a/mysql-test/r/rpl_row_mystery22.result b/mysql-test/suite/rpl/r/rpl_row_mystery22.result similarity index 100% rename from mysql-test/r/rpl_row_mystery22.result rename to mysql-test/suite/rpl/r/rpl_row_mystery22.result diff --git a/mysql-test/r/rpl_row_reset_slave.result b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result similarity index 100% rename from mysql-test/r/rpl_row_reset_slave.result rename to mysql-test/suite/rpl/r/rpl_row_reset_slave.result diff --git a/mysql-test/r/rpl_row_sp001.result b/mysql-test/suite/rpl/r/rpl_row_sp001.result similarity index 100% rename from mysql-test/r/rpl_row_sp001.result rename to mysql-test/suite/rpl/r/rpl_row_sp001.result diff --git a/mysql-test/r/rpl_row_sp002_innodb.result b/mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result similarity index 100% rename from mysql-test/r/rpl_row_sp002_innodb.result rename to mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result diff --git a/mysql-test/r/rpl_row_sp003.result b/mysql-test/suite/rpl/r/rpl_row_sp003.result similarity index 100% rename from mysql-test/r/rpl_row_sp003.result rename to mysql-test/suite/rpl/r/rpl_row_sp003.result diff --git a/mysql-test/r/rpl_row_sp005.result b/mysql-test/suite/rpl/r/rpl_row_sp005.result similarity index 100% rename from mysql-test/r/rpl_row_sp005.result rename to mysql-test/suite/rpl/r/rpl_row_sp005.result diff --git a/mysql-test/r/rpl_row_sp006_InnoDB.result b/mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result similarity index 100% rename from mysql-test/r/rpl_row_sp006_InnoDB.result rename to mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result diff --git a/mysql-test/r/rpl_row_sp007_innodb.result b/mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result similarity index 100% rename from mysql-test/r/rpl_row_sp007_innodb.result rename to mysql-test/suite/rpl/r/rpl_row_sp007_innodb.result diff --git a/mysql-test/r/rpl_row_sp008.result b/mysql-test/suite/rpl/r/rpl_row_sp008.result similarity index 100% rename from mysql-test/r/rpl_row_sp008.result rename to mysql-test/suite/rpl/r/rpl_row_sp008.result diff --git a/mysql-test/r/rpl_row_sp009.result b/mysql-test/suite/rpl/r/rpl_row_sp009.result similarity index 100% rename from mysql-test/r/rpl_row_sp009.result rename to mysql-test/suite/rpl/r/rpl_row_sp009.result diff --git a/mysql-test/r/rpl_row_sp010.result b/mysql-test/suite/rpl/r/rpl_row_sp010.result similarity index 100% rename from mysql-test/r/rpl_row_sp010.result rename to mysql-test/suite/rpl/r/rpl_row_sp010.result diff --git a/mysql-test/r/rpl_row_sp011.result b/mysql-test/suite/rpl/r/rpl_row_sp011.result similarity index 100% rename from mysql-test/r/rpl_row_sp011.result rename to mysql-test/suite/rpl/r/rpl_row_sp011.result diff --git a/mysql-test/r/rpl_row_sp012.result b/mysql-test/suite/rpl/r/rpl_row_sp012.result similarity index 100% rename from mysql-test/r/rpl_row_sp012.result rename to mysql-test/suite/rpl/r/rpl_row_sp012.result diff --git a/mysql-test/r/rpl_row_stop_middle.result b/mysql-test/suite/rpl/r/rpl_row_stop_middle.result similarity index 100% rename from mysql-test/r/rpl_row_stop_middle.result rename to mysql-test/suite/rpl/r/rpl_row_stop_middle.result diff --git a/mysql-test/r/rpl_row_stop_middle_update.result b/mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result similarity index 100% rename from mysql-test/r/rpl_row_stop_middle_update.result rename to mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result diff --git a/mysql-test/r/rpl_row_tabledefs_2myisam.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result similarity index 100% rename from mysql-test/r/rpl_row_tabledefs_2myisam.result rename to mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result diff --git a/mysql-test/r/rpl_row_tabledefs_3innodb.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result similarity index 100% rename from mysql-test/r/rpl_row_tabledefs_3innodb.result rename to mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result diff --git a/mysql-test/r/rpl_row_tabledefs_7ndb.result b/mysql-test/suite/rpl/r/rpl_row_tabledefs_7ndb.result similarity index 100% rename from mysql-test/r/rpl_row_tabledefs_7ndb.result rename to mysql-test/suite/rpl/r/rpl_row_tabledefs_7ndb.result diff --git a/mysql-test/r/rpl_row_trig001.result b/mysql-test/suite/rpl/r/rpl_row_trig001.result similarity index 100% rename from mysql-test/r/rpl_row_trig001.result rename to mysql-test/suite/rpl/r/rpl_row_trig001.result diff --git a/mysql-test/r/rpl_row_trig002.result b/mysql-test/suite/rpl/r/rpl_row_trig002.result similarity index 100% rename from mysql-test/r/rpl_row_trig002.result rename to mysql-test/suite/rpl/r/rpl_row_trig002.result diff --git a/mysql-test/r/rpl_row_trig003.result b/mysql-test/suite/rpl/r/rpl_row_trig003.result similarity index 100% rename from mysql-test/r/rpl_row_trig003.result rename to mysql-test/suite/rpl/r/rpl_row_trig003.result diff --git a/mysql-test/r/rpl_row_trig004.result b/mysql-test/suite/rpl/r/rpl_row_trig004.result similarity index 100% rename from mysql-test/r/rpl_row_trig004.result rename to mysql-test/suite/rpl/r/rpl_row_trig004.result diff --git a/mysql-test/r/rpl_row_until.result b/mysql-test/suite/rpl/r/rpl_row_until.result similarity index 100% rename from mysql-test/r/rpl_row_until.result rename to mysql-test/suite/rpl/r/rpl_row_until.result diff --git a/mysql-test/r/rpl_row_view01.result b/mysql-test/suite/rpl/r/rpl_row_view01.result similarity index 100% rename from mysql-test/r/rpl_row_view01.result rename to mysql-test/suite/rpl/r/rpl_row_view01.result diff --git a/mysql-test/r/rpl_server_id1.result b/mysql-test/suite/rpl/r/rpl_server_id1.result similarity index 100% rename from mysql-test/r/rpl_server_id1.result rename to mysql-test/suite/rpl/r/rpl_server_id1.result diff --git a/mysql-test/r/rpl_server_id2.result b/mysql-test/suite/rpl/r/rpl_server_id2.result similarity index 100% rename from mysql-test/r/rpl_server_id2.result rename to mysql-test/suite/rpl/r/rpl_server_id2.result diff --git a/mysql-test/r/rpl_session_var.result b/mysql-test/suite/rpl/r/rpl_session_var.result similarity index 100% rename from mysql-test/r/rpl_session_var.result rename to mysql-test/suite/rpl/r/rpl_session_var.result diff --git a/mysql-test/r/rpl_set_charset.result b/mysql-test/suite/rpl/r/rpl_set_charset.result similarity index 100% rename from mysql-test/r/rpl_set_charset.result rename to mysql-test/suite/rpl/r/rpl_set_charset.result diff --git a/mysql-test/r/rpl_sf.result b/mysql-test/suite/rpl/r/rpl_sf.result similarity index 100% rename from mysql-test/r/rpl_sf.result rename to mysql-test/suite/rpl/r/rpl_sf.result diff --git a/mysql-test/r/rpl_skip_error.result b/mysql-test/suite/rpl/r/rpl_skip_error.result similarity index 100% rename from mysql-test/r/rpl_skip_error.result rename to mysql-test/suite/rpl/r/rpl_skip_error.result diff --git a/mysql-test/r/rpl_slave_status.result b/mysql-test/suite/rpl/r/rpl_slave_status.result similarity index 100% rename from mysql-test/r/rpl_slave_status.result rename to mysql-test/suite/rpl/r/rpl_slave_status.result diff --git a/mysql-test/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result similarity index 100% rename from mysql-test/r/rpl_sp.result rename to mysql-test/suite/rpl/r/rpl_sp.result diff --git a/mysql-test/r/rpl_sp004.result b/mysql-test/suite/rpl/r/rpl_sp004.result similarity index 100% rename from mysql-test/r/rpl_sp004.result rename to mysql-test/suite/rpl/r/rpl_sp004.result diff --git a/mysql-test/r/rpl_sp_effects.result b/mysql-test/suite/rpl/r/rpl_sp_effects.result similarity index 100% rename from mysql-test/r/rpl_sp_effects.result rename to mysql-test/suite/rpl/r/rpl_sp_effects.result diff --git a/mysql-test/r/rpl_sporadic_master.result b/mysql-test/suite/rpl/r/rpl_sporadic_master.result similarity index 100% rename from mysql-test/r/rpl_sporadic_master.result rename to mysql-test/suite/rpl/r/rpl_sporadic_master.result diff --git a/mysql-test/r/rpl_ssl.result b/mysql-test/suite/rpl/r/rpl_ssl.result similarity index 100% rename from mysql-test/r/rpl_ssl.result rename to mysql-test/suite/rpl/r/rpl_ssl.result diff --git a/mysql-test/r/rpl_ssl1.result b/mysql-test/suite/rpl/r/rpl_ssl1.result similarity index 100% rename from mysql-test/r/rpl_ssl1.result rename to mysql-test/suite/rpl/r/rpl_ssl1.result diff --git a/mysql-test/r/rpl_start_stop_slave.result b/mysql-test/suite/rpl/r/rpl_start_stop_slave.result similarity index 100% rename from mysql-test/r/rpl_start_stop_slave.result rename to mysql-test/suite/rpl/r/rpl_start_stop_slave.result diff --git a/mysql-test/r/rpl_stm_000001.result b/mysql-test/suite/rpl/r/rpl_stm_000001.result similarity index 100% rename from mysql-test/r/rpl_stm_000001.result rename to mysql-test/suite/rpl/r/rpl_stm_000001.result diff --git a/mysql-test/r/rpl_stm_EE_err2.result b/mysql-test/suite/rpl/r/rpl_stm_EE_err2.result similarity index 100% rename from mysql-test/r/rpl_stm_EE_err2.result rename to mysql-test/suite/rpl/r/rpl_stm_EE_err2.result diff --git a/mysql-test/r/rpl_stm_charset.result b/mysql-test/suite/rpl/r/rpl_stm_charset.result similarity index 100% rename from mysql-test/r/rpl_stm_charset.result rename to mysql-test/suite/rpl/r/rpl_stm_charset.result diff --git a/mysql-test/r/rpl_stm_flsh_tbls.result b/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result similarity index 100% rename from mysql-test/r/rpl_stm_flsh_tbls.result rename to mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result diff --git a/mysql-test/r/rpl_stm_insert_delayed.result b/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result similarity index 100% rename from mysql-test/r/rpl_stm_insert_delayed.result rename to mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result diff --git a/mysql-test/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result similarity index 100% rename from mysql-test/r/rpl_stm_log.result rename to mysql-test/suite/rpl/r/rpl_stm_log.result diff --git a/mysql-test/r/rpl_stm_max_relay_size.result b/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result similarity index 100% rename from mysql-test/r/rpl_stm_max_relay_size.result rename to mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result diff --git a/mysql-test/r/rpl_stm_multi_query.result b/mysql-test/suite/rpl/r/rpl_stm_multi_query.result similarity index 100% rename from mysql-test/r/rpl_stm_multi_query.result rename to mysql-test/suite/rpl/r/rpl_stm_multi_query.result diff --git a/mysql-test/r/rpl_stm_mystery22.result b/mysql-test/suite/rpl/r/rpl_stm_mystery22.result similarity index 100% rename from mysql-test/r/rpl_stm_mystery22.result rename to mysql-test/suite/rpl/r/rpl_stm_mystery22.result diff --git a/mysql-test/r/rpl_stm_no_op.result b/mysql-test/suite/rpl/r/rpl_stm_no_op.result similarity index 100% rename from mysql-test/r/rpl_stm_no_op.result rename to mysql-test/suite/rpl/r/rpl_stm_no_op.result diff --git a/mysql-test/r/rpl_stm_reset_slave.result b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result similarity index 100% rename from mysql-test/r/rpl_stm_reset_slave.result rename to mysql-test/suite/rpl/r/rpl_stm_reset_slave.result diff --git a/mysql-test/r/rpl_stm_until.result b/mysql-test/suite/rpl/r/rpl_stm_until.result similarity index 100% rename from mysql-test/r/rpl_stm_until.result rename to mysql-test/suite/rpl/r/rpl_stm_until.result diff --git a/mysql-test/r/rpl_switch_stm_row_mixed.result b/mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result similarity index 100% rename from mysql-test/r/rpl_switch_stm_row_mixed.result rename to mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result diff --git a/mysql-test/r/rpl_temp_table.result b/mysql-test/suite/rpl/r/rpl_temp_table.result similarity index 100% rename from mysql-test/r/rpl_temp_table.result rename to mysql-test/suite/rpl/r/rpl_temp_table.result diff --git a/mysql-test/r/rpl_temporary.result b/mysql-test/suite/rpl/r/rpl_temporary.result similarity index 100% rename from mysql-test/r/rpl_temporary.result rename to mysql-test/suite/rpl/r/rpl_temporary.result diff --git a/mysql-test/r/rpl_timezone.result b/mysql-test/suite/rpl/r/rpl_timezone.result similarity index 100% rename from mysql-test/r/rpl_timezone.result rename to mysql-test/suite/rpl/r/rpl_timezone.result diff --git a/mysql-test/r/rpl_trigger.result b/mysql-test/suite/rpl/r/rpl_trigger.result similarity index 100% rename from mysql-test/r/rpl_trigger.result rename to mysql-test/suite/rpl/r/rpl_trigger.result diff --git a/mysql-test/r/rpl_trunc_temp.result b/mysql-test/suite/rpl/r/rpl_trunc_temp.result similarity index 100% rename from mysql-test/r/rpl_trunc_temp.result rename to mysql-test/suite/rpl/r/rpl_trunc_temp.result diff --git a/mysql-test/r/rpl_truncate_2myisam.result b/mysql-test/suite/rpl/r/rpl_truncate_2myisam.result similarity index 100% rename from mysql-test/r/rpl_truncate_2myisam.result rename to mysql-test/suite/rpl/r/rpl_truncate_2myisam.result diff --git a/mysql-test/r/rpl_truncate_3innodb.result b/mysql-test/suite/rpl/r/rpl_truncate_3innodb.result similarity index 100% rename from mysql-test/r/rpl_truncate_3innodb.result rename to mysql-test/suite/rpl/r/rpl_truncate_3innodb.result diff --git a/mysql-test/r/rpl_truncate_7ndb_2.result b/mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result similarity index 100% rename from mysql-test/r/rpl_truncate_7ndb_2.result rename to mysql-test/suite/rpl/r/rpl_truncate_7ndb_2.result diff --git a/mysql-test/r/rpl_udf.result b/mysql-test/suite/rpl/r/rpl_udf.result similarity index 100% rename from mysql-test/r/rpl_udf.result rename to mysql-test/suite/rpl/r/rpl_udf.result diff --git a/mysql-test/r/rpl_user_variables.result b/mysql-test/suite/rpl/r/rpl_user_variables.result similarity index 100% rename from mysql-test/r/rpl_user_variables.result rename to mysql-test/suite/rpl/r/rpl_user_variables.result diff --git a/mysql-test/r/rpl_variables.result b/mysql-test/suite/rpl/r/rpl_variables.result similarity index 100% rename from mysql-test/r/rpl_variables.result rename to mysql-test/suite/rpl/r/rpl_variables.result diff --git a/mysql-test/r/rpl_view.result b/mysql-test/suite/rpl/r/rpl_view.result similarity index 100% rename from mysql-test/r/rpl_view.result rename to mysql-test/suite/rpl/r/rpl_view.result diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def new file mode 100644 index 00000000000..180a700acaf --- /dev/null +++ b/mysql-test/suite/rpl/t/disabled.def @@ -0,0 +1,15 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# : BUG# +# +# Do not use any TAB characters for whitespace. +# +############################################################################## + +rpl_ddl : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master +rpl_innodb_mixed_ddl : Bug #29363 rpl.rpl_innodb_mixed_* test failures +rpl_innodb_mixed_dml : Bug #29363 rpl.rpl_innodb_mixed_* test failures diff --git a/mysql-test/t/rpl000010-slave.opt b/mysql-test/suite/rpl/t/rpl000010-slave.opt similarity index 100% rename from mysql-test/t/rpl000010-slave.opt rename to mysql-test/suite/rpl/t/rpl000010-slave.opt diff --git a/mysql-test/t/rpl000010.test b/mysql-test/suite/rpl/t/rpl000010.test similarity index 100% rename from mysql-test/t/rpl000010.test rename to mysql-test/suite/rpl/t/rpl000010.test diff --git a/mysql-test/t/rpl000011.test b/mysql-test/suite/rpl/t/rpl000011.test similarity index 100% rename from mysql-test/t/rpl000011.test rename to mysql-test/suite/rpl/t/rpl000011.test diff --git a/mysql-test/t/rpl000013.test b/mysql-test/suite/rpl/t/rpl000013.test similarity index 100% rename from mysql-test/t/rpl000013.test rename to mysql-test/suite/rpl/t/rpl000013.test diff --git a/mysql-test/t/rpl000017-slave.opt b/mysql-test/suite/rpl/t/rpl000017-slave.opt similarity index 100% rename from mysql-test/t/rpl000017-slave.opt rename to mysql-test/suite/rpl/t/rpl000017-slave.opt diff --git a/mysql-test/t/rpl000017-slave.sh b/mysql-test/suite/rpl/t/rpl000017-slave.sh similarity index 100% rename from mysql-test/t/rpl000017-slave.sh rename to mysql-test/suite/rpl/t/rpl000017-slave.sh diff --git a/mysql-test/t/rpl000017.test b/mysql-test/suite/rpl/t/rpl000017.test similarity index 100% rename from mysql-test/t/rpl000017.test rename to mysql-test/suite/rpl/t/rpl000017.test diff --git a/mysql-test/t/rpl000018-master.opt b/mysql-test/suite/rpl/t/rpl000018-master.opt similarity index 100% rename from mysql-test/t/rpl000018-master.opt rename to mysql-test/suite/rpl/t/rpl000018-master.opt diff --git a/mysql-test/t/rpl000018-slave.opt b/mysql-test/suite/rpl/t/rpl000018-slave.opt similarity index 100% rename from mysql-test/t/rpl000018-slave.opt rename to mysql-test/suite/rpl/t/rpl000018-slave.opt diff --git a/mysql-test/t/rpl_000015-slave.sh b/mysql-test/suite/rpl/t/rpl_000015-slave.sh similarity index 100% rename from mysql-test/t/rpl_000015-slave.sh rename to mysql-test/suite/rpl/t/rpl_000015-slave.sh diff --git a/mysql-test/t/rpl_000015.slave-mi b/mysql-test/suite/rpl/t/rpl_000015.slave-mi similarity index 100% rename from mysql-test/t/rpl_000015.slave-mi rename to mysql-test/suite/rpl/t/rpl_000015.slave-mi diff --git a/mysql-test/t/rpl_000015.test b/mysql-test/suite/rpl/t/rpl_000015.test similarity index 100% rename from mysql-test/t/rpl_000015.test rename to mysql-test/suite/rpl/t/rpl_000015.test diff --git a/mysql-test/t/rpl_EE_err.test b/mysql-test/suite/rpl/t/rpl_EE_err.test similarity index 100% rename from mysql-test/t/rpl_EE_err.test rename to mysql-test/suite/rpl/t/rpl_EE_err.test diff --git a/mysql-test/t/rpl_LD_INFILE.test b/mysql-test/suite/rpl/t/rpl_LD_INFILE.test similarity index 100% rename from mysql-test/t/rpl_LD_INFILE.test rename to mysql-test/suite/rpl/t/rpl_LD_INFILE.test diff --git a/mysql-test/t/rpl_alter.test b/mysql-test/suite/rpl/t/rpl_alter.test similarity index 100% rename from mysql-test/t/rpl_alter.test rename to mysql-test/suite/rpl/t/rpl_alter.test diff --git a/mysql-test/t/rpl_alter_db.test b/mysql-test/suite/rpl/t/rpl_alter_db.test similarity index 100% rename from mysql-test/t/rpl_alter_db.test rename to mysql-test/suite/rpl/t/rpl_alter_db.test diff --git a/mysql-test/t/rpl_auto_increment-master.opt b/mysql-test/suite/rpl/t/rpl_auto_increment-master.opt similarity index 100% rename from mysql-test/t/rpl_auto_increment-master.opt rename to mysql-test/suite/rpl/t/rpl_auto_increment-master.opt diff --git a/mysql-test/t/rpl_auto_increment-slave.opt b/mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt similarity index 100% rename from mysql-test/t/rpl_auto_increment-slave.opt rename to mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt diff --git a/mysql-test/t/rpl_auto_increment.test b/mysql-test/suite/rpl/t/rpl_auto_increment.test similarity index 100% rename from mysql-test/t/rpl_auto_increment.test rename to mysql-test/suite/rpl/t/rpl_auto_increment.test diff --git a/mysql-test/t/rpl_auto_increment_11932.test b/mysql-test/suite/rpl/t/rpl_auto_increment_11932.test similarity index 100% rename from mysql-test/t/rpl_auto_increment_11932.test rename to mysql-test/suite/rpl/t/rpl_auto_increment_11932.test diff --git a/mysql-test/t/rpl_bit.test b/mysql-test/suite/rpl/t/rpl_bit.test similarity index 100% rename from mysql-test/t/rpl_bit.test rename to mysql-test/suite/rpl/t/rpl_bit.test diff --git a/mysql-test/t/rpl_bit_npk.test b/mysql-test/suite/rpl/t/rpl_bit_npk.test similarity index 100% rename from mysql-test/t/rpl_bit_npk.test rename to mysql-test/suite/rpl/t/rpl_bit_npk.test diff --git a/mysql-test/t/rpl_change_master.test b/mysql-test/suite/rpl/t/rpl_change_master.test similarity index 100% rename from mysql-test/t/rpl_change_master.test rename to mysql-test/suite/rpl/t/rpl_change_master.test diff --git a/mysql-test/t/rpl_charset_sjis.test b/mysql-test/suite/rpl/t/rpl_charset_sjis.test similarity index 100% rename from mysql-test/t/rpl_charset_sjis.test rename to mysql-test/suite/rpl/t/rpl_charset_sjis.test diff --git a/mysql-test/t/rpl_commit_after_flush.test b/mysql-test/suite/rpl/t/rpl_commit_after_flush.test similarity index 100% rename from mysql-test/t/rpl_commit_after_flush.test rename to mysql-test/suite/rpl/t/rpl_commit_after_flush.test diff --git a/mysql-test/t/rpl_create_database-master.opt b/mysql-test/suite/rpl/t/rpl_create_database-master.opt similarity index 100% rename from mysql-test/t/rpl_create_database-master.opt rename to mysql-test/suite/rpl/t/rpl_create_database-master.opt diff --git a/mysql-test/t/rpl_create_database-slave.opt b/mysql-test/suite/rpl/t/rpl_create_database-slave.opt similarity index 100% rename from mysql-test/t/rpl_create_database-slave.opt rename to mysql-test/suite/rpl/t/rpl_create_database-slave.opt diff --git a/mysql-test/t/rpl_create_database.test b/mysql-test/suite/rpl/t/rpl_create_database.test similarity index 100% rename from mysql-test/t/rpl_create_database.test rename to mysql-test/suite/rpl/t/rpl_create_database.test diff --git a/mysql-test/t/rpl_critical_errors.test b/mysql-test/suite/rpl/t/rpl_critical_errors.test similarity index 100% rename from mysql-test/t/rpl_critical_errors.test rename to mysql-test/suite/rpl/t/rpl_critical_errors.test diff --git a/mysql-test/t/rpl_ddl.test b/mysql-test/suite/rpl/t/rpl_ddl.test similarity index 100% rename from mysql-test/t/rpl_ddl.test rename to mysql-test/suite/rpl/t/rpl_ddl.test diff --git a/mysql-test/t/rpl_deadlock_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt similarity index 100% rename from mysql-test/t/rpl_deadlock_innodb-slave.opt rename to mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt diff --git a/mysql-test/t/rpl_deadlock_innodb.test b/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test similarity index 100% rename from mysql-test/t/rpl_deadlock_innodb.test rename to mysql-test/suite/rpl/t/rpl_deadlock_innodb.test diff --git a/mysql-test/t/rpl_delete_no_where.test b/mysql-test/suite/rpl/t/rpl_delete_no_where.test similarity index 100% rename from mysql-test/t/rpl_delete_no_where.test rename to mysql-test/suite/rpl/t/rpl_delete_no_where.test diff --git a/mysql-test/t/rpl_do_grant.test b/mysql-test/suite/rpl/t/rpl_do_grant.test similarity index 100% rename from mysql-test/t/rpl_do_grant.test rename to mysql-test/suite/rpl/t/rpl_do_grant.test diff --git a/mysql-test/t/rpl_drop.test b/mysql-test/suite/rpl/t/rpl_drop.test similarity index 100% rename from mysql-test/t/rpl_drop.test rename to mysql-test/suite/rpl/t/rpl_drop.test diff --git a/mysql-test/t/rpl_drop_db.test b/mysql-test/suite/rpl/t/rpl_drop_db.test similarity index 100% rename from mysql-test/t/rpl_drop_db.test rename to mysql-test/suite/rpl/t/rpl_drop_db.test diff --git a/mysql-test/t/rpl_drop_temp-slave.opt b/mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt similarity index 100% rename from mysql-test/t/rpl_drop_temp-slave.opt rename to mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt diff --git a/mysql-test/t/rpl_drop_temp.test b/mysql-test/suite/rpl/t/rpl_drop_temp.test similarity index 100% rename from mysql-test/t/rpl_drop_temp.test rename to mysql-test/suite/rpl/t/rpl_drop_temp.test diff --git a/mysql-test/t/rpl_dual_pos_advance-master.opt b/mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt similarity index 100% rename from mysql-test/t/rpl_dual_pos_advance-master.opt rename to mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt diff --git a/mysql-test/t/rpl_dual_pos_advance.test b/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test similarity index 100% rename from mysql-test/t/rpl_dual_pos_advance.test rename to mysql-test/suite/rpl/t/rpl_dual_pos_advance.test diff --git a/mysql-test/t/rpl_empty_master_crash-master.opt b/mysql-test/suite/rpl/t/rpl_empty_master_crash-master.opt similarity index 100% rename from mysql-test/t/rpl_empty_master_crash-master.opt rename to mysql-test/suite/rpl/t/rpl_empty_master_crash-master.opt diff --git a/mysql-test/t/rpl_empty_master_crash.test b/mysql-test/suite/rpl/t/rpl_empty_master_crash.test similarity index 100% rename from mysql-test/t/rpl_empty_master_crash.test rename to mysql-test/suite/rpl/t/rpl_empty_master_crash.test diff --git a/mysql-test/t/rpl_err_ignoredtable-slave.opt b/mysql-test/suite/rpl/t/rpl_err_ignoredtable-slave.opt similarity index 100% rename from mysql-test/t/rpl_err_ignoredtable-slave.opt rename to mysql-test/suite/rpl/t/rpl_err_ignoredtable-slave.opt diff --git a/mysql-test/t/rpl_err_ignoredtable.test b/mysql-test/suite/rpl/t/rpl_err_ignoredtable.test similarity index 100% rename from mysql-test/t/rpl_err_ignoredtable.test rename to mysql-test/suite/rpl/t/rpl_err_ignoredtable.test diff --git a/mysql-test/t/rpl_events.test b/mysql-test/suite/rpl/t/rpl_events.test similarity index 100% rename from mysql-test/t/rpl_events.test rename to mysql-test/suite/rpl/t/rpl_events.test diff --git a/mysql-test/t/rpl_extraCol_innodb-master.opt b/mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt similarity index 100% rename from mysql-test/t/rpl_extraCol_innodb-master.opt rename to mysql-test/suite/rpl/t/rpl_extraCol_innodb-master.opt diff --git a/mysql-test/t/rpl_extraCol_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt similarity index 100% rename from mysql-test/t/rpl_extraCol_innodb-slave.opt rename to mysql-test/suite/rpl/t/rpl_extraCol_innodb-slave.opt diff --git a/mysql-test/t/rpl_extraCol_innodb.test b/mysql-test/suite/rpl/t/rpl_extraCol_innodb.test similarity index 100% rename from mysql-test/t/rpl_extraCol_innodb.test rename to mysql-test/suite/rpl/t/rpl_extraCol_innodb.test diff --git a/mysql-test/t/rpl_extraCol_myisam.test b/mysql-test/suite/rpl/t/rpl_extraCol_myisam.test similarity index 100% rename from mysql-test/t/rpl_extraCol_myisam.test rename to mysql-test/suite/rpl/t/rpl_extraCol_myisam.test diff --git a/mysql-test/t/rpl_failed_optimize-master.opt b/mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt similarity index 100% rename from mysql-test/t/rpl_failed_optimize-master.opt rename to mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt diff --git a/mysql-test/t/rpl_failed_optimize.test b/mysql-test/suite/rpl/t/rpl_failed_optimize.test similarity index 100% rename from mysql-test/t/rpl_failed_optimize.test rename to mysql-test/suite/rpl/t/rpl_failed_optimize.test diff --git a/mysql-test/t/rpl_flushlog_loop-master.opt b/mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt similarity index 100% rename from mysql-test/t/rpl_flushlog_loop-master.opt rename to mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt diff --git a/mysql-test/t/rpl_flushlog_loop-master.sh b/mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh similarity index 100% rename from mysql-test/t/rpl_flushlog_loop-master.sh rename to mysql-test/suite/rpl/t/rpl_flushlog_loop-master.sh diff --git a/mysql-test/t/rpl_flushlog_loop-slave.opt b/mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt similarity index 100% rename from mysql-test/t/rpl_flushlog_loop-slave.opt rename to mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt diff --git a/mysql-test/t/rpl_flushlog_loop-slave.sh b/mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh similarity index 100% rename from mysql-test/t/rpl_flushlog_loop-slave.sh rename to mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.sh diff --git a/mysql-test/t/rpl_flushlog_loop.test b/mysql-test/suite/rpl/t/rpl_flushlog_loop.test similarity index 100% rename from mysql-test/t/rpl_flushlog_loop.test rename to mysql-test/suite/rpl/t/rpl_flushlog_loop.test diff --git a/mysql-test/t/rpl_foreign_key_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt similarity index 100% rename from mysql-test/t/rpl_foreign_key_innodb-slave.opt rename to mysql-test/suite/rpl/t/rpl_foreign_key_innodb-slave.opt diff --git a/mysql-test/t/rpl_foreign_key_innodb.test b/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test similarity index 100% rename from mysql-test/t/rpl_foreign_key_innodb.test rename to mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test diff --git a/mysql-test/t/rpl_free_items-slave.opt b/mysql-test/suite/rpl/t/rpl_free_items-slave.opt similarity index 100% rename from mysql-test/t/rpl_free_items-slave.opt rename to mysql-test/suite/rpl/t/rpl_free_items-slave.opt diff --git a/mysql-test/t/rpl_free_items.test b/mysql-test/suite/rpl/t/rpl_free_items.test similarity index 100% rename from mysql-test/t/rpl_free_items.test rename to mysql-test/suite/rpl/t/rpl_free_items.test diff --git a/mysql-test/t/rpl_get_lock.test b/mysql-test/suite/rpl/t/rpl_get_lock.test similarity index 100% rename from mysql-test/t/rpl_get_lock.test rename to mysql-test/suite/rpl/t/rpl_get_lock.test diff --git a/mysql-test/t/rpl_ignore_grant-slave.opt b/mysql-test/suite/rpl/t/rpl_ignore_grant-slave.opt similarity index 100% rename from mysql-test/t/rpl_ignore_grant-slave.opt rename to mysql-test/suite/rpl/t/rpl_ignore_grant-slave.opt diff --git a/mysql-test/t/rpl_ignore_grant.test b/mysql-test/suite/rpl/t/rpl_ignore_grant.test similarity index 100% rename from mysql-test/t/rpl_ignore_grant.test rename to mysql-test/suite/rpl/t/rpl_ignore_grant.test diff --git a/mysql-test/t/rpl_ignore_revoke-slave.opt b/mysql-test/suite/rpl/t/rpl_ignore_revoke-slave.opt similarity index 100% rename from mysql-test/t/rpl_ignore_revoke-slave.opt rename to mysql-test/suite/rpl/t/rpl_ignore_revoke-slave.opt diff --git a/mysql-test/t/rpl_ignore_revoke.test b/mysql-test/suite/rpl/t/rpl_ignore_revoke.test similarity index 100% rename from mysql-test/t/rpl_ignore_revoke.test rename to mysql-test/suite/rpl/t/rpl_ignore_revoke.test diff --git a/mysql-test/t/rpl_ignore_table-slave.opt b/mysql-test/suite/rpl/t/rpl_ignore_table-slave.opt similarity index 100% rename from mysql-test/t/rpl_ignore_table-slave.opt rename to mysql-test/suite/rpl/t/rpl_ignore_table-slave.opt diff --git a/mysql-test/t/rpl_ignore_table.test b/mysql-test/suite/rpl/t/rpl_ignore_table.test similarity index 100% rename from mysql-test/t/rpl_ignore_table.test rename to mysql-test/suite/rpl/t/rpl_ignore_table.test diff --git a/mysql-test/t/rpl_ignore_table_update-slave.opt b/mysql-test/suite/rpl/t/rpl_ignore_table_update-slave.opt similarity index 100% rename from mysql-test/t/rpl_ignore_table_update-slave.opt rename to mysql-test/suite/rpl/t/rpl_ignore_table_update-slave.opt diff --git a/mysql-test/t/rpl_ignore_table_update.test b/mysql-test/suite/rpl/t/rpl_ignore_table_update.test similarity index 100% rename from mysql-test/t/rpl_ignore_table_update.test rename to mysql-test/suite/rpl/t/rpl_ignore_table_update.test diff --git a/mysql-test/t/rpl_incident-master.opt b/mysql-test/suite/rpl/t/rpl_incident-master.opt similarity index 100% rename from mysql-test/t/rpl_incident-master.opt rename to mysql-test/suite/rpl/t/rpl_incident-master.opt diff --git a/mysql-test/t/rpl_incident.test b/mysql-test/suite/rpl/t/rpl_incident.test similarity index 100% rename from mysql-test/t/rpl_incident.test rename to mysql-test/suite/rpl/t/rpl_incident.test diff --git a/mysql-test/t/rpl_init_slave-slave.opt b/mysql-test/suite/rpl/t/rpl_init_slave-slave.opt similarity index 100% rename from mysql-test/t/rpl_init_slave-slave.opt rename to mysql-test/suite/rpl/t/rpl_init_slave-slave.opt diff --git a/mysql-test/t/rpl_init_slave.test b/mysql-test/suite/rpl/t/rpl_init_slave.test similarity index 100% rename from mysql-test/t/rpl_init_slave.test rename to mysql-test/suite/rpl/t/rpl_init_slave.test diff --git a/mysql-test/t/rpl_innodb.test b/mysql-test/suite/rpl/t/rpl_innodb.test similarity index 100% rename from mysql-test/t/rpl_innodb.test rename to mysql-test/suite/rpl/t/rpl_innodb.test diff --git a/mysql-test/t/rpl_insert.test b/mysql-test/suite/rpl/t/rpl_insert.test similarity index 100% rename from mysql-test/t/rpl_insert.test rename to mysql-test/suite/rpl/t/rpl_insert.test diff --git a/mysql-test/t/rpl_insert_id-slave.opt b/mysql-test/suite/rpl/t/rpl_insert_id-slave.opt similarity index 100% rename from mysql-test/t/rpl_insert_id-slave.opt rename to mysql-test/suite/rpl/t/rpl_insert_id-slave.opt diff --git a/mysql-test/t/rpl_insert_id.test b/mysql-test/suite/rpl/t/rpl_insert_id.test similarity index 100% rename from mysql-test/t/rpl_insert_id.test rename to mysql-test/suite/rpl/t/rpl_insert_id.test diff --git a/mysql-test/t/rpl_insert_id_pk-slave.opt b/mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt similarity index 100% rename from mysql-test/t/rpl_insert_id_pk-slave.opt rename to mysql-test/suite/rpl/t/rpl_insert_id_pk-slave.opt diff --git a/mysql-test/t/rpl_insert_id_pk.test b/mysql-test/suite/rpl/t/rpl_insert_id_pk.test similarity index 100% rename from mysql-test/t/rpl_insert_id_pk.test rename to mysql-test/suite/rpl/t/rpl_insert_id_pk.test diff --git a/mysql-test/t/rpl_insert_ignore-slave.opt b/mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt similarity index 100% rename from mysql-test/t/rpl_insert_ignore-slave.opt rename to mysql-test/suite/rpl/t/rpl_insert_ignore-slave.opt diff --git a/mysql-test/t/rpl_insert_ignore.test b/mysql-test/suite/rpl/t/rpl_insert_ignore.test similarity index 100% rename from mysql-test/t/rpl_insert_ignore.test rename to mysql-test/suite/rpl/t/rpl_insert_ignore.test diff --git a/mysql-test/t/rpl_insert_select.test b/mysql-test/suite/rpl/t/rpl_insert_select.test similarity index 100% rename from mysql-test/t/rpl_insert_select.test rename to mysql-test/suite/rpl/t/rpl_insert_select.test diff --git a/mysql-test/t/rpl_known_bugs_detection-master.opt b/mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt similarity index 100% rename from mysql-test/t/rpl_known_bugs_detection-master.opt rename to mysql-test/suite/rpl/t/rpl_known_bugs_detection-master.opt diff --git a/mysql-test/t/rpl_known_bugs_detection.test b/mysql-test/suite/rpl/t/rpl_known_bugs_detection.test similarity index 100% rename from mysql-test/t/rpl_known_bugs_detection.test rename to mysql-test/suite/rpl/t/rpl_known_bugs_detection.test diff --git a/mysql-test/t/rpl_load_from_master-slave.opt b/mysql-test/suite/rpl/t/rpl_load_from_master-slave.opt similarity index 100% rename from mysql-test/t/rpl_load_from_master-slave.opt rename to mysql-test/suite/rpl/t/rpl_load_from_master-slave.opt diff --git a/mysql-test/t/rpl_load_from_master.test b/mysql-test/suite/rpl/t/rpl_load_from_master.test similarity index 100% rename from mysql-test/t/rpl_load_from_master.test rename to mysql-test/suite/rpl/t/rpl_load_from_master.test diff --git a/mysql-test/t/rpl_load_table_from_master.test b/mysql-test/suite/rpl/t/rpl_load_table_from_master.test similarity index 100% rename from mysql-test/t/rpl_load_table_from_master.test rename to mysql-test/suite/rpl/t/rpl_load_table_from_master.test diff --git a/mysql-test/t/rpl_loaddata.test b/mysql-test/suite/rpl/t/rpl_loaddata.test similarity index 100% rename from mysql-test/t/rpl_loaddata.test rename to mysql-test/suite/rpl/t/rpl_loaddata.test diff --git a/mysql-test/t/rpl_loaddata_charset.test b/mysql-test/suite/rpl/t/rpl_loaddata_charset.test similarity index 100% rename from mysql-test/t/rpl_loaddata_charset.test rename to mysql-test/suite/rpl/t/rpl_loaddata_charset.test diff --git a/mysql-test/t/rpl_loaddata_m-master.opt b/mysql-test/suite/rpl/t/rpl_loaddata_m-master.opt similarity index 100% rename from mysql-test/t/rpl_loaddata_m-master.opt rename to mysql-test/suite/rpl/t/rpl_loaddata_m-master.opt diff --git a/mysql-test/t/rpl_loaddata_m.test b/mysql-test/suite/rpl/t/rpl_loaddata_m.test similarity index 100% rename from mysql-test/t/rpl_loaddata_m.test rename to mysql-test/suite/rpl/t/rpl_loaddata_m.test diff --git a/mysql-test/t/rpl_loaddata_s-slave.opt b/mysql-test/suite/rpl/t/rpl_loaddata_s-slave.opt similarity index 100% rename from mysql-test/t/rpl_loaddata_s-slave.opt rename to mysql-test/suite/rpl/t/rpl_loaddata_s-slave.opt diff --git a/mysql-test/t/rpl_loaddata_s.test b/mysql-test/suite/rpl/t/rpl_loaddata_s.test similarity index 100% rename from mysql-test/t/rpl_loaddata_s.test rename to mysql-test/suite/rpl/t/rpl_loaddata_s.test diff --git a/mysql-test/t/rpl_loaddata_simple.test b/mysql-test/suite/rpl/t/rpl_loaddata_simple.test similarity index 100% rename from mysql-test/t/rpl_loaddata_simple.test rename to mysql-test/suite/rpl/t/rpl_loaddata_simple.test diff --git a/mysql-test/t/rpl_loaddatalocal.test b/mysql-test/suite/rpl/t/rpl_loaddatalocal.test similarity index 100% rename from mysql-test/t/rpl_loaddatalocal.test rename to mysql-test/suite/rpl/t/rpl_loaddatalocal.test diff --git a/mysql-test/t/rpl_loadfile.test b/mysql-test/suite/rpl/t/rpl_loadfile.test similarity index 100% rename from mysql-test/t/rpl_loadfile.test rename to mysql-test/suite/rpl/t/rpl_loadfile.test diff --git a/mysql-test/t/rpl_locale.test b/mysql-test/suite/rpl/t/rpl_locale.test similarity index 100% rename from mysql-test/t/rpl_locale.test rename to mysql-test/suite/rpl/t/rpl_locale.test diff --git a/mysql-test/t/rpl_log_pos.test b/mysql-test/suite/rpl/t/rpl_log_pos.test similarity index 100% rename from mysql-test/t/rpl_log_pos.test rename to mysql-test/suite/rpl/t/rpl_log_pos.test diff --git a/mysql-test/t/rpl_many_optimize.test b/mysql-test/suite/rpl/t/rpl_many_optimize.test similarity index 100% rename from mysql-test/t/rpl_many_optimize.test rename to mysql-test/suite/rpl/t/rpl_many_optimize.test diff --git a/mysql-test/t/rpl_master_pos_wait.test b/mysql-test/suite/rpl/t/rpl_master_pos_wait.test similarity index 100% rename from mysql-test/t/rpl_master_pos_wait.test rename to mysql-test/suite/rpl/t/rpl_master_pos_wait.test diff --git a/mysql-test/t/rpl_misc_functions-slave.sh b/mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh similarity index 100% rename from mysql-test/t/rpl_misc_functions-slave.sh rename to mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh diff --git a/mysql-test/t/rpl_misc_functions.test b/mysql-test/suite/rpl/t/rpl_misc_functions.test similarity index 100% rename from mysql-test/t/rpl_misc_functions.test rename to mysql-test/suite/rpl/t/rpl_misc_functions.test diff --git a/mysql-test/t/rpl_mixed_ddl_dml.test b/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test similarity index 100% rename from mysql-test/t/rpl_mixed_ddl_dml.test rename to mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test diff --git a/mysql-test/t/rpl_multi_delete-slave.opt b/mysql-test/suite/rpl/t/rpl_multi_delete-slave.opt similarity index 100% rename from mysql-test/t/rpl_multi_delete-slave.opt rename to mysql-test/suite/rpl/t/rpl_multi_delete-slave.opt diff --git a/mysql-test/t/rpl_multi_delete.test b/mysql-test/suite/rpl/t/rpl_multi_delete.test similarity index 100% rename from mysql-test/t/rpl_multi_delete.test rename to mysql-test/suite/rpl/t/rpl_multi_delete.test diff --git a/mysql-test/t/rpl_multi_delete2-slave.opt b/mysql-test/suite/rpl/t/rpl_multi_delete2-slave.opt similarity index 100% rename from mysql-test/t/rpl_multi_delete2-slave.opt rename to mysql-test/suite/rpl/t/rpl_multi_delete2-slave.opt diff --git a/mysql-test/t/rpl_multi_delete2.test b/mysql-test/suite/rpl/t/rpl_multi_delete2.test similarity index 100% rename from mysql-test/t/rpl_multi_delete2.test rename to mysql-test/suite/rpl/t/rpl_multi_delete2.test diff --git a/mysql-test/t/rpl_multi_engine-slave.opt b/mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt similarity index 100% rename from mysql-test/t/rpl_multi_engine-slave.opt rename to mysql-test/suite/rpl/t/rpl_multi_engine-slave.opt diff --git a/mysql-test/t/rpl_multi_engine.test b/mysql-test/suite/rpl/t/rpl_multi_engine.test similarity index 100% rename from mysql-test/t/rpl_multi_engine.test rename to mysql-test/suite/rpl/t/rpl_multi_engine.test diff --git a/mysql-test/t/rpl_multi_update.test b/mysql-test/suite/rpl/t/rpl_multi_update.test similarity index 100% rename from mysql-test/t/rpl_multi_update.test rename to mysql-test/suite/rpl/t/rpl_multi_update.test diff --git a/mysql-test/t/rpl_multi_update2-slave.opt b/mysql-test/suite/rpl/t/rpl_multi_update2-slave.opt similarity index 100% rename from mysql-test/t/rpl_multi_update2-slave.opt rename to mysql-test/suite/rpl/t/rpl_multi_update2-slave.opt diff --git a/mysql-test/t/rpl_multi_update2.test b/mysql-test/suite/rpl/t/rpl_multi_update2.test similarity index 100% rename from mysql-test/t/rpl_multi_update2.test rename to mysql-test/suite/rpl/t/rpl_multi_update2.test diff --git a/mysql-test/t/rpl_multi_update3.test b/mysql-test/suite/rpl/t/rpl_multi_update3.test similarity index 100% rename from mysql-test/t/rpl_multi_update3.test rename to mysql-test/suite/rpl/t/rpl_multi_update3.test diff --git a/mysql-test/t/rpl_multi_update4-slave.opt b/mysql-test/suite/rpl/t/rpl_multi_update4-slave.opt similarity index 100% rename from mysql-test/t/rpl_multi_update4-slave.opt rename to mysql-test/suite/rpl/t/rpl_multi_update4-slave.opt diff --git a/mysql-test/t/rpl_multi_update4.test b/mysql-test/suite/rpl/t/rpl_multi_update4.test similarity index 100% rename from mysql-test/t/rpl_multi_update4.test rename to mysql-test/suite/rpl/t/rpl_multi_update4.test diff --git a/mysql-test/t/rpl_optimize.test b/mysql-test/suite/rpl/t/rpl_optimize.test similarity index 100% rename from mysql-test/t/rpl_optimize.test rename to mysql-test/suite/rpl/t/rpl_optimize.test diff --git a/mysql-test/t/rpl_packet-master.opt b/mysql-test/suite/rpl/t/rpl_packet-master.opt similarity index 100% rename from mysql-test/t/rpl_packet-master.opt rename to mysql-test/suite/rpl/t/rpl_packet-master.opt diff --git a/mysql-test/t/rpl_packet-slave.opt b/mysql-test/suite/rpl/t/rpl_packet-slave.opt similarity index 100% rename from mysql-test/t/rpl_packet-slave.opt rename to mysql-test/suite/rpl/t/rpl_packet-slave.opt diff --git a/mysql-test/t/rpl_packet.test b/mysql-test/suite/rpl/t/rpl_packet.test similarity index 100% rename from mysql-test/t/rpl_packet.test rename to mysql-test/suite/rpl/t/rpl_packet.test diff --git a/mysql-test/t/rpl_ps.test b/mysql-test/suite/rpl/t/rpl_ps.test similarity index 100% rename from mysql-test/t/rpl_ps.test rename to mysql-test/suite/rpl/t/rpl_ps.test diff --git a/mysql-test/t/rpl_rbr_to_sbr.test b/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test similarity index 100% rename from mysql-test/t/rpl_rbr_to_sbr.test rename to mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test diff --git a/mysql-test/t/rpl_read_only-slave.opt b/mysql-test/suite/rpl/t/rpl_read_only-slave.opt similarity index 100% rename from mysql-test/t/rpl_read_only-slave.opt rename to mysql-test/suite/rpl/t/rpl_read_only-slave.opt diff --git a/mysql-test/t/rpl_read_only.test b/mysql-test/suite/rpl/t/rpl_read_only.test similarity index 100% rename from mysql-test/t/rpl_read_only.test rename to mysql-test/suite/rpl/t/rpl_read_only.test diff --git a/mysql-test/t/rpl_redirect.test b/mysql-test/suite/rpl/t/rpl_redirect.test similarity index 100% rename from mysql-test/t/rpl_redirect.test rename to mysql-test/suite/rpl/t/rpl_redirect.test diff --git a/mysql-test/t/rpl_relay_space_innodb-master.opt b/mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt similarity index 100% rename from mysql-test/t/rpl_relay_space_innodb-master.opt rename to mysql-test/suite/rpl/t/rpl_relay_space_innodb-master.opt diff --git a/mysql-test/t/rpl_relay_space_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt similarity index 100% rename from mysql-test/t/rpl_relay_space_innodb-slave.opt rename to mysql-test/suite/rpl/t/rpl_relay_space_innodb-slave.opt diff --git a/mysql-test/t/rpl_relay_space_innodb.test b/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test similarity index 100% rename from mysql-test/t/rpl_relay_space_innodb.test rename to mysql-test/suite/rpl/t/rpl_relay_space_innodb.test diff --git a/mysql-test/t/rpl_relay_space_myisam.test b/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test similarity index 100% rename from mysql-test/t/rpl_relay_space_myisam.test rename to mysql-test/suite/rpl/t/rpl_relay_space_myisam.test diff --git a/mysql-test/t/rpl_relayrotate-slave.opt b/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt similarity index 100% rename from mysql-test/t/rpl_relayrotate-slave.opt rename to mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt diff --git a/mysql-test/t/rpl_relayrotate.test b/mysql-test/suite/rpl/t/rpl_relayrotate.test similarity index 100% rename from mysql-test/t/rpl_relayrotate.test rename to mysql-test/suite/rpl/t/rpl_relayrotate.test diff --git a/mysql-test/t/rpl_relayspace-slave.opt b/mysql-test/suite/rpl/t/rpl_relayspace-slave.opt similarity index 100% rename from mysql-test/t/rpl_relayspace-slave.opt rename to mysql-test/suite/rpl/t/rpl_relayspace-slave.opt diff --git a/mysql-test/t/rpl_relayspace.test b/mysql-test/suite/rpl/t/rpl_relayspace.test similarity index 100% rename from mysql-test/t/rpl_relayspace.test rename to mysql-test/suite/rpl/t/rpl_relayspace.test diff --git a/mysql-test/t/rpl_replicate_do-slave.opt b/mysql-test/suite/rpl/t/rpl_replicate_do-slave.opt similarity index 100% rename from mysql-test/t/rpl_replicate_do-slave.opt rename to mysql-test/suite/rpl/t/rpl_replicate_do-slave.opt diff --git a/mysql-test/t/rpl_replicate_do.test b/mysql-test/suite/rpl/t/rpl_replicate_do.test similarity index 100% rename from mysql-test/t/rpl_replicate_do.test rename to mysql-test/suite/rpl/t/rpl_replicate_do.test diff --git a/mysql-test/t/rpl_replicate_ignore_db-slave.opt b/mysql-test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt similarity index 100% rename from mysql-test/t/rpl_replicate_ignore_db-slave.opt rename to mysql-test/suite/rpl/t/rpl_replicate_ignore_db-slave.opt diff --git a/mysql-test/t/rpl_replicate_ignore_db.test b/mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test similarity index 100% rename from mysql-test/t/rpl_replicate_ignore_db.test rename to mysql-test/suite/rpl/t/rpl_replicate_ignore_db.test diff --git a/mysql-test/t/rpl_rewrt_db-slave.opt b/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt similarity index 100% rename from mysql-test/t/rpl_rewrt_db-slave.opt rename to mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt diff --git a/mysql-test/t/rpl_rewrt_db.test b/mysql-test/suite/rpl/t/rpl_rewrt_db.test similarity index 100% rename from mysql-test/t/rpl_rewrt_db.test rename to mysql-test/suite/rpl/t/rpl_rewrt_db.test diff --git a/mysql-test/t/rpl_rotate_logs-master.opt b/mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt similarity index 100% rename from mysql-test/t/rpl_rotate_logs-master.opt rename to mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt diff --git a/mysql-test/t/rpl_rotate_logs-slave.sh b/mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh similarity index 100% rename from mysql-test/t/rpl_rotate_logs-slave.sh rename to mysql-test/suite/rpl/t/rpl_rotate_logs-slave.sh diff --git a/mysql-test/t/rpl_rotate_logs.slave-mi b/mysql-test/suite/rpl/t/rpl_rotate_logs.slave-mi similarity index 100% rename from mysql-test/t/rpl_rotate_logs.slave-mi rename to mysql-test/suite/rpl/t/rpl_rotate_logs.slave-mi diff --git a/mysql-test/t/rpl_rotate_logs.test b/mysql-test/suite/rpl/t/rpl_rotate_logs.test similarity index 100% rename from mysql-test/t/rpl_rotate_logs.test rename to mysql-test/suite/rpl/t/rpl_rotate_logs.test diff --git a/mysql-test/t/rpl_row_001.test b/mysql-test/suite/rpl/t/rpl_row_001.test similarity index 100% rename from mysql-test/t/rpl_row_001.test rename to mysql-test/suite/rpl/t/rpl_row_001.test diff --git a/mysql-test/t/rpl_row_4_bytes-master.opt b/mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt similarity index 100% rename from mysql-test/t/rpl_row_4_bytes-master.opt rename to mysql-test/suite/rpl/t/rpl_row_4_bytes-master.opt diff --git a/mysql-test/t/rpl_row_4_bytes.test b/mysql-test/suite/rpl/t/rpl_row_4_bytes.test similarity index 100% rename from mysql-test/t/rpl_row_4_bytes.test rename to mysql-test/suite/rpl/t/rpl_row_4_bytes.test diff --git a/mysql-test/t/rpl_row_NOW.test b/mysql-test/suite/rpl/t/rpl_row_NOW.test similarity index 100% rename from mysql-test/t/rpl_row_NOW.test rename to mysql-test/suite/rpl/t/rpl_row_NOW.test diff --git a/mysql-test/t/rpl_row_USER.test b/mysql-test/suite/rpl/t/rpl_row_USER.test similarity index 100% rename from mysql-test/t/rpl_row_USER.test rename to mysql-test/suite/rpl/t/rpl_row_USER.test diff --git a/mysql-test/t/rpl_row_UUID.test b/mysql-test/suite/rpl/t/rpl_row_UUID.test similarity index 100% rename from mysql-test/t/rpl_row_UUID.test rename to mysql-test/suite/rpl/t/rpl_row_UUID.test diff --git a/mysql-test/t/rpl_row_basic_11bugs-master.opt b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt similarity index 100% rename from mysql-test/t/rpl_row_basic_11bugs-master.opt rename to mysql-test/suite/rpl/t/rpl_row_basic_11bugs-master.opt diff --git a/mysql-test/t/rpl_row_basic_11bugs-slave.opt b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_basic_11bugs-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_basic_11bugs-slave.opt diff --git a/mysql-test/t/rpl_row_basic_11bugs.test b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test similarity index 100% rename from mysql-test/t/rpl_row_basic_11bugs.test rename to mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test diff --git a/mysql-test/t/rpl_row_basic_2myisam.test b/mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test similarity index 100% rename from mysql-test/t/rpl_row_basic_2myisam.test rename to mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test diff --git a/mysql-test/t/rpl_row_basic_3innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_basic_3innodb-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_basic_3innodb-slave.opt diff --git a/mysql-test/t/rpl_row_basic_3innodb.test b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test similarity index 100% rename from mysql-test/t/rpl_row_basic_3innodb.test rename to mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test diff --git a/mysql-test/t/rpl_row_basic_8partition.test b/mysql-test/suite/rpl/t/rpl_row_basic_8partition.test similarity index 100% rename from mysql-test/t/rpl_row_basic_8partition.test rename to mysql-test/suite/rpl/t/rpl_row_basic_8partition.test diff --git a/mysql-test/t/rpl_row_blob_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_blob_innodb-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_blob_innodb-slave.opt diff --git a/mysql-test/t/rpl_row_blob_innodb.test b/mysql-test/suite/rpl/t/rpl_row_blob_innodb.test similarity index 100% rename from mysql-test/t/rpl_row_blob_innodb.test rename to mysql-test/suite/rpl/t/rpl_row_blob_innodb.test diff --git a/mysql-test/t/rpl_row_blob_myisam.test b/mysql-test/suite/rpl/t/rpl_row_blob_myisam.test similarity index 100% rename from mysql-test/t/rpl_row_blob_myisam.test rename to mysql-test/suite/rpl/t/rpl_row_blob_myisam.test diff --git a/mysql-test/t/rpl_row_charset.test b/mysql-test/suite/rpl/t/rpl_row_charset.test similarity index 100% rename from mysql-test/t/rpl_row_charset.test rename to mysql-test/suite/rpl/t/rpl_row_charset.test diff --git a/mysql-test/t/rpl_row_create_table-slave.opt b/mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_create_table-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_create_table-slave.opt diff --git a/mysql-test/t/rpl_row_create_table.test b/mysql-test/suite/rpl/t/rpl_row_create_table.test similarity index 100% rename from mysql-test/t/rpl_row_create_table.test rename to mysql-test/suite/rpl/t/rpl_row_create_table.test diff --git a/mysql-test/t/rpl_row_delayed_ins.test b/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test similarity index 100% rename from mysql-test/t/rpl_row_delayed_ins.test rename to mysql-test/suite/rpl/t/rpl_row_delayed_ins.test diff --git a/mysql-test/t/rpl_row_drop.test b/mysql-test/suite/rpl/t/rpl_row_drop.test similarity index 100% rename from mysql-test/t/rpl_row_drop.test rename to mysql-test/suite/rpl/t/rpl_row_drop.test diff --git a/mysql-test/t/rpl_row_err_daisychain-master.opt b/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt similarity index 100% rename from mysql-test/t/rpl_row_err_daisychain-master.opt rename to mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt diff --git a/mysql-test/t/rpl_row_err_daisychain-slave.opt b/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_err_daisychain-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt diff --git a/mysql-test/t/rpl_row_flsh_tbls.test b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test similarity index 100% rename from mysql-test/t/rpl_row_flsh_tbls.test rename to mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test diff --git a/mysql-test/t/rpl_row_func001.test b/mysql-test/suite/rpl/t/rpl_row_func001.test similarity index 100% rename from mysql-test/t/rpl_row_func001.test rename to mysql-test/suite/rpl/t/rpl_row_func001.test diff --git a/mysql-test/t/rpl_row_func002.test b/mysql-test/suite/rpl/t/rpl_row_func002.test similarity index 100% rename from mysql-test/t/rpl_row_func002.test rename to mysql-test/suite/rpl/t/rpl_row_func002.test diff --git a/mysql-test/t/rpl_row_func003-slave.opt b/mysql-test/suite/rpl/t/rpl_row_func003-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_func003-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_func003-slave.opt diff --git a/mysql-test/t/rpl_row_func003.test b/mysql-test/suite/rpl/t/rpl_row_func003.test similarity index 100% rename from mysql-test/t/rpl_row_func003.test rename to mysql-test/suite/rpl/t/rpl_row_func003.test diff --git a/mysql-test/t/rpl_row_inexist_tbl-slave.opt b/mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_inexist_tbl-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_inexist_tbl-slave.opt diff --git a/mysql-test/t/rpl_row_inexist_tbl.test b/mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test similarity index 100% rename from mysql-test/t/rpl_row_inexist_tbl.test rename to mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test diff --git a/mysql-test/t/rpl_row_insert_delayed.test b/mysql-test/suite/rpl/t/rpl_row_insert_delayed.test similarity index 100% rename from mysql-test/t/rpl_row_insert_delayed.test rename to mysql-test/suite/rpl/t/rpl_row_insert_delayed.test diff --git a/mysql-test/t/rpl_row_log-master.opt b/mysql-test/suite/rpl/t/rpl_row_log-master.opt similarity index 100% rename from mysql-test/t/rpl_row_log-master.opt rename to mysql-test/suite/rpl/t/rpl_row_log-master.opt diff --git a/mysql-test/t/rpl_row_log-slave.opt b/mysql-test/suite/rpl/t/rpl_row_log-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_log-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_log-slave.opt diff --git a/mysql-test/t/rpl_row_log.test b/mysql-test/suite/rpl/t/rpl_row_log.test similarity index 100% rename from mysql-test/t/rpl_row_log.test rename to mysql-test/suite/rpl/t/rpl_row_log.test diff --git a/mysql-test/t/rpl_row_log_innodb-master.opt b/mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt similarity index 100% rename from mysql-test/t/rpl_row_log_innodb-master.opt rename to mysql-test/suite/rpl/t/rpl_row_log_innodb-master.opt diff --git a/mysql-test/t/rpl_row_log_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_log_innodb-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_log_innodb-slave.opt diff --git a/mysql-test/t/rpl_row_log_innodb.test b/mysql-test/suite/rpl/t/rpl_row_log_innodb.test similarity index 100% rename from mysql-test/t/rpl_row_log_innodb.test rename to mysql-test/suite/rpl/t/rpl_row_log_innodb.test diff --git a/mysql-test/t/rpl_row_max_relay_size.test b/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test similarity index 100% rename from mysql-test/t/rpl_row_max_relay_size.test rename to mysql-test/suite/rpl/t/rpl_row_max_relay_size.test diff --git a/mysql-test/t/rpl_row_mysqlbinlog-master.opt b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog-master.opt similarity index 100% rename from mysql-test/t/rpl_row_mysqlbinlog-master.opt rename to mysql-test/suite/rpl/t/rpl_row_mysqlbinlog-master.opt diff --git a/mysql-test/t/rpl_row_mysqlbinlog.test b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test similarity index 100% rename from mysql-test/t/rpl_row_mysqlbinlog.test rename to mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test diff --git a/mysql-test/t/rpl_row_mystery22.test b/mysql-test/suite/rpl/t/rpl_row_mystery22.test similarity index 100% rename from mysql-test/t/rpl_row_mystery22.test rename to mysql-test/suite/rpl/t/rpl_row_mystery22.test diff --git a/mysql-test/t/rpl_row_reset_slave.test b/mysql-test/suite/rpl/t/rpl_row_reset_slave.test similarity index 100% rename from mysql-test/t/rpl_row_reset_slave.test rename to mysql-test/suite/rpl/t/rpl_row_reset_slave.test diff --git a/mysql-test/t/rpl_row_sp001.test b/mysql-test/suite/rpl/t/rpl_row_sp001.test similarity index 100% rename from mysql-test/t/rpl_row_sp001.test rename to mysql-test/suite/rpl/t/rpl_row_sp001.test diff --git a/mysql-test/t/rpl_row_sp002_innodb-master.opt b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt similarity index 100% rename from mysql-test/t/rpl_row_sp002_innodb-master.opt rename to mysql-test/suite/rpl/t/rpl_row_sp002_innodb-master.opt diff --git a/mysql-test/t/rpl_row_sp002_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_sp002_innodb-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_sp002_innodb-slave.opt diff --git a/mysql-test/t/rpl_row_sp002_innodb.test b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test similarity index 100% rename from mysql-test/t/rpl_row_sp002_innodb.test rename to mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test diff --git a/mysql-test/t/rpl_row_sp003-master.opt b/mysql-test/suite/rpl/t/rpl_row_sp003-master.opt similarity index 100% rename from mysql-test/t/rpl_row_sp003-master.opt rename to mysql-test/suite/rpl/t/rpl_row_sp003-master.opt diff --git a/mysql-test/t/rpl_row_sp003-slave.opt b/mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_sp003-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_sp003-slave.opt diff --git a/mysql-test/t/rpl_row_sp003.test b/mysql-test/suite/rpl/t/rpl_row_sp003.test similarity index 100% rename from mysql-test/t/rpl_row_sp003.test rename to mysql-test/suite/rpl/t/rpl_row_sp003.test diff --git a/mysql-test/t/rpl_row_sp005.test b/mysql-test/suite/rpl/t/rpl_row_sp005.test similarity index 100% rename from mysql-test/t/rpl_row_sp005.test rename to mysql-test/suite/rpl/t/rpl_row_sp005.test diff --git a/mysql-test/t/rpl_row_sp006_InnoDB-slave.opt b/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_sp006_InnoDB-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB-slave.opt diff --git a/mysql-test/t/rpl_row_sp006_InnoDB.test b/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test similarity index 100% rename from mysql-test/t/rpl_row_sp006_InnoDB.test rename to mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test diff --git a/mysql-test/t/rpl_row_sp007_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_sp007_innodb-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_sp007_innodb-slave.opt diff --git a/mysql-test/t/rpl_row_sp007_innodb.test b/mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test similarity index 100% rename from mysql-test/t/rpl_row_sp007_innodb.test rename to mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test diff --git a/mysql-test/t/rpl_row_sp008.test b/mysql-test/suite/rpl/t/rpl_row_sp008.test similarity index 100% rename from mysql-test/t/rpl_row_sp008.test rename to mysql-test/suite/rpl/t/rpl_row_sp008.test diff --git a/mysql-test/t/rpl_row_sp009.test b/mysql-test/suite/rpl/t/rpl_row_sp009.test similarity index 100% rename from mysql-test/t/rpl_row_sp009.test rename to mysql-test/suite/rpl/t/rpl_row_sp009.test diff --git a/mysql-test/t/rpl_row_sp010.test b/mysql-test/suite/rpl/t/rpl_row_sp010.test similarity index 100% rename from mysql-test/t/rpl_row_sp010.test rename to mysql-test/suite/rpl/t/rpl_row_sp010.test diff --git a/mysql-test/t/rpl_row_sp011.test b/mysql-test/suite/rpl/t/rpl_row_sp011.test similarity index 100% rename from mysql-test/t/rpl_row_sp011.test rename to mysql-test/suite/rpl/t/rpl_row_sp011.test diff --git a/mysql-test/t/rpl_row_sp012.test b/mysql-test/suite/rpl/t/rpl_row_sp012.test similarity index 100% rename from mysql-test/t/rpl_row_sp012.test rename to mysql-test/suite/rpl/t/rpl_row_sp012.test diff --git a/mysql-test/t/rpl_row_stop_middle.test b/mysql-test/suite/rpl/t/rpl_row_stop_middle.test similarity index 100% rename from mysql-test/t/rpl_row_stop_middle.test rename to mysql-test/suite/rpl/t/rpl_row_stop_middle.test diff --git a/mysql-test/t/rpl_row_stop_middle_update-master.opt b/mysql-test/suite/rpl/t/rpl_row_stop_middle_update-master.opt similarity index 100% rename from mysql-test/t/rpl_row_stop_middle_update-master.opt rename to mysql-test/suite/rpl/t/rpl_row_stop_middle_update-master.opt diff --git a/mysql-test/t/rpl_row_stop_middle_update-slave.opt b/mysql-test/suite/rpl/t/rpl_row_stop_middle_update-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_stop_middle_update-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_stop_middle_update-slave.opt diff --git a/mysql-test/t/rpl_row_stop_middle_update.test b/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test similarity index 100% rename from mysql-test/t/rpl_row_stop_middle_update.test rename to mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test diff --git a/mysql-test/t/rpl_row_tabledefs_2myisam.test b/mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test similarity index 100% rename from mysql-test/t/rpl_row_tabledefs_2myisam.test rename to mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test diff --git a/mysql-test/t/rpl_row_tabledefs_3innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt similarity index 100% rename from mysql-test/t/rpl_row_tabledefs_3innodb-slave.opt rename to mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb-slave.opt diff --git a/mysql-test/t/rpl_row_tabledefs_3innodb.test b/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test similarity index 100% rename from mysql-test/t/rpl_row_tabledefs_3innodb.test rename to mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test diff --git a/mysql-test/t/rpl_row_trig001.test b/mysql-test/suite/rpl/t/rpl_row_trig001.test similarity index 100% rename from mysql-test/t/rpl_row_trig001.test rename to mysql-test/suite/rpl/t/rpl_row_trig001.test diff --git a/mysql-test/t/rpl_row_trig002.test b/mysql-test/suite/rpl/t/rpl_row_trig002.test similarity index 100% rename from mysql-test/t/rpl_row_trig002.test rename to mysql-test/suite/rpl/t/rpl_row_trig002.test diff --git a/mysql-test/t/rpl_row_trig003.test b/mysql-test/suite/rpl/t/rpl_row_trig003.test similarity index 100% rename from mysql-test/t/rpl_row_trig003.test rename to mysql-test/suite/rpl/t/rpl_row_trig003.test diff --git a/mysql-test/t/rpl_row_trig004.test b/mysql-test/suite/rpl/t/rpl_row_trig004.test similarity index 100% rename from mysql-test/t/rpl_row_trig004.test rename to mysql-test/suite/rpl/t/rpl_row_trig004.test diff --git a/mysql-test/t/rpl_row_until.test b/mysql-test/suite/rpl/t/rpl_row_until.test similarity index 100% rename from mysql-test/t/rpl_row_until.test rename to mysql-test/suite/rpl/t/rpl_row_until.test diff --git a/mysql-test/t/rpl_row_view01.test b/mysql-test/suite/rpl/t/rpl_row_view01.test similarity index 100% rename from mysql-test/t/rpl_row_view01.test rename to mysql-test/suite/rpl/t/rpl_row_view01.test diff --git a/mysql-test/t/rpl_server_id1.test b/mysql-test/suite/rpl/t/rpl_server_id1.test similarity index 100% rename from mysql-test/t/rpl_server_id1.test rename to mysql-test/suite/rpl/t/rpl_server_id1.test diff --git a/mysql-test/t/rpl_server_id2-slave.opt b/mysql-test/suite/rpl/t/rpl_server_id2-slave.opt similarity index 100% rename from mysql-test/t/rpl_server_id2-slave.opt rename to mysql-test/suite/rpl/t/rpl_server_id2-slave.opt diff --git a/mysql-test/t/rpl_server_id2.test b/mysql-test/suite/rpl/t/rpl_server_id2.test similarity index 100% rename from mysql-test/t/rpl_server_id2.test rename to mysql-test/suite/rpl/t/rpl_server_id2.test diff --git a/mysql-test/t/rpl_session_var.test b/mysql-test/suite/rpl/t/rpl_session_var.test similarity index 100% rename from mysql-test/t/rpl_session_var.test rename to mysql-test/suite/rpl/t/rpl_session_var.test diff --git a/mysql-test/t/rpl_set_charset.test b/mysql-test/suite/rpl/t/rpl_set_charset.test similarity index 100% rename from mysql-test/t/rpl_set_charset.test rename to mysql-test/suite/rpl/t/rpl_set_charset.test diff --git a/mysql-test/t/rpl_sf.test b/mysql-test/suite/rpl/t/rpl_sf.test similarity index 100% rename from mysql-test/t/rpl_sf.test rename to mysql-test/suite/rpl/t/rpl_sf.test diff --git a/mysql-test/t/rpl_skip_error-slave.opt b/mysql-test/suite/rpl/t/rpl_skip_error-slave.opt similarity index 100% rename from mysql-test/t/rpl_skip_error-slave.opt rename to mysql-test/suite/rpl/t/rpl_skip_error-slave.opt diff --git a/mysql-test/t/rpl_skip_error.test b/mysql-test/suite/rpl/t/rpl_skip_error.test similarity index 100% rename from mysql-test/t/rpl_skip_error.test rename to mysql-test/suite/rpl/t/rpl_skip_error.test diff --git a/mysql-test/t/rpl_slave_status.test b/mysql-test/suite/rpl/t/rpl_slave_status.test similarity index 100% rename from mysql-test/t/rpl_slave_status.test rename to mysql-test/suite/rpl/t/rpl_slave_status.test diff --git a/mysql-test/t/rpl_sp-master.opt b/mysql-test/suite/rpl/t/rpl_sp-master.opt similarity index 100% rename from mysql-test/t/rpl_sp-master.opt rename to mysql-test/suite/rpl/t/rpl_sp-master.opt diff --git a/mysql-test/t/rpl_sp-slave.opt b/mysql-test/suite/rpl/t/rpl_sp-slave.opt similarity index 100% rename from mysql-test/t/rpl_sp-slave.opt rename to mysql-test/suite/rpl/t/rpl_sp-slave.opt diff --git a/mysql-test/t/rpl_sp.test b/mysql-test/suite/rpl/t/rpl_sp.test similarity index 100% rename from mysql-test/t/rpl_sp.test rename to mysql-test/suite/rpl/t/rpl_sp.test diff --git a/mysql-test/t/rpl_sp004.test b/mysql-test/suite/rpl/t/rpl_sp004.test similarity index 100% rename from mysql-test/t/rpl_sp004.test rename to mysql-test/suite/rpl/t/rpl_sp004.test diff --git a/mysql-test/t/rpl_sp_effects-master.opt b/mysql-test/suite/rpl/t/rpl_sp_effects-master.opt similarity index 100% rename from mysql-test/t/rpl_sp_effects-master.opt rename to mysql-test/suite/rpl/t/rpl_sp_effects-master.opt diff --git a/mysql-test/t/rpl_sp_effects-slave.opt b/mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt similarity index 100% rename from mysql-test/t/rpl_sp_effects-slave.opt rename to mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt diff --git a/mysql-test/t/rpl_sp_effects.test b/mysql-test/suite/rpl/t/rpl_sp_effects.test similarity index 100% rename from mysql-test/t/rpl_sp_effects.test rename to mysql-test/suite/rpl/t/rpl_sp_effects.test diff --git a/mysql-test/t/rpl_sporadic_master-master.opt b/mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt similarity index 100% rename from mysql-test/t/rpl_sporadic_master-master.opt rename to mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt diff --git a/mysql-test/t/rpl_sporadic_master.test b/mysql-test/suite/rpl/t/rpl_sporadic_master.test similarity index 100% rename from mysql-test/t/rpl_sporadic_master.test rename to mysql-test/suite/rpl/t/rpl_sporadic_master.test diff --git a/mysql-test/t/rpl_ssl.test b/mysql-test/suite/rpl/t/rpl_ssl.test similarity index 100% rename from mysql-test/t/rpl_ssl.test rename to mysql-test/suite/rpl/t/rpl_ssl.test diff --git a/mysql-test/t/rpl_ssl1.test b/mysql-test/suite/rpl/t/rpl_ssl1.test similarity index 100% rename from mysql-test/t/rpl_ssl1.test rename to mysql-test/suite/rpl/t/rpl_ssl1.test diff --git a/mysql-test/t/rpl_start_stop_slave.test b/mysql-test/suite/rpl/t/rpl_start_stop_slave.test similarity index 100% rename from mysql-test/t/rpl_start_stop_slave.test rename to mysql-test/suite/rpl/t/rpl_start_stop_slave.test diff --git a/mysql-test/t/rpl_stm_000001-slave.opt b/mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt similarity index 100% rename from mysql-test/t/rpl_stm_000001-slave.opt rename to mysql-test/suite/rpl/t/rpl_stm_000001-slave.opt diff --git a/mysql-test/t/rpl_stm_000001.test b/mysql-test/suite/rpl/t/rpl_stm_000001.test similarity index 100% rename from mysql-test/t/rpl_stm_000001.test rename to mysql-test/suite/rpl/t/rpl_stm_000001.test diff --git a/mysql-test/t/rpl_stm_EE_err2.test b/mysql-test/suite/rpl/t/rpl_stm_EE_err2.test similarity index 100% rename from mysql-test/t/rpl_stm_EE_err2.test rename to mysql-test/suite/rpl/t/rpl_stm_EE_err2.test diff --git a/mysql-test/t/rpl_stm_charset.test b/mysql-test/suite/rpl/t/rpl_stm_charset.test similarity index 100% rename from mysql-test/t/rpl_stm_charset.test rename to mysql-test/suite/rpl/t/rpl_stm_charset.test diff --git a/mysql-test/t/rpl_stm_flsh_tbls.test b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test similarity index 100% rename from mysql-test/t/rpl_stm_flsh_tbls.test rename to mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test diff --git a/mysql-test/t/rpl_stm_insert_delayed.test b/mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test similarity index 100% rename from mysql-test/t/rpl_stm_insert_delayed.test rename to mysql-test/suite/rpl/t/rpl_stm_insert_delayed.test diff --git a/mysql-test/t/rpl_stm_log-master.opt b/mysql-test/suite/rpl/t/rpl_stm_log-master.opt similarity index 100% rename from mysql-test/t/rpl_stm_log-master.opt rename to mysql-test/suite/rpl/t/rpl_stm_log-master.opt diff --git a/mysql-test/t/rpl_stm_log-slave.opt b/mysql-test/suite/rpl/t/rpl_stm_log-slave.opt similarity index 100% rename from mysql-test/t/rpl_stm_log-slave.opt rename to mysql-test/suite/rpl/t/rpl_stm_log-slave.opt diff --git a/mysql-test/t/rpl_stm_log.test b/mysql-test/suite/rpl/t/rpl_stm_log.test similarity index 100% rename from mysql-test/t/rpl_stm_log.test rename to mysql-test/suite/rpl/t/rpl_stm_log.test diff --git a/mysql-test/t/rpl_stm_max_relay_size.test b/mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test similarity index 100% rename from mysql-test/t/rpl_stm_max_relay_size.test rename to mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test diff --git a/mysql-test/t/rpl_stm_multi_query.test b/mysql-test/suite/rpl/t/rpl_stm_multi_query.test similarity index 100% rename from mysql-test/t/rpl_stm_multi_query.test rename to mysql-test/suite/rpl/t/rpl_stm_multi_query.test diff --git a/mysql-test/t/rpl_stm_mystery22.test b/mysql-test/suite/rpl/t/rpl_stm_mystery22.test similarity index 100% rename from mysql-test/t/rpl_stm_mystery22.test rename to mysql-test/suite/rpl/t/rpl_stm_mystery22.test diff --git a/mysql-test/t/rpl_stm_no_op.test b/mysql-test/suite/rpl/t/rpl_stm_no_op.test similarity index 100% rename from mysql-test/t/rpl_stm_no_op.test rename to mysql-test/suite/rpl/t/rpl_stm_no_op.test diff --git a/mysql-test/t/rpl_stm_reset_slave.test b/mysql-test/suite/rpl/t/rpl_stm_reset_slave.test similarity index 100% rename from mysql-test/t/rpl_stm_reset_slave.test rename to mysql-test/suite/rpl/t/rpl_stm_reset_slave.test diff --git a/mysql-test/t/rpl_stm_until.test b/mysql-test/suite/rpl/t/rpl_stm_until.test similarity index 100% rename from mysql-test/t/rpl_stm_until.test rename to mysql-test/suite/rpl/t/rpl_stm_until.test diff --git a/mysql-test/t/rpl_switch_stm_row_mixed.test b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test similarity index 100% rename from mysql-test/t/rpl_switch_stm_row_mixed.test rename to mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test diff --git a/mysql-test/t/rpl_temp_table.test b/mysql-test/suite/rpl/t/rpl_temp_table.test similarity index 100% rename from mysql-test/t/rpl_temp_table.test rename to mysql-test/suite/rpl/t/rpl_temp_table.test diff --git a/mysql-test/t/rpl_temporary.test b/mysql-test/suite/rpl/t/rpl_temporary.test similarity index 100% rename from mysql-test/t/rpl_temporary.test rename to mysql-test/suite/rpl/t/rpl_temporary.test diff --git a/mysql-test/t/rpl_timezone-master.opt b/mysql-test/suite/rpl/t/rpl_timezone-master.opt similarity index 100% rename from mysql-test/t/rpl_timezone-master.opt rename to mysql-test/suite/rpl/t/rpl_timezone-master.opt diff --git a/mysql-test/t/rpl_timezone-slave.opt b/mysql-test/suite/rpl/t/rpl_timezone-slave.opt similarity index 100% rename from mysql-test/t/rpl_timezone-slave.opt rename to mysql-test/suite/rpl/t/rpl_timezone-slave.opt diff --git a/mysql-test/t/rpl_timezone.test b/mysql-test/suite/rpl/t/rpl_timezone.test similarity index 100% rename from mysql-test/t/rpl_timezone.test rename to mysql-test/suite/rpl/t/rpl_timezone.test diff --git a/mysql-test/t/rpl_trigger.test b/mysql-test/suite/rpl/t/rpl_trigger.test similarity index 100% rename from mysql-test/t/rpl_trigger.test rename to mysql-test/suite/rpl/t/rpl_trigger.test diff --git a/mysql-test/t/rpl_trunc_temp.test b/mysql-test/suite/rpl/t/rpl_trunc_temp.test similarity index 100% rename from mysql-test/t/rpl_trunc_temp.test rename to mysql-test/suite/rpl/t/rpl_trunc_temp.test diff --git a/mysql-test/t/rpl_truncate_2myisam.test b/mysql-test/suite/rpl/t/rpl_truncate_2myisam.test similarity index 100% rename from mysql-test/t/rpl_truncate_2myisam.test rename to mysql-test/suite/rpl/t/rpl_truncate_2myisam.test diff --git a/mysql-test/t/rpl_truncate_3innodb.test b/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test similarity index 100% rename from mysql-test/t/rpl_truncate_3innodb.test rename to mysql-test/suite/rpl/t/rpl_truncate_3innodb.test diff --git a/mysql-test/t/rpl_truncate_7ndb_2-master.opt b/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt similarity index 100% rename from mysql-test/t/rpl_truncate_7ndb_2-master.opt rename to mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt diff --git a/mysql-test/t/rpl_truncate_7ndb_2.test b/mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test similarity index 100% rename from mysql-test/t/rpl_truncate_7ndb_2.test rename to mysql-test/suite/rpl/t/rpl_truncate_7ndb_2.test diff --git a/mysql-test/t/rpl_udf-master.opt b/mysql-test/suite/rpl/t/rpl_udf-master.opt similarity index 100% rename from mysql-test/t/rpl_udf-master.opt rename to mysql-test/suite/rpl/t/rpl_udf-master.opt diff --git a/mysql-test/t/rpl_udf-slave.opt b/mysql-test/suite/rpl/t/rpl_udf-slave.opt similarity index 100% rename from mysql-test/t/rpl_udf-slave.opt rename to mysql-test/suite/rpl/t/rpl_udf-slave.opt diff --git a/mysql-test/t/rpl_udf.test b/mysql-test/suite/rpl/t/rpl_udf.test similarity index 100% rename from mysql-test/t/rpl_udf.test rename to mysql-test/suite/rpl/t/rpl_udf.test diff --git a/mysql-test/t/rpl_user_variables.test b/mysql-test/suite/rpl/t/rpl_user_variables.test similarity index 100% rename from mysql-test/t/rpl_user_variables.test rename to mysql-test/suite/rpl/t/rpl_user_variables.test diff --git a/mysql-test/t/rpl_variables-master.opt b/mysql-test/suite/rpl/t/rpl_variables-master.opt similarity index 100% rename from mysql-test/t/rpl_variables-master.opt rename to mysql-test/suite/rpl/t/rpl_variables-master.opt diff --git a/mysql-test/t/rpl_variables.test b/mysql-test/suite/rpl/t/rpl_variables.test similarity index 100% rename from mysql-test/t/rpl_variables.test rename to mysql-test/suite/rpl/t/rpl_variables.test diff --git a/mysql-test/t/rpl_view-slave.opt b/mysql-test/suite/rpl/t/rpl_view-slave.opt similarity index 100% rename from mysql-test/t/rpl_view-slave.opt rename to mysql-test/suite/rpl/t/rpl_view-slave.opt diff --git a/mysql-test/t/rpl_view.test b/mysql-test/suite/rpl/t/rpl_view.test similarity index 100% rename from mysql-test/t/rpl_view.test rename to mysql-test/suite/rpl/t/rpl_view.test diff --git a/mysql-test/r/rpl_ndb_2innodb.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result similarity index 100% rename from mysql-test/r/rpl_ndb_2innodb.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result diff --git a/mysql-test/r/rpl_ndb_2myisam.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result similarity index 100% rename from mysql-test/r/rpl_ndb_2myisam.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result diff --git a/mysql-test/r/rpl_ndb_UUID.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result similarity index 100% rename from mysql-test/r/rpl_ndb_UUID.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result diff --git a/mysql-test/r/rpl_ndb_auto_inc.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result similarity index 100% rename from mysql-test/r/rpl_ndb_auto_inc.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result diff --git a/mysql-test/r/rpl_ndb_bank.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result similarity index 100% rename from mysql-test/r/rpl_ndb_bank.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result diff --git a/mysql-test/r/rpl_ndb_basic.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result similarity index 100% rename from mysql-test/r/rpl_ndb_basic.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result diff --git a/mysql-test/r/rpl_ndb_blob.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result similarity index 100% rename from mysql-test/r/rpl_ndb_blob.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result diff --git a/mysql-test/r/rpl_ndb_blob2.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result similarity index 100% rename from mysql-test/r/rpl_ndb_blob2.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_blob2.result diff --git a/mysql-test/r/rpl_ndb_charset.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result similarity index 100% rename from mysql-test/r/rpl_ndb_charset.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result diff --git a/mysql-test/r/rpl_ndb_circular.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result similarity index 100% rename from mysql-test/r/rpl_ndb_circular.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result diff --git a/mysql-test/r/rpl_ndb_circular_simplex.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result similarity index 100% rename from mysql-test/r/rpl_ndb_circular_simplex.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result diff --git a/mysql-test/r/rpl_ndb_commit_afterflush.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result similarity index 100% rename from mysql-test/r/rpl_ndb_commit_afterflush.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_commit_afterflush.result diff --git a/mysql-test/r/rpl_ndb_dd_advance.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result similarity index 100% rename from mysql-test/r/rpl_ndb_dd_advance.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result diff --git a/mysql-test/r/rpl_ndb_dd_basic.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result similarity index 100% rename from mysql-test/r/rpl_ndb_dd_basic.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result diff --git a/mysql-test/r/rpl_ndb_dd_partitions.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result similarity index 100% rename from mysql-test/r/rpl_ndb_dd_partitions.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result diff --git a/mysql-test/r/rpl_ndb_ddl.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result similarity index 100% rename from mysql-test/r/rpl_ndb_ddl.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_ddl.result diff --git a/mysql-test/r/rpl_ndb_delete_nowhere.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result similarity index 100% rename from mysql-test/r/rpl_ndb_delete_nowhere.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_delete_nowhere.result diff --git a/mysql-test/r/rpl_ndb_do_db.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result similarity index 100% rename from mysql-test/r/rpl_ndb_do_db.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result diff --git a/mysql-test/r/rpl_ndb_do_table.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result similarity index 100% rename from mysql-test/r/rpl_ndb_do_table.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result diff --git a/mysql-test/r/rpl_ndb_extraCol.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result similarity index 100% rename from mysql-test/r/rpl_ndb_extraCol.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result diff --git a/mysql-test/r/rpl_ndb_func003.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result similarity index 100% rename from mysql-test/r/rpl_ndb_func003.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_func003.result diff --git a/mysql-test/r/rpl_ndb_idempotent.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result similarity index 100% rename from mysql-test/r/rpl_ndb_idempotent.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result diff --git a/mysql-test/r/rpl_ndb_innodb_trans.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result similarity index 100% rename from mysql-test/r/rpl_ndb_innodb_trans.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result diff --git a/mysql-test/r/rpl_ndb_insert_ignore.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result similarity index 100% rename from mysql-test/r/rpl_ndb_insert_ignore.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_insert_ignore.result diff --git a/mysql-test/r/rpl_ndb_load.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result similarity index 100% rename from mysql-test/r/rpl_ndb_load.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result diff --git a/mysql-test/r/rpl_ndb_log.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result similarity index 100% rename from mysql-test/r/rpl_ndb_log.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result diff --git a/mysql-test/r/rpl_ndb_multi.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result similarity index 100% rename from mysql-test/r/rpl_ndb_multi.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result diff --git a/mysql-test/r/rpl_ndb_multi_update2.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result similarity index 100% rename from mysql-test/r/rpl_ndb_multi_update2.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update2.result diff --git a/mysql-test/r/rpl_ndb_multi_update3.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result similarity index 100% rename from mysql-test/r/rpl_ndb_multi_update3.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_multi_update3.result diff --git a/mysql-test/r/rpl_ndb_relayrotate.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result similarity index 100% rename from mysql-test/r/rpl_ndb_relayrotate.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_relayrotate.result diff --git a/mysql-test/r/rpl_ndb_rep_ignore.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result similarity index 100% rename from mysql-test/r/rpl_ndb_rep_ignore.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result diff --git a/mysql-test/r/rpl_ndb_row_001.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result similarity index 100% rename from mysql-test/r/rpl_ndb_row_001.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result diff --git a/mysql-test/r/rpl_ndb_sp003.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result similarity index 100% rename from mysql-test/r/rpl_ndb_sp003.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_sp003.result diff --git a/mysql-test/r/rpl_ndb_sp006.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result similarity index 100% rename from mysql-test/r/rpl_ndb_sp006.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result diff --git a/mysql-test/r/rpl_ndb_stm_innodb.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result similarity index 100% rename from mysql-test/r/rpl_ndb_stm_innodb.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result diff --git a/mysql-test/r/rpl_ndb_sync.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result similarity index 100% rename from mysql-test/r/rpl_ndb_sync.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result diff --git a/mysql-test/r/rpl_ndb_trig004.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result similarity index 100% rename from mysql-test/r/rpl_ndb_trig004.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndb_trig004.result diff --git a/mysql-test/r/rpl_ndbapi_multi.result b/mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result similarity index 100% rename from mysql-test/r/rpl_ndbapi_multi.result rename to mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result diff --git a/mysql-test/r/rpl_row_basic_7ndb.result b/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result similarity index 100% rename from mysql-test/r/rpl_row_basic_7ndb.result rename to mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result diff --git a/mysql-test/r/rpl_truncate_7ndb.result b/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result similarity index 100% rename from mysql-test/r/rpl_truncate_7ndb.result rename to mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result diff --git a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def new file mode 100644 index 00000000000..b238c8ac9c5 --- /dev/null +++ b/mysql-test/suite/rpl_ndb/t/disabled.def @@ -0,0 +1,27 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# : BUG# +# +# Do not use any TAB characters for whitespace. +# +############################################################################## + + +rpl_ndb_circular_simplex : BUG#27972 2007-04-20 mats Slave cannot start where it stopped +rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated +rpl_ndb_2myisam : BUG#19227 Seems to pass currently +rpl_ndb_dd_partitions : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD +rpl_ddl : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master +rpl_ndb_innodb2ndb : Bug #19710 Cluster replication to partition table fails on DELETE FROM statement +rpl_ndb_myisam2ndb : Bug #19710 Cluster replication to partition table fails on DELETE FROM statement +#rpl_row_blob_innodb : BUG#18980 2006-04-10 kent Test fails randomly +rpl_ndb_ddl : BUG#28798 2007-05-31 lars Valgrind failure in NDB + + +# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open + +#rpl_ndb_dd_advance : Bug#25913 rpl_ndb_dd_advance fails randomly diff --git a/mysql-test/t/rpl_ndb_2innodb-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt similarity index 100% rename from mysql-test/t/rpl_ndb_2innodb-master.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt diff --git a/mysql-test/t/rpl_ndb_2innodb-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt similarity index 100% rename from mysql-test/t/rpl_ndb_2innodb-slave.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt diff --git a/mysql-test/t/rpl_ndb_2innodb.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test similarity index 100% rename from mysql-test/t/rpl_ndb_2innodb.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test diff --git a/mysql-test/t/rpl_ndb_2myisam-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt similarity index 100% rename from mysql-test/t/rpl_ndb_2myisam-master.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt diff --git a/mysql-test/t/rpl_ndb_2myisam-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt similarity index 100% rename from mysql-test/t/rpl_ndb_2myisam-slave.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt diff --git a/mysql-test/t/rpl_ndb_2myisam.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test similarity index 100% rename from mysql-test/t/rpl_ndb_2myisam.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test diff --git a/mysql-test/t/rpl_ndb_UUID.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test similarity index 100% rename from mysql-test/t/rpl_ndb_UUID.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test diff --git a/mysql-test/t/rpl_ndb_auto_inc.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test similarity index 100% rename from mysql-test/t/rpl_ndb_auto_inc.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test diff --git a/mysql-test/t/rpl_ndb_bank.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test similarity index 100% rename from mysql-test/t/rpl_ndb_bank.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test diff --git a/mysql-test/t/rpl_ndb_basic.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test similarity index 100% rename from mysql-test/t/rpl_ndb_basic.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test diff --git a/mysql-test/t/rpl_ndb_blob.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test similarity index 100% rename from mysql-test/t/rpl_ndb_blob.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test diff --git a/mysql-test/t/rpl_ndb_blob2.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test similarity index 100% rename from mysql-test/t/rpl_ndb_blob2.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test diff --git a/mysql-test/t/rpl_ndb_charset.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test similarity index 100% rename from mysql-test/t/rpl_ndb_charset.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test diff --git a/mysql-test/t/rpl_ndb_circular.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test similarity index 100% rename from mysql-test/t/rpl_ndb_circular.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test diff --git a/mysql-test/t/rpl_ndb_circular_simplex.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test similarity index 100% rename from mysql-test/t/rpl_ndb_circular_simplex.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test diff --git a/mysql-test/t/rpl_ndb_commit_afterflush.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test similarity index 100% rename from mysql-test/t/rpl_ndb_commit_afterflush.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test diff --git a/mysql-test/t/rpl_ndb_dd_advance.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test similarity index 100% rename from mysql-test/t/rpl_ndb_dd_advance.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test diff --git a/mysql-test/t/rpl_ndb_dd_basic.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test similarity index 100% rename from mysql-test/t/rpl_ndb_dd_basic.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test diff --git a/mysql-test/t/rpl_ndb_dd_partitions.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test similarity index 100% rename from mysql-test/t/rpl_ndb_dd_partitions.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test diff --git a/mysql-test/t/rpl_ndb_ddl.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test similarity index 100% rename from mysql-test/t/rpl_ndb_ddl.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test diff --git a/mysql-test/t/rpl_ndb_delete_nowhere.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test similarity index 100% rename from mysql-test/t/rpl_ndb_delete_nowhere.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test diff --git a/mysql-test/t/rpl_ndb_do_db-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt similarity index 100% rename from mysql-test/t/rpl_ndb_do_db-slave.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt diff --git a/mysql-test/t/rpl_ndb_do_db.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test similarity index 100% rename from mysql-test/t/rpl_ndb_do_db.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test diff --git a/mysql-test/t/rpl_ndb_do_table-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt similarity index 100% rename from mysql-test/t/rpl_ndb_do_table-slave.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt diff --git a/mysql-test/t/rpl_ndb_do_table.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test similarity index 100% rename from mysql-test/t/rpl_ndb_do_table.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test diff --git a/mysql-test/t/rpl_ndb_extraCol.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test similarity index 100% rename from mysql-test/t/rpl_ndb_extraCol.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_extraCol.test diff --git a/mysql-test/t/rpl_ndb_func003.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test similarity index 100% rename from mysql-test/t/rpl_ndb_func003.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test diff --git a/mysql-test/t/rpl_ndb_idempotent.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test similarity index 100% rename from mysql-test/t/rpl_ndb_idempotent.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test diff --git a/mysql-test/t/rpl_ndb_innodb2ndb-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt similarity index 100% rename from mysql-test/t/rpl_ndb_innodb2ndb-master.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt diff --git a/mysql-test/t/rpl_ndb_innodb2ndb-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt similarity index 100% rename from mysql-test/t/rpl_ndb_innodb2ndb-slave.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt diff --git a/mysql-test/t/rpl_ndb_innodb2ndb.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test similarity index 100% rename from mysql-test/t/rpl_ndb_innodb2ndb.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test diff --git a/mysql-test/t/rpl_ndb_innodb_trans-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt similarity index 100% rename from mysql-test/t/rpl_ndb_innodb_trans-slave.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt diff --git a/mysql-test/t/rpl_ndb_innodb_trans.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test similarity index 100% rename from mysql-test/t/rpl_ndb_innodb_trans.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test diff --git a/mysql-test/t/rpl_ndb_insert_ignore.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test similarity index 100% rename from mysql-test/t/rpl_ndb_insert_ignore.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test diff --git a/mysql-test/t/rpl_ndb_load.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test similarity index 100% rename from mysql-test/t/rpl_ndb_load.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test diff --git a/mysql-test/t/rpl_ndb_log-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_log-master.opt similarity index 100% rename from mysql-test/t/rpl_ndb_log-master.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_log-master.opt diff --git a/mysql-test/t/rpl_ndb_log.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test similarity index 100% rename from mysql-test/t/rpl_ndb_log.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_log.test diff --git a/mysql-test/t/rpl_ndb_multi.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test similarity index 100% rename from mysql-test/t/rpl_ndb_multi.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test diff --git a/mysql-test/t/rpl_ndb_multi_update2-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt similarity index 100% rename from mysql-test/t/rpl_ndb_multi_update2-slave.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt diff --git a/mysql-test/t/rpl_ndb_multi_update2.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test similarity index 100% rename from mysql-test/t/rpl_ndb_multi_update2.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test diff --git a/mysql-test/t/rpl_ndb_multi_update3.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test similarity index 100% rename from mysql-test/t/rpl_ndb_multi_update3.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test diff --git a/mysql-test/t/rpl_ndb_myisam2ndb-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt similarity index 100% rename from mysql-test/t/rpl_ndb_myisam2ndb-master.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-master.opt diff --git a/mysql-test/t/rpl_ndb_myisam2ndb-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt similarity index 100% rename from mysql-test/t/rpl_ndb_myisam2ndb-slave.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt diff --git a/mysql-test/t/rpl_ndb_myisam2ndb.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test similarity index 100% rename from mysql-test/t/rpl_ndb_myisam2ndb.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test diff --git a/mysql-test/t/rpl_ndb_relayrotate-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt similarity index 100% rename from mysql-test/t/rpl_ndb_relayrotate-slave.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt diff --git a/mysql-test/t/rpl_ndb_relayrotate.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test similarity index 100% rename from mysql-test/t/rpl_ndb_relayrotate.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test diff --git a/mysql-test/t/rpl_ndb_rep_ignore-slave.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt similarity index 100% rename from mysql-test/t/rpl_ndb_rep_ignore-slave.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt diff --git a/mysql-test/t/rpl_ndb_rep_ignore.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test similarity index 100% rename from mysql-test/t/rpl_ndb_rep_ignore.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test diff --git a/mysql-test/t/rpl_ndb_row_001.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test similarity index 100% rename from mysql-test/t/rpl_ndb_row_001.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test diff --git a/mysql-test/t/rpl_ndb_sp003.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test similarity index 100% rename from mysql-test/t/rpl_ndb_sp003.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test diff --git a/mysql-test/t/rpl_ndb_sp006.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test similarity index 100% rename from mysql-test/t/rpl_ndb_sp006.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test diff --git a/mysql-test/t/rpl_ndb_stm_innodb-master.opt b/mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt similarity index 100% rename from mysql-test/t/rpl_ndb_stm_innodb-master.opt rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt diff --git a/mysql-test/t/rpl_ndb_stm_innodb.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test similarity index 100% rename from mysql-test/t/rpl_ndb_stm_innodb.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test diff --git a/mysql-test/t/rpl_ndb_sync.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test similarity index 100% rename from mysql-test/t/rpl_ndb_sync.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test diff --git a/mysql-test/t/rpl_ndb_trig004.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test similarity index 100% rename from mysql-test/t/rpl_ndb_trig004.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test diff --git a/mysql-test/t/rpl_ndbapi_multi.test b/mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test similarity index 100% rename from mysql-test/t/rpl_ndbapi_multi.test rename to mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test diff --git a/mysql-test/t/rpl_row_basic_7ndb.test b/mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test similarity index 100% rename from mysql-test/t/rpl_row_basic_7ndb.test rename to mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test diff --git a/mysql-test/t/rpl_truncate_7ndb.test b/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test similarity index 100% rename from mysql-test/t/rpl_truncate_7ndb.test rename to mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 27e3b9bc614..31ff0d58477 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -21,29 +21,6 @@ im_instance_conf : BUG#28743 Instance manager generates warnings in test im_utils : BUG#28743 Instance manager generates warnings in test suite concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences -ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog -ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog -ndb_load : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed - -partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table -rpl_ndb_circular_simplex : BUG#27972 2007-04-20 mats Slave cannot start where it stopped -rpl_ndb_2innodb : BUG#19227 2006-04-20 pekka pk delete apparently not replicated -rpl_ndb_2myisam : BUG#19227 Seems to pass currently -rpl_ndb_dd_partitions : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD -rpl_ddl : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master -rpl_ndb_innodb2ndb : Bug #19710 Cluster replication to partition table fails on DELETE FROM statement -rpl_ndb_myisam2ndb : Bug #19710 Cluster replication to partition table fails on DELETE FROM statement -#rpl_row_blob_innodb : BUG#18980 2006-04-10 kent Test fails randomly -rpl_ndb_ddl : BUG#28798 2007-05-31 lars Valgrind failure in NDB - -# the below testcase have been reworked to avoid the bug, test contains comment, keep bug open -#ndb_binlog_ddl_multi : BUG#18976 2006-04-10 kent CRBR: multiple binlog, second binlog may miss schema log events -#ndb_binlog_discover : bug#21806 2006-08-24 -#ndb_autodiscover3 : bug#21806 - -#rpl_ndb_dd_advance : Bug#25913 rpl_ndb_dd_advance fails randomly - -ndb_partition_error2 : HF is not sure if the test can work as internded on all the platforms im_options_set : Bug#20294: Instance manager tests fail randomly im_options_unset : Bug#20294: Instance manager tests fail randomly From e86225b908ebf9d648a18bb3fe4d0795b1420136 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Wed, 27 Jun 2007 16:49:32 +0200 Subject: [PATCH 19/38] Move disabling of rpl_invoked_features to suite/rpl/t/disabled.def Move tests to their respective suite --- mysql-test/{ => suite/binlog}/r/binlog_innodb.result | 0 mysql-test/{ => suite/binlog}/r/binlog_multi_engine.result | 0 mysql-test/{ => suite/binlog}/t/binlog_innodb.test | 0 mysql-test/{ => suite/binlog}/t/binlog_multi_engine.test | 0 mysql-test/{ => suite/rpl}/r/rpl_grant.result | 0 mysql-test/{ => suite/rpl}/r/rpl_invoked_features.result | 0 mysql-test/{ => suite/rpl}/r/rpl_loaddata_fatal.result | 0 mysql-test/{ => suite/rpl}/r/rpl_slave_skip.result | 0 mysql-test/suite/rpl/t/disabled.def | 1 + mysql-test/{ => suite/rpl}/t/rpl_grant.test | 0 mysql-test/{ => suite/rpl}/t/rpl_invoked_features-master.opt | 0 mysql-test/{ => suite/rpl}/t/rpl_invoked_features-slave.opt | 0 mysql-test/{ => suite/rpl}/t/rpl_invoked_features.test | 0 mysql-test/{ => suite/rpl}/t/rpl_loaddata_fatal-slave.opt | 0 mysql-test/{ => suite/rpl}/t/rpl_loaddata_fatal.test | 0 mysql-test/{ => suite/rpl}/t/rpl_slave_skip.test | 0 mysql-test/t/disabled.def | 1 - 17 files changed, 1 insertion(+), 1 deletion(-) rename mysql-test/{ => suite/binlog}/r/binlog_innodb.result (100%) rename mysql-test/{ => suite/binlog}/r/binlog_multi_engine.result (100%) rename mysql-test/{ => suite/binlog}/t/binlog_innodb.test (100%) rename mysql-test/{ => suite/binlog}/t/binlog_multi_engine.test (100%) rename mysql-test/{ => suite/rpl}/r/rpl_grant.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_invoked_features.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_loaddata_fatal.result (100%) rename mysql-test/{ => suite/rpl}/r/rpl_slave_skip.result (100%) rename mysql-test/{ => suite/rpl}/t/rpl_grant.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_invoked_features-master.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_invoked_features-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_invoked_features.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_loaddata_fatal-slave.opt (100%) rename mysql-test/{ => suite/rpl}/t/rpl_loaddata_fatal.test (100%) rename mysql-test/{ => suite/rpl}/t/rpl_slave_skip.test (100%) diff --git a/mysql-test/r/binlog_innodb.result b/mysql-test/suite/binlog/r/binlog_innodb.result similarity index 100% rename from mysql-test/r/binlog_innodb.result rename to mysql-test/suite/binlog/r/binlog_innodb.result diff --git a/mysql-test/r/binlog_multi_engine.result b/mysql-test/suite/binlog/r/binlog_multi_engine.result similarity index 100% rename from mysql-test/r/binlog_multi_engine.result rename to mysql-test/suite/binlog/r/binlog_multi_engine.result diff --git a/mysql-test/t/binlog_innodb.test b/mysql-test/suite/binlog/t/binlog_innodb.test similarity index 100% rename from mysql-test/t/binlog_innodb.test rename to mysql-test/suite/binlog/t/binlog_innodb.test diff --git a/mysql-test/t/binlog_multi_engine.test b/mysql-test/suite/binlog/t/binlog_multi_engine.test similarity index 100% rename from mysql-test/t/binlog_multi_engine.test rename to mysql-test/suite/binlog/t/binlog_multi_engine.test diff --git a/mysql-test/r/rpl_grant.result b/mysql-test/suite/rpl/r/rpl_grant.result similarity index 100% rename from mysql-test/r/rpl_grant.result rename to mysql-test/suite/rpl/r/rpl_grant.result diff --git a/mysql-test/r/rpl_invoked_features.result b/mysql-test/suite/rpl/r/rpl_invoked_features.result similarity index 100% rename from mysql-test/r/rpl_invoked_features.result rename to mysql-test/suite/rpl/r/rpl_invoked_features.result diff --git a/mysql-test/r/rpl_loaddata_fatal.result b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result similarity index 100% rename from mysql-test/r/rpl_loaddata_fatal.result rename to mysql-test/suite/rpl/r/rpl_loaddata_fatal.result diff --git a/mysql-test/r/rpl_slave_skip.result b/mysql-test/suite/rpl/r/rpl_slave_skip.result similarity index 100% rename from mysql-test/r/rpl_slave_skip.result rename to mysql-test/suite/rpl/r/rpl_slave_skip.result diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def index 180a700acaf..fda40c30340 100644 --- a/mysql-test/suite/rpl/t/disabled.def +++ b/mysql-test/suite/rpl/t/disabled.def @@ -13,3 +13,4 @@ rpl_ddl : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master rpl_innodb_mixed_ddl : Bug #29363 rpl.rpl_innodb_mixed_* test failures rpl_innodb_mixed_dml : Bug #29363 rpl.rpl_innodb_mixed_* test failures +rpl_invoked_features : BUG#29020 2007-06-21 Lars Non-deterministic test case diff --git a/mysql-test/t/rpl_grant.test b/mysql-test/suite/rpl/t/rpl_grant.test similarity index 100% rename from mysql-test/t/rpl_grant.test rename to mysql-test/suite/rpl/t/rpl_grant.test diff --git a/mysql-test/t/rpl_invoked_features-master.opt b/mysql-test/suite/rpl/t/rpl_invoked_features-master.opt similarity index 100% rename from mysql-test/t/rpl_invoked_features-master.opt rename to mysql-test/suite/rpl/t/rpl_invoked_features-master.opt diff --git a/mysql-test/t/rpl_invoked_features-slave.opt b/mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt similarity index 100% rename from mysql-test/t/rpl_invoked_features-slave.opt rename to mysql-test/suite/rpl/t/rpl_invoked_features-slave.opt diff --git a/mysql-test/t/rpl_invoked_features.test b/mysql-test/suite/rpl/t/rpl_invoked_features.test similarity index 100% rename from mysql-test/t/rpl_invoked_features.test rename to mysql-test/suite/rpl/t/rpl_invoked_features.test diff --git a/mysql-test/t/rpl_loaddata_fatal-slave.opt b/mysql-test/suite/rpl/t/rpl_loaddata_fatal-slave.opt similarity index 100% rename from mysql-test/t/rpl_loaddata_fatal-slave.opt rename to mysql-test/suite/rpl/t/rpl_loaddata_fatal-slave.opt diff --git a/mysql-test/t/rpl_loaddata_fatal.test b/mysql-test/suite/rpl/t/rpl_loaddata_fatal.test similarity index 100% rename from mysql-test/t/rpl_loaddata_fatal.test rename to mysql-test/suite/rpl/t/rpl_loaddata_fatal.test diff --git a/mysql-test/t/rpl_slave_skip.test b/mysql-test/suite/rpl/t/rpl_slave_skip.test similarity index 100% rename from mysql-test/t/rpl_slave_skip.test rename to mysql-test/suite/rpl/t/rpl_slave_skip.test diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 61d81811ec1..5d31a8060e8 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -21,7 +21,6 @@ im_instance_conf : BUG#28743 Instance manager generates warnings in test im_utils : BUG#28743 Instance manager generates warnings in test suite innodb : Disabling test case awaiting reply from Innobase concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences -rpl_invoked_features : BUG#29020 2007-06-21 Lars Non-deterministic test case ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper From b9d2e744b0a5ffe20ac347318621761fbc60246d Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Wed, 27 Jun 2007 18:21:20 +0200 Subject: [PATCH 20/38] Change "exec rm" to "remove_file" --- mysql-test/include/have_outfile.inc | 2 +- mysql-test/t/sp.test | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mysql-test/include/have_outfile.inc b/mysql-test/include/have_outfile.inc index 10f093ec3ef..ae4a2723840 100644 --- a/mysql-test/include/have_outfile.inc +++ b/mysql-test/include/have_outfile.inc @@ -1,5 +1,5 @@ -- require r/have_outfile.require disable_query_log; select load_file(concat(@tmpdir,"/outfile.test")); ---exec rm $MYSQLTEST_VARDIR/tmp/outfile.test +--remove_file $MYSQLTEST_VARDIR/tmp/outfile.test enable_query_log; diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test index c94a526e10c..460c10d88d0 100644 --- a/mysql-test/t/sp.test +++ b/mysql-test/t/sp.test @@ -705,9 +705,11 @@ begin insert into test.t1 values (concat(x, "2"), y+2); end| ---system rm -f $MYSQLTEST_VARDIR/tmp/spout +# Check that file does not exists +--error 1 +--file_exists $MYSQLTEST_VARDIR/tmp/spout call into_outfile("ofile", 1)| ---system rm -f $MYSQLTEST_VARDIR/tmp/spout +--remove_file $MYSQLTEST_VARDIR/tmp/spout delete from t1| drop procedure into_outfile| @@ -722,9 +724,11 @@ begin insert into test.t1 values (concat(x, "2"), y+2); end| ---system rm -f $MYSQLTEST_VARDIR/tmp/spdump +# Check that file does not exists +--error 1 +--file_exists $MYSQLTEST_VARDIR/tmp/spdump call into_dumpfile("dfile", 1)| ---system rm -f $MYSQLTEST_VARDIR/tmp/spdump +--remove_file $MYSQLTEST_VARDIR/tmp/spdump delete from t1| drop procedure into_dumpfile| From 78349b2494fb1f00bfb58e29da776f84d9e52add Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Thu, 28 Jun 2007 11:13:18 +0200 Subject: [PATCH 21/38] Bug#29414 HPUX build fails - 'noinst_HEADERS' does not exist --- sql/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/Makefile.am b/sql/Makefile.am index fae35222128..52a4c96f451 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -43,8 +43,7 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ @innodb_system_libs@ \ @ndbcluster_libs@ @ndbcluster_system_libs@ \ $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ - $(yassl_libs) $(openssl_libs) \ - @MYSQLD_EXTRA_LIBS@ + $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h item_uniq.h \ From 119f6cb0002115198631ed1cfb9eb4d21f5002d6 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Thu, 28 Jun 2007 11:18:15 +0200 Subject: [PATCH 22/38] WL#3933 Split main test suite to rpl, rpl_ndb and ndb - Cleaup Makefile.am in mysql-test making it easier to add new test files and suite directories --- mysql-test/Makefile.am | 126 +++++++---------------------------------- 1 file changed, 21 insertions(+), 105 deletions(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 0a6dbc3663a..549a9b8ac7d 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -18,125 +18,41 @@ ## Process this file with automake to create Makefile.in SUBDIRS = ndb -DIST_SUBDIRS=ndb -benchdir_root= $(prefix) -testdir = $(benchdir_root)/mysql-test -EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh \ - valgrind.supp $(PRESCRIPTS) -EXTRA_DIST = $(EXTRA_SCRIPTS) suite -GENSCRIPTS = mysql-test-run-shell install_test_db mtr mysql-test-run PRESCRIPTS = mysql-test-run.pl + +GENSCRIPTS = mysql-test-run-shell \ + install_test_db \ + mtr \ + mysql-test-run + +EXTRA_SCRIPTS = mysql-test-run-shell.sh \ + install_test_db.sh \ + valgrind.supp $(PRESCRIPTS) + +EXTRA_DIST_DIRS = t r include lib std_data suite extra + +EXTRA_DIST = $(EXTRA_DIST_DIRS) $(EXTRA_SCRIPTS) README + test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) -test_DATA = std_data/client-key.pem std_data/client-cert.pem \ - std_data/cacert.pem std_data/server-cert.pem \ - std_data/server-key.pem + CLEANFILES = $(GENSCRIPTS) -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. - - -dist-hook: - mkdir -p \ - $(distdir)/t \ - $(distdir)/extra/binlog_tests \ - $(distdir)/extra/rpl_tests \ - $(distdir)/r \ - $(distdir)/include \ - $(distdir)/std_data \ - $(distdir)/std_data/ndb_backup50 \ - $(distdir)/std_data/ndb_backup51 \ - $(distdir)/lib - -$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t - -$(INSTALL_DATA) $(srcdir)/t/*.imtest $(distdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t - -$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.slave-mi $(distdir)/t - $(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(distdir)/t - $(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.test $(distdir)/extra/binlog_tests - $(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.test $(distdir)/extra/rpl_tests - -$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(distdir)/extra/binlog_tests - -$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.opt $(distdir)/extra/rpl_tests - $(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include - $(INSTALL_DATA) $(srcdir)/include/*.test $(distdir)/include - $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r - $(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/Index.xml $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.pem $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.frm $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(distdir)/std_data/ndb_backup50 - $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(distdir)/std_data/ndb_backup51 - $(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib - -rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock - -install-data-local: - $(mkinstalldirs) \ - $(DESTDIR)$(testdir)/t \ - $(DESTDIR)$(testdir)/extra/binlog_tests \ - $(DESTDIR)$(testdir)/extra/rpl_tests \ - $(DESTDIR)$(testdir)/r \ - $(DESTDIR)$(testdir)/include \ - $(DESTDIR)$(testdir)/std_data \ - $(DESTDIR)$(testdir)/std_data/ndb_backup50 \ - $(DESTDIR)$(testdir)/std_data/ndb_backup51 \ - $(DESTDIR)$(testdir)/lib - $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir) - -$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t - -$(INSTALL_DATA) $(srcdir)/t/*.imtest $(DESTDIR)$(testdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.sql $(DESTDIR)$(testdir)/t - -$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t - $(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t - $(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r - $(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r - $(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.test $(DESTDIR)$(testdir)/extra/binlog_tests - $(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.test $(DESTDIR)$(testdir)/extra/rpl_tests - -$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(DESTDIR)$(testdir)/extra/binlog_tests - -$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.opt $(DESTDIR)$(testdir)/extra/rpl_tests - $(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include - $(INSTALL_DATA) $(srcdir)/include/*.test $(DESTDIR)$(testdir)/include - $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/Index.xml $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.frm $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data - $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50 - $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51 - $(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib - for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \ - do \ - d=$(DESTDIR)$(testdir)/`dirname $$f`; \ - mkdir -p $$d ; \ - $(INSTALL_DATA) $(srcdir)/$$f $$d ; \ - done - -uninstall-local: - @RM@ -f -r $(DESTDIR)$(testdir) # mtr - a shortcut for executing mysql-test-run.pl mtr: - $(RM) -f mtr - $(LN_S) mysql-test-run.pl mtr + @RM@ -f mtr + @LN_S@ mysql-test-run.pl mtr # mysql-test-run - a shortcut for executing mysql-test-run.pl mysql-test-run: - $(RM) -f mysql-test-run - $(LN_S) mysql-test-run.pl mysql-test-run + @RM@ -f mysql-test-run + @LN_S@ mysql-test-run.pl mysql-test-run SUFFIXES = .sh +testdir = $(prefix)/mysql-test + .sh: @RM@ -f $@ $@-t @SED@ \ From a1a1dbc753f2dff31bd6e8c9e787658343ba6714 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Thu, 28 Jun 2007 11:23:59 +0200 Subject: [PATCH 23/38] Bug#29361 mysqldump creates stray file when too long path name is passed - Move the check of too long path to 'get_one_option' --- client/mysqldump.c | 23 ++++++++++++----------- mysql-test/r/mysqldump.result | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/client/mysqldump.c b/client/mysqldump.c index fc461a5f559..1a024a923f5 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -686,6 +686,18 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), break; case 'T': opt_disable_keys=0; + + if (strlen(argument) >= FN_REFLEN) + { + /* + This check is made because the some the file functions below + have FN_REFLEN sized stack allocated buffers and will cause + a crash even if the input destination buffer is large enough + to hold the output. + */ + die(EX_USAGE, "Input filename too long: %s", argument); + } + break; case '#': DBUG_PUSH(argument ? argument : default_dbug_option); @@ -2324,17 +2336,6 @@ static void dump_table(char *table, char *db) { char filename[FN_REFLEN], tmp_path[FN_REFLEN]; - if (strlen(path) >= FN_REFLEN) - { - /* - This check is made because the some the file functions below - have FN_REFLEN sized stack allocated buffers and will cause - a crash even if the input destination buffer is large enough - to hold the output. - */ - die(EX_USAGE, "Input filename or options too long: %s", path); - } - /* Convert the path to native os format and resolve to the full filepath. diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 7865148905e..8eac7c7e715 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -3206,7 +3206,7 @@ DROP TABLE t1; # CREATE TABLE t1(a int); INSERT INTO t1 VALUES (1), (2); -mysqldump: Input filename or options too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +mysqldump: Input filename too long: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa DROP TABLE t1; CREATE TABLE t2 (a int); CREATE TABLE t3 (a int); From f4b9d297947e1741ae67f07fa1b6cfc7f94b411e Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Fri, 29 Jun 2007 09:00:52 +0200 Subject: [PATCH 24/38] Cset exclude: msvensson@pilot.(none)|ChangeSet|20070628091815|48577 --- mysql-test/Makefile.am | 126 ++++++++++++++++++++++++++++++++++------- 1 file changed, 105 insertions(+), 21 deletions(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 549a9b8ac7d..0a6dbc3663a 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -18,41 +18,125 @@ ## Process this file with automake to create Makefile.in SUBDIRS = ndb +DIST_SUBDIRS=ndb -PRESCRIPTS = mysql-test-run.pl - -GENSCRIPTS = mysql-test-run-shell \ - install_test_db \ - mtr \ - mysql-test-run - -EXTRA_SCRIPTS = mysql-test-run-shell.sh \ - install_test_db.sh \ +benchdir_root= $(prefix) +testdir = $(benchdir_root)/mysql-test +EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh \ valgrind.supp $(PRESCRIPTS) - -EXTRA_DIST_DIRS = t r include lib std_data suite extra - -EXTRA_DIST = $(EXTRA_DIST_DIRS) $(EXTRA_SCRIPTS) README - +EXTRA_DIST = $(EXTRA_SCRIPTS) suite +GENSCRIPTS = mysql-test-run-shell install_test_db mtr mysql-test-run +PRESCRIPTS = mysql-test-run.pl test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) - +test_DATA = std_data/client-key.pem std_data/client-cert.pem \ + std_data/cacert.pem std_data/server-cert.pem \ + std_data/server-key.pem CLEANFILES = $(GENSCRIPTS) +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. + + +dist-hook: + mkdir -p \ + $(distdir)/t \ + $(distdir)/extra/binlog_tests \ + $(distdir)/extra/rpl_tests \ + $(distdir)/r \ + $(distdir)/include \ + $(distdir)/std_data \ + $(distdir)/std_data/ndb_backup50 \ + $(distdir)/std_data/ndb_backup51 \ + $(distdir)/lib + -$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t + -$(INSTALL_DATA) $(srcdir)/t/*.imtest $(distdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t + -$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.slave-mi $(distdir)/t + $(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(distdir)/t + $(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.test $(distdir)/extra/binlog_tests + $(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.test $(distdir)/extra/rpl_tests + -$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(distdir)/extra/binlog_tests + -$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.opt $(distdir)/extra/rpl_tests + $(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include + $(INSTALL_DATA) $(srcdir)/include/*.test $(distdir)/include + $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r + $(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/Index.xml $(distdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(distdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.pem $(distdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.frm $(distdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(distdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(distdir)/std_data/ndb_backup50 + $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(distdir)/std_data/ndb_backup51 + $(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib + -rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock + +install-data-local: + $(mkinstalldirs) \ + $(DESTDIR)$(testdir)/t \ + $(DESTDIR)$(testdir)/extra/binlog_tests \ + $(DESTDIR)$(testdir)/extra/rpl_tests \ + $(DESTDIR)$(testdir)/r \ + $(DESTDIR)$(testdir)/include \ + $(DESTDIR)$(testdir)/std_data \ + $(DESTDIR)$(testdir)/std_data/ndb_backup50 \ + $(DESTDIR)$(testdir)/std_data/ndb_backup51 \ + $(DESTDIR)$(testdir)/lib + $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir) + -$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t + -$(INSTALL_DATA) $(srcdir)/t/*.imtest $(DESTDIR)$(testdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.sql $(DESTDIR)$(testdir)/t + -$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t + $(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t + $(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r + $(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r + $(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.test $(DESTDIR)$(testdir)/extra/binlog_tests + $(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.test $(DESTDIR)$(testdir)/extra/rpl_tests + -$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(DESTDIR)$(testdir)/extra/binlog_tests + -$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.opt $(DESTDIR)$(testdir)/extra/rpl_tests + $(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include + $(INSTALL_DATA) $(srcdir)/include/*.test $(DESTDIR)$(testdir)/include + $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(DESTDIR)$(testdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/Index.xml $(DESTDIR)$(testdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.frm $(DESTDIR)$(testdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(DESTDIR)$(testdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data + $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50 + $(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51 + $(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib + for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \ + do \ + d=$(DESTDIR)$(testdir)/`dirname $$f`; \ + mkdir -p $$d ; \ + $(INSTALL_DATA) $(srcdir)/$$f $$d ; \ + done + +uninstall-local: + @RM@ -f -r $(DESTDIR)$(testdir) # mtr - a shortcut for executing mysql-test-run.pl mtr: - @RM@ -f mtr - @LN_S@ mysql-test-run.pl mtr + $(RM) -f mtr + $(LN_S) mysql-test-run.pl mtr # mysql-test-run - a shortcut for executing mysql-test-run.pl mysql-test-run: - @RM@ -f mysql-test-run - @LN_S@ mysql-test-run.pl mysql-test-run + $(RM) -f mysql-test-run + $(LN_S) mysql-test-run.pl mysql-test-run SUFFIXES = .sh -testdir = $(prefix)/mysql-test - .sh: @RM@ -f $@ $@-t @SED@ \ From 5885034469f3d08340144a59be966ae90e220bc6 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Fri, 29 Jun 2007 09:23:42 +0200 Subject: [PATCH 25/38] WL3933 - Don't fail if mysql-test/t/ doesn't have some files --- mysql-test/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 0a6dbc3663a..acb9ba36bda 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -52,8 +52,8 @@ dist-hook: -$(INSTALL_DATA) $(srcdir)/t/*.imtest $(distdir)/t $(INSTALL_DATA) $(srcdir)/t/*.sql $(distdir)/t -$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.slave-mi $(distdir)/t - $(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(distdir)/t + -$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.slave-mi $(distdir)/t + -$(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(distdir)/t $(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.test $(distdir)/extra/binlog_tests $(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.test $(distdir)/extra/rpl_tests -$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(distdir)/extra/binlog_tests @@ -91,9 +91,9 @@ install-data-local: -$(INSTALL_DATA) $(srcdir)/t/*.imtest $(DESTDIR)$(testdir)/t $(INSTALL_DATA) $(srcdir)/t/*.sql $(DESTDIR)$(testdir)/t -$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t - $(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t - $(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t + -$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t + -$(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t + -$(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t $(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r $(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r $(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.test $(DESTDIR)$(testdir)/extra/binlog_tests From 68c7cc2af4a301999c6f2764ef173cc4b3fdd447 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Fri, 29 Jun 2007 09:28:51 +0200 Subject: [PATCH 26/38] Bug#22540 Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB - Update test results for --binlog-format=row --- .../suite/binlog/r/binlog_row_binlog.result | 131 ++++++++++++++++++ .../suite/rpl/r/rpl_row_create_table.result | 28 ++-- 2 files changed, 145 insertions(+), 14 deletions(-) diff --git a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result index 6fcaad010d2..88d403c2f68 100644 --- a/mysql-test/suite/binlog/r/binlog_row_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result @@ -235,6 +235,137 @@ master-bin.000001 # Rotate 1 # master-bin.000002;pos=4 show binlog events in 'master-bin.000002' from 106; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000002 # Query 1 # use `test`; drop table t1 +set @ac = @@autocommit; +set autocommit= 0; +reset master; +create table t1(n int) engine=innodb; +begin; +insert into t1 values (1); +insert into t1 values (2); +insert into t1 values (3); +commit; +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb +master-bin.000001 205 Query 1 273 use `test`; BEGIN +master-bin.000001 273 Table_map 1 312 table_id: # (test.t1) +master-bin.000001 312 Write_rows 1 346 table_id: # flags: STMT_END_F +master-bin.000001 346 Table_map 1 385 table_id: # (test.t1) +master-bin.000001 385 Write_rows 1 419 table_id: # flags: STMT_END_F +master-bin.000001 419 Table_map 1 458 table_id: # (test.t1) +master-bin.000001 458 Write_rows 1 492 table_id: # flags: STMT_END_F +master-bin.000001 492 Xid 1 519 COMMIT /* XID */ +master-bin.000001 519 Query 1 595 use `test`; drop table t1 +set autocommit= 1; +reset master; +create table t1(n int) engine=innodb; +insert into t1 values (1); +insert into t1 values (2); +insert into t1 values (3); +commit; +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb +master-bin.000001 205 Table_map 1 244 table_id: # (test.t1) +master-bin.000001 244 Write_rows 1 278 table_id: # flags: STMT_END_F +master-bin.000001 278 Xid 1 305 COMMIT /* XID */ +master-bin.000001 305 Table_map 1 344 table_id: # (test.t1) +master-bin.000001 344 Write_rows 1 378 table_id: # flags: STMT_END_F +master-bin.000001 378 Xid 1 405 COMMIT /* XID */ +master-bin.000001 405 Table_map 1 444 table_id: # (test.t1) +master-bin.000001 444 Write_rows 1 478 table_id: # flags: STMT_END_F +master-bin.000001 478 Xid 1 505 COMMIT /* XID */ +master-bin.000001 505 Query 1 581 use `test`; drop table t1 +reset master; +create table t1(n int) engine=myisam; +begin; +insert into t1 values (4); +insert into t1 values (5); +insert into t1 values (6); +commit; +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=myisam +master-bin.000001 205 Table_map 1 244 table_id: # (test.t1) +master-bin.000001 244 Write_rows 1 278 table_id: # flags: STMT_END_F +master-bin.000001 278 Table_map 1 317 table_id: # (test.t1) +master-bin.000001 317 Write_rows 1 351 table_id: # flags: STMT_END_F +master-bin.000001 351 Table_map 1 390 table_id: # (test.t1) +master-bin.000001 390 Write_rows 1 424 table_id: # flags: STMT_END_F +master-bin.000001 424 Query 1 500 use `test`; drop table t1 +set autocommit= 1; +reset master; +create table t1(n int) engine=innodb; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 205 +insert into t1 values (1); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 305 +insert into t1 values (2); +insert into t1 values (3); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 505 +commit; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 505 +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb +master-bin.000001 205 Table_map 1 244 table_id: # (test.t1) +master-bin.000001 244 Write_rows 1 278 table_id: # flags: STMT_END_F +master-bin.000001 278 Xid 1 305 COMMIT /* XID */ +master-bin.000001 305 Table_map 1 344 table_id: # (test.t1) +master-bin.000001 344 Write_rows 1 378 table_id: # flags: STMT_END_F +master-bin.000001 378 Xid 1 405 COMMIT /* XID */ +master-bin.000001 405 Table_map 1 444 table_id: # (test.t1) +master-bin.000001 444 Write_rows 1 478 table_id: # flags: STMT_END_F +master-bin.000001 478 Xid 1 505 COMMIT /* XID */ +master-bin.000001 505 Query 1 581 use `test`; drop table t1 +set autocommit= 0; +reset master; +create table t1(n int) engine=myisam; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 205 +insert into t1 values (4); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 278 +insert into t1 values (5); +insert into t1 values (6); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 424 +commit; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 424 +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=myisam +master-bin.000001 205 Table_map 1 244 table_id: # (test.t1) +master-bin.000001 244 Write_rows 1 278 table_id: # flags: STMT_END_F +master-bin.000001 278 Table_map 1 317 table_id: # (test.t1) +master-bin.000001 317 Write_rows 1 351 table_id: # flags: STMT_END_F +master-bin.000001 351 Table_map 1 390 table_id: # (test.t1) +master-bin.000001 390 Write_rows 1 424 table_id: # flags: STMT_END_F +master-bin.000001 424 Query 1 500 use `test`; drop table t1 +set session autocommit = @ac; +End of 5.0 tests reset master; create table t1 (id tinyint auto_increment primary key); set insert_id=128; diff --git a/mysql-test/suite/rpl/r/rpl_row_create_table.result b/mysql-test/suite/rpl/r/rpl_row_create_table.result index e76ce5b962d..f22881bd4a9 100644 --- a/mysql-test/suite/rpl/r/rpl_row_create_table.result +++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result @@ -279,25 +279,25 @@ Log_name Pos Event_type Server_id End_log_pos Info # 192 Table_map # 231 table_id: # (test.t1) # 231 Write_rows # 275 table_id: # flags: STMT_END_F # 275 Query # 343 use `test`; BEGIN -# 343 Query # 125 use `test`; CREATE TABLE `t2` ( +# 343 Query # 468 use `test`; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB -# 468 Table_map # 164 table_id: # (test.t2) -# 507 Write_rows # 208 table_id: # flags: STMT_END_F +# 468 Table_map # 507 table_id: # (test.t2) +# 507 Write_rows # 551 table_id: # flags: STMT_END_F # 551 Xid # 578 COMMIT /* XID */ # 578 Query # 646 use `test`; BEGIN -# 646 Query # 125 use `test`; CREATE TABLE `t3` ( +# 646 Query # 771 use `test`; CREATE TABLE `t3` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB -# 771 Table_map # 164 table_id: # (test.t3) -# 810 Write_rows # 208 table_id: # flags: STMT_END_F +# 771 Table_map # 810 table_id: # (test.t3) +# 810 Write_rows # 854 table_id: # flags: STMT_END_F # 854 Xid # 881 COMMIT /* XID */ # 881 Query # 949 use `test`; BEGIN -# 949 Query # 125 use `test`; CREATE TABLE `t4` ( +# 949 Query # 1074 use `test`; CREATE TABLE `t4` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB -# 1074 Table_map # 164 table_id: # (test.t4) -# 1113 Write_rows # 208 table_id: # flags: STMT_END_F +# 1074 Table_map # 1113 table_id: # (test.t4) +# 1113 Write_rows # 1157 table_id: # flags: STMT_END_F # 1157 Xid # 1184 COMMIT /* XID */ # 1184 Table_map # 1223 table_id: # (test.t1) # 1223 Write_rows # 1267 table_id: # flags: STMT_END_F @@ -371,10 +371,10 @@ Log_name Pos Event_type Server_id End_log_pos Info # 231 Write_rows # 275 table_id: # flags: STMT_END_F # 275 Query # 375 use `test`; CREATE TABLE t2 (a INT) ENGINE=INNODB # 375 Query # 443 use `test`; BEGIN -# 443 Table_map # 39 table_id: # (test.t2) -# 482 Write_rows # 83 table_id: # flags: STMT_END_F -# 526 Table_map # 122 table_id: # (test.t2) -# 565 Write_rows # 161 table_id: # flags: STMT_END_F +# 443 Table_map # 482 table_id: # (test.t2) +# 482 Write_rows # 526 table_id: # flags: STMT_END_F +# 526 Table_map # 565 table_id: # (test.t2) +# 565 Write_rows # 604 table_id: # flags: STMT_END_F # 604 Xid # 631 COMMIT /* XID */ SELECT * FROM t2 ORDER BY a; a @@ -396,7 +396,7 @@ SELECT * FROM t2 ORDER BY a; a SHOW BINLOG EVENTS FROM 631; Log_name Pos Event_type Server_id End_log_pos Info -# 631 Query # 80 use `test`; TRUNCATE TABLE t2 +# 631 Query # 711 use `test`; TRUNCATE TABLE t2 # 711 Xid # 738 COMMIT /* XID */ SELECT * FROM t2 ORDER BY a; a From effb7f890a1ad63cc0cc8976ea69d64e73c68acc Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Fri, 29 Jun 2007 10:26:20 +0200 Subject: [PATCH 27/38] Bug#28356 Exec'ing "diff" from "mysqltest" loses the output, no information available - Use SQL for diffing master and slave --- mysql-test/r/rpl_misc_functions.result | 16 +++++++--- mysql-test/t/rpl_misc_functions.test | 42 ++++++++++++++++---------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/mysql-test/r/rpl_misc_functions.result b/mysql-test/r/rpl_misc_functions.result index 526414cec9c..ca7403316b1 100644 --- a/mysql-test/r/rpl_misc_functions.result +++ b/mysql-test/r/rpl_misc_functions.result @@ -40,7 +40,15 @@ CALL test_replication_sp2(); INSERT INTO t1 VALUES (test_replication_sf()); INSERT INTO t1 VALUES (test_replication_sf()); INSERT INTO t1 VALUES (test_replication_sf()); -DROP PROCEDURE IF EXISTS test_replication_sp1; -DROP PROCEDURE IF EXISTS test_replication_sp2; -DROP FUNCTION IF EXISTS test_replication_sf; -DROP TABLE IF EXISTS t1; +select * from t1 into outfile "../tmp/t1_slave.txt"; +create temporary table t1_slave select * from t1 where 1=0; +load data infile '../tmp/t1_slave.txt' into table t1_slave; +select count(*) into @aux from t1, t1_slave +where ABS(t1.col_a - t1_slave.col_a) < 0.0001 ; +SELECT @aux; +@aux +12 +DROP PROCEDURE test_replication_sp1; +DROP PROCEDURE test_replication_sp2; +DROP FUNCTION test_replication_sf; +DROP TABLE t1, t1_slave; diff --git a/mysql-test/t/rpl_misc_functions.test b/mysql-test/t/rpl_misc_functions.test index f00beff583a..b87fff919b2 100644 --- a/mysql-test/t/rpl_misc_functions.test +++ b/mysql-test/t/rpl_misc_functions.test @@ -77,27 +77,37 @@ INSERT INTO t1 VALUES (test_replication_sf()); INSERT INTO t1 VALUES (test_replication_sf()); INSERT INTO t1 VALUES (test_replication_sf()); -# Record the results of the query on the master ---exec $MYSQL --port=$MASTER_MYPORT test -e "SELECT * FROM test.t1" > $MYSQLTEST_VARDIR/tmp/rpl_rand_master.sql - --sync_slave_with_master -# Record the results of the query on the slave ---exec $MYSQL --port=$SLAVE_MYPORT test -e "SELECT * FROM test.t1" > $MYSQLTEST_VARDIR/tmp/rpl_rand_slave.sql +# Dump table on slave +select * from t1 into outfile "../tmp/t1_slave.txt"; -# Compare the results from the master to the slave. ---exec diff $MYSQLTEST_VARDIR/tmp/rpl_rand_master.sql $MYSQLTEST_VARDIR/tmp/rpl_rand_slave.sql +# Load data from slave into temp table on master +connection master; +create temporary table t1_slave select * from t1 where 1=0; +load data infile '../tmp/t1_slave.txt' into table t1_slave; +--remove_file $MYSQLTEST_VARDIR/tmp/t1_slave.txt + +# Compare master and slave temp table, use subtraction +# for floating point comparison of "double" +select count(*) into @aux from t1, t1_slave +where ABS(t1.col_a - t1_slave.col_a) < 0.0001 ; +SELECT @aux; +if (`SELECT @aux <> 12 OR @aux IS NULL`) +{ + --echo # ERROR: We expected to get count(*) = 12. + SELECT col_a FROM t1; + SELECT col_a FROM t1_slave; + --echo # abort + exit; +} # Cleanup connection master; ---disable_warnings -DROP PROCEDURE IF EXISTS test_replication_sp1; -DROP PROCEDURE IF EXISTS test_replication_sp2; -DROP FUNCTION IF EXISTS test_replication_sf; -DROP TABLE IF EXISTS t1; ---enable_warnings +DROP PROCEDURE test_replication_sp1; +DROP PROCEDURE test_replication_sp2; +DROP FUNCTION test_replication_sf; +DROP TABLE t1, t1_slave; --sync_slave_with_master -# If all is good, when can cleanup our dump files. ---system rm $MYSQLTEST_VARDIR/tmp/rpl_rand_master.sql ---system rm $MYSQLTEST_VARDIR/tmp/rpl_rand_slave.sql + From db84337b37b7cc5ebf0e93147d30058628e5d217 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Fri, 29 Jun 2007 14:18:20 +0200 Subject: [PATCH 28/38] Reduce time for mysqladmin to try to shutdown servers from 70 to 20 seconds --- mysql-test/lib/mtr_process.pl | 2 +- mysql-test/mysql-test-run.pl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 7ac75829a28..69026d2c72f 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -359,7 +359,7 @@ sub mtr_kill_leftovers () { "socket: '$srv->{path_sock}'; ". "port: $srv->{port})"); - my $pid= mtr_mysqladmin_start($srv, "shutdown", 70); + my $pid= mtr_mysqladmin_start($srv, "shutdown", 20); # Save the pid of the mysqladmin process $admin_pids{$pid}= 1; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 0908eda061c..6ec4045bb43 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4328,7 +4328,7 @@ sub run_testcase_stop_servers($$$) { { if ( $mysqld->{'pid'} ) { - $pid= mtr_mysqladmin_start($mysqld, "shutdown", 70); + $pid= mtr_mysqladmin_start($mysqld, "shutdown", 20); $admin_pids{$pid}= 1; @@ -4380,7 +4380,7 @@ sub run_testcase_stop_servers($$$) { { if ( $mysqld->{'pid'} ) { - $pid= mtr_mysqladmin_start($mysqld, "shutdown", 70); + $pid= mtr_mysqladmin_start($mysqld, "shutdown", 20); $admin_pids{$pid}= 1; From ef80d45d0d11ad82dfc07d976878e9da624b02a2 Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Fri, 29 Jun 2007 14:43:54 +0200 Subject: [PATCH 29/38] Update make_win_bin_dist to also copy mysql-test/suite directory --- scripts/make_win_bin_dist | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index 6593e2c6039..480ea39b2cf 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -304,7 +304,7 @@ cp mysys/$TARGET/mysys.lib $DESTDIR/lib/opt/mysys_tls.lib mkdir -p $DESTDIR/mysql-test/include $DESTDIR/mysql-test/lib \ $DESTDIR/mysql-test/r $DESTDIR/mysql-test/std_data \ - $DESTDIR/mysql-test/t + $DESTDIR/mysql-test/t $DESTDIR/mysql-test/suite cp mysql-test/mysql-test-run.pl $DESTDIR/mysql-test/ cp mysql-test/README $DESTDIR/mysql-test/ cp mysql-test/install_test_db.sh $DESTDIR/mysql-test/install_test_db @@ -324,7 +324,7 @@ cp mysql-test/std_data/*.pem $DESTDIR/mysql-test/std_data/ cp mysql-test/std_data/*.MY* $DESTDIR/mysql-test/std_data/ cp mysql-test/t/*.opt $DESTDIR/mysql-test/t/ cp mysql-test/t/*.sh $DESTDIR/mysql-test/t/ -cp mysql-test/t/*.slave-mi $DESTDIR/mysql-test/t/ +cp mysql-test/t/*.slave-mi $DESTDIR/mysql-test/t/ || /bin/true cp mysql-test/t/*.sql $DESTDIR/mysql-test/t/ cp mysql-test/t/*.def $DESTDIR/mysql-test/t/ (cd mysql-test/t/ && cp *.test $ABS_DST/mysql-test/t/) @@ -335,6 +335,12 @@ if [ -d mysql-test/extra ] ; then cp -pR mysql-test/extra/* $DESTDIR/mysql-test/extra/ fi +# Copy all directories in mysql-test/suite/ +for i in `cd mysql-test/suite && ls`; do \ + mkdir -p $DESTDIR/mysql-test/suite/$i; \ + cp -R mysql-test/suite/$i $DESTDIR/mysql-test/suite/; \ +done + # ---------------------------------------------------------------------- # Copy what could be usable in the "scripts" directory. Currently # only SQL files, others are Bourne shell scripts or Perl scripts From 99630cb901879134c801c1c781a904cd1af9702c Mon Sep 17 00:00:00 2001 From: "ramil/ram@mysql.com/ramil.myoffice.izhnet.ru" <> Date: Fri, 29 Jun 2007 21:48:22 +0500 Subject: [PATCH 30/38] Fix for bug #19328: Slave timeout with COM_REGISTER_SLAVE error causing stop Problem: "Under high load, the slave registering to the master can timeout during the COM_REGISTER_SLAVE execution. This causes an error, which prevents the slave from connecting at all." Fix: Do not abort immediately, but retry registering on master. --- sql/slave.cc | 308 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 208 insertions(+), 100 deletions(-) diff --git a/sql/slave.cc b/sql/slave.cc index 6c7968c2b3f..d2c5b4fd254 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -59,6 +59,58 @@ ulonglong relay_log_space_limit = 0; int disconnect_slave_event_count = 0, abort_slave_event_count = 0; int events_till_abort = -1; +enum enum_slave_reconnect_actions +{ + SLAVE_RECON_ACT_REG= 0, + SLAVE_RECON_ACT_DUMP= 1, + SLAVE_RECON_ACT_EVENT= 2, + SLAVE_RECON_ACT_MAX +}; + +enum enum_slave_reconnect_messages +{ + SLAVE_RECON_MSG_WAIT= 0, + SLAVE_RECON_MSG_KILLED_WAITING= 1, + SLAVE_RECON_MSG_AFTER= 2, + SLAVE_RECON_MSG_FAILED= 3, + SLAVE_RECON_MSG_COMMAND= 4, + SLAVE_RECON_MSG_KILLED_AFTER= 5, + SLAVE_RECON_MSG_MAX +}; + +static const char *reconnect_messages[SLAVE_RECON_ACT_MAX][SLAVE_RECON_MSG_MAX]= +{ + { + "Waiting to reconnect after a failed registration on master", + "Slave I/O thread killed while waitnig to reconnect after a failed \ +registration on master", + "Reconnecting after a failed registration on master", + "failed registering on master, reconnecting to try again, \ +log '%s' at postion %s", + "COM_REGISTER_SLAVE", + "Slave I/O thread killed during or after reconnect" + }, + { + "Waiting to reconnect after a failed binlog dump request", + "Slave I/O thread killed while retrying master dump", + "Reconnecting after a failed binlog dump request", + "failed dump request, reconnecting to try again, log '%s' at postion %s", + "COM_BINLOG_DUMP", + "Slave I/O thread killed during or after reconnect" + }, + { + "Waiting to reconnect after a failed master event read", + "Slave I/O thread killed while waiting to reconnect after a failed read", + "Reconnecting after a failed master event read", + "Slave I/O thread: Failed reading log event, reconnecting to retry, \ +log '%s' at postion %s", + "", + "Slave I/O thread killed during or after a reconnect done to recover from \ +failed read" + } +}; + + typedef enum { SLAVE_THD_IO, SLAVE_THD_SQL} SLAVE_THD_TYPE; static int process_io_rotate(MASTER_INFO* mi, Rotate_log_event* rev); @@ -1098,12 +1150,14 @@ static void write_ignored_events_info_to_relay_log(THD *thd, MASTER_INFO *mi) } -int register_slave_on_master(MYSQL* mysql, MASTER_INFO *mi) +int register_slave_on_master(MYSQL* mysql, MASTER_INFO *mi, + bool *suppress_warnings) { uchar buf[1024], *pos= buf; uint report_host_len, report_user_len=0, report_password_len=0; DBUG_ENTER("register_slave_on_master"); + *suppress_warnings= FALSE; if (!report_host) DBUG_RETURN(0); report_host_len= strlen(report_host); @@ -1127,11 +1181,18 @@ int register_slave_on_master(MYSQL* mysql, MASTER_INFO *mi) if (simple_command(mysql, COM_REGISTER_SLAVE, buf, (size_t) (pos- buf), 0)) { - char buf[256]; - my_snprintf(buf, sizeof(buf), - "%s (Errno: %d)", mysql_error(mysql), mysql_errno(mysql)); - mi->report(ERROR_LEVEL, ER_SLAVE_MASTER_COM_FAILURE, - ER(ER_SLAVE_MASTER_COM_FAILURE), "COM_REGISTER_SLAVE", buf); + if (mysql_errno(mysql) == ER_NET_READ_INTERRUPTED) + { + *suppress_warnings= TRUE; // Suppress reconnect warning + } + else + { + char buf[256]; + my_snprintf(buf, sizeof(buf), "%s (Errno: %d)", mysql_error(mysql), + mysql_errno(mysql)); + mi->report(ERROR_LEVEL, ER_SLAVE_MASTER_COM_FAILURE, + ER(ER_SLAVE_MASTER_COM_FAILURE), "COM_REGISTER_SLAVE", buf); + } DBUG_RETURN(1); } DBUG_RETURN(0); @@ -1460,6 +1521,8 @@ static int request_dump(MYSQL* mysql, MASTER_INFO* mi, int binlog_flags = 0; // for now char* logname = mi->master_log_name; DBUG_ENTER("request_dump"); + + *suppress_warnings= FALSE; // TODO if big log files: Change next to int8store() int4store(buf, (ulong) mi->master_log_pos); @@ -1475,7 +1538,7 @@ static int request_dump(MYSQL* mysql, MASTER_INFO* mi, now we just fill up the error log :-) */ if (mysql_errno(mysql) == ER_NET_READ_INTERRUPTED) - *suppress_warnings= 1; // Suppress reconnect warning + *suppress_warnings= TRUE; // Suppress reconnect warning else sql_print_error("Error on COM_BINLOG_DUMP: %d %s, will retry in %d secs", mysql_errno(mysql), mysql_error(mysql), @@ -1539,7 +1602,7 @@ static ulong read_event(MYSQL* mysql, MASTER_INFO *mi, bool* suppress_warnings) ulong len; DBUG_ENTER("read_event"); - *suppress_warnings= 0; + *suppress_warnings= FALSE; /* my_real_read() will time us out We check if we were told to die, and if not, try reading again @@ -1879,6 +1942,94 @@ on this slave.\ } +static bool check_io_slave_killed(THD *thd, MASTER_INFO *mi, const char *info) +{ + if (io_slave_killed(thd, mi)) + { + if (global_system_variables.log_warnings) + sql_print_information(info); + return TRUE; + } + return FALSE; +} + + +/** + @brief Try to reconnect slave IO thread. + + @details Terminates current connection to master, sleeps for + @c mi->connect_retry msecs and initiates new connection with + @c safe_reconnect(). Variable pointed by @c retry_count is increased - + if it exceeds @c master_retry_count then connection is not re-established + and function signals error. + Unless @c suppres_warnings is TRUE, a warning is put in the server error log + when reconnecting. The warning message and messages used to report errors + are taken from @c messages array. In case @c master_retry_count is exceeded, + no messages are added to the log. + + @param[in] thd Thread context. + @param[in] mysql MySQL connection. + @param[in] mi Master connection information. + @param[in,out] retry_count Number of attempts to reconnect. + @param[in] suppress_warnings TRUE when a normal net read timeout + has caused to reconnecting. + @param[in] messages Messages to print/log, see + reconnect_messages[] array. + + @retval 0 OK. + @retval 1 There was an error. +*/ + +static int try_to_reconnect(THD *thd, MYSQL *mysql, MASTER_INFO *mi, + uint *retry_count, bool suppress_warnings, + const char *messages[SLAVE_RECON_MSG_MAX]) +{ + mi->slave_running= MYSQL_SLAVE_RUN_NOT_CONNECT; + thd->proc_info= messages[SLAVE_RECON_MSG_WAIT]; +#ifdef SIGNAL_WITH_VIO_CLOSE + thd->clear_active_vio(); +#endif + end_server(mysql); + if ((*retry_count)++) + { + if (*retry_count > master_retry_count) + return 1; // Don't retry forever + safe_sleep(thd, mi->connect_retry, (CHECK_KILLED_FUNC) io_slave_killed, + (void *) mi); + } + if (check_io_slave_killed(thd, mi, messages[SLAVE_RECON_MSG_KILLED_WAITING])) + return 1; + thd->proc_info = messages[SLAVE_RECON_MSG_AFTER]; + if (!suppress_warnings) + { + char buf[256], llbuff[22]; + my_snprintf(buf, sizeof(buf), messages[SLAVE_RECON_MSG_FAILED], + IO_RPL_LOG_NAME, llstr(mi->master_log_pos, llbuff)); + /* + Raise a warining during registering on master/requesting dump. + Log a message reading event. + */ + if (messages[SLAVE_RECON_MSG_COMMAND][0]) + { + mi->report(WARNING_LEVEL, ER_SLAVE_MASTER_COM_FAILURE, + ER(ER_SLAVE_MASTER_COM_FAILURE), + messages[SLAVE_RECON_MSG_COMMAND], buf); + } + else + { + sql_print_information(buf); + } + } + if (safe_reconnect(thd, mysql, mi, 1) || io_slave_killed(thd, mi)) + { + if (global_system_variables.log_warnings) + sql_print_information(messages[SLAVE_RECON_MSG_KILLED_AFTER]); + return 1; + } + return 0; +} + + /* Slave I/O Thread entry point */ pthread_handler_t handle_slave_io(void *arg) @@ -1889,7 +2040,10 @@ pthread_handler_t handle_slave_io(void *arg) RELAY_LOG_INFO *rli= &mi->rli; char llbuff[22]; uint retry_count; - + bool suppress_warnings; +#ifndef DBUG_OFF + uint retry_count_reg= 0, retry_count_dump= 0, retry_count_event= 0; +#endif // needs to call my_thread_init(), otherwise we get a coredump in DBUG_ stuff my_thread_init(); DBUG_ENTER("handle_slave_io"); @@ -1975,79 +2129,56 @@ connected: Register ourselves with the master. */ thd->proc_info = "Registering slave on master"; - if (register_slave_on_master(mysql, mi)) + if (register_slave_on_master(mysql, mi, &suppress_warnings)) { sql_print_error("Slave I/O thread couldn't register on master"); - goto err; + if (check_io_slave_killed(thd, mi, "Slave I/O thread killed while \ +registering slave on master") || + try_to_reconnect(thd, mysql, mi, &retry_count, suppress_warnings, + reconnect_messages[SLAVE_RECON_ACT_REG])) + goto err; + goto connected; } + DBUG_EXECUTE_IF("FORCE_SLAVE_TO_RECONNECT_REG", + if (!retry_count_reg) + { + retry_count_reg++; + sql_print_information("Forcing to reconnect slave I/O thread"); + if (try_to_reconnect(thd, mysql, mi, &retry_count, suppress_warnings, + reconnect_messages[SLAVE_RECON_ACT_REG])) + goto err; + goto connected; + }); } DBUG_PRINT("info",("Starting reading binary log from master")); while (!io_slave_killed(thd,mi)) { - bool suppress_warnings= 0; thd->proc_info = "Requesting binlog dump"; if (request_dump(mysql, mi, &suppress_warnings)) { sql_print_error("Failed on request_dump()"); - if (io_slave_killed(thd,mi)) - { - sql_print_information("Slave I/O thread killed while requesting master \ -dump"); + if (check_io_slave_killed(thd, mi, "Slave I/O thread killed while \ +requesting master dump") || + try_to_reconnect(thd, mysql, mi, &retry_count, suppress_warnings, + reconnect_messages[SLAVE_RECON_ACT_DUMP])) goto err; - } - - mi->slave_running= MYSQL_SLAVE_RUN_NOT_CONNECT; - thd->proc_info= "Waiting to reconnect after a failed binlog dump request"; -#ifdef SIGNAL_WITH_VIO_CLOSE - thd->clear_active_vio(); -#endif - end_server(mysql); - /* - First time retry immediately, assuming that we can recover - right away - if first time fails, sleep between re-tries - hopefuly the admin can fix the problem sometime - */ - if (retry_count++) - { - if (retry_count > master_retry_count) - goto err; // Don't retry forever - safe_sleep(thd,mi->connect_retry,(CHECK_KILLED_FUNC)io_slave_killed, - (void*)mi); - } - if (io_slave_killed(thd,mi)) - { - sql_print_information("Slave I/O thread killed while retrying master \ -dump"); - goto err; - } - - thd->proc_info = "Reconnecting after a failed binlog dump request"; - if (!suppress_warnings) { - char buf[256]; - my_snprintf(buf, sizeof(buf), - "failed dump request, reconnecting to try again," - " log '%s' at postion %s", - IO_RPL_LOG_NAME, - llstr(mi->master_log_pos,llbuff)); - mi->report(WARNING_LEVEL, ER_SLAVE_MASTER_COM_FAILURE, - ER(ER_SLAVE_MASTER_COM_FAILURE), "COM_BINLOG_DUMP", buf); - } - if (safe_reconnect(thd, mysql, mi, suppress_warnings) || - io_slave_killed(thd,mi)) - { - sql_print_information("Slave I/O thread killed during or \ -after reconnect"); - goto err; - } - goto connected; } + DBUG_EXECUTE_IF("FORCE_SLAVE_TO_RECONNECT_DUMP", + if (!retry_count_dump) + { + retry_count_dump++; + sql_print_information("Forcing to reconnect slave I/O thread"); + if (try_to_reconnect(thd, mysql, mi, &retry_count, suppress_warnings, + reconnect_messages[SLAVE_RECON_ACT_DUMP])) + goto err; + goto connected; + }); while (!io_slave_killed(thd,mi)) { ulong event_len; - suppress_warnings= 0; /* We say "waiting" because read_event() will wait if there's nothing to read. But if there's something to read, it will not wait. The @@ -2056,12 +2187,19 @@ after reconnect"); */ thd->proc_info= "Waiting for master to send event"; event_len= read_event(mysql, mi, &suppress_warnings); - if (io_slave_killed(thd,mi)) - { - if (global_system_variables.log_warnings) - sql_print_information("Slave I/O thread killed while reading event"); + if (check_io_slave_killed(thd, mi, "Slave I/O thread killed while \ +reading event")) goto err; - } + DBUG_EXECUTE_IF("FORCE_SLAVE_TO_RECONNECT_EVENT", + if (!retry_count_event) + { + retry_count_event++; + sql_print_information("Forcing to reconnect slave I/O thread"); + if (try_to_reconnect(thd, mysql, mi, &retry_count, suppress_warnings, + reconnect_messages[SLAVE_RECON_ACT_EVENT])) + goto err; + goto connected; + }); if (event_len == packet_error) { @@ -2081,39 +2219,9 @@ max_allowed_packet", mysql_error(mysql)); goto err; } - mi->slave_running= MYSQL_SLAVE_RUN_NOT_CONNECT; - thd->proc_info = "Waiting to reconnect after a failed master event read"; -#ifdef SIGNAL_WITH_VIO_CLOSE - thd->clear_active_vio(); -#endif - end_server(mysql); - if (retry_count++) - { - if (retry_count > master_retry_count) - goto err; // Don't retry forever - safe_sleep(thd,mi->connect_retry,(CHECK_KILLED_FUNC)io_slave_killed, - (void*) mi); - } - if (io_slave_killed(thd,mi)) - { - if (global_system_variables.log_warnings) - sql_print_information("Slave I/O thread killed while waiting to \ -reconnect after a failed read"); + if (try_to_reconnect(thd, mysql, mi, &retry_count, suppress_warnings, + reconnect_messages[SLAVE_RECON_ACT_EVENT])) goto err; - } - thd->proc_info = "Reconnecting after a failed master event read"; - if (!suppress_warnings) - sql_print_information("Slave I/O thread: Failed reading log event, \ -reconnecting to retry, log '%s' position %s", IO_RPL_LOG_NAME, - llstr(mi->master_log_pos, llbuff)); - if (safe_reconnect(thd, mysql, mi, suppress_warnings) || - io_slave_killed(thd,mi)) - { - if (global_system_variables.log_warnings) - sql_print_information("Slave I/O thread killed during or after a \ -reconnect done to recover from failed read"); - goto err; - } goto connected; } // if (event_len == packet_error) From 1ac88a2b41037bf2f9d5f91faae9fe5ca3c1ad00 Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Sat, 30 Jun 2007 02:30:42 +0200 Subject: [PATCH 31/38] Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB previous correction didn't. make sure "tail" is fixed up when filling cache several times; rework formulae. --- mysql-test/r/binlog.result | 416 +++++++++++++++++++++++++++++++++++++ mysql-test/t/binlog.test | 31 ++- sql/log.cc | 73 +++---- 3 files changed, 484 insertions(+), 36 deletions(-) diff --git a/mysql-test/r/binlog.result b/mysql-test/r/binlog.result index 41c75a2067b..77b015a4688 100644 --- a/mysql-test/r/binlog.result +++ b/mysql-test/r/binlog.result @@ -248,4 +248,420 @@ master-bin.000001 285 Query 1 373 use `test`; insert into t1 values (5) master-bin.000001 373 Query 1 461 use `test`; insert into t1 values (6) master-bin.000001 461 Query 1 537 use `test`; drop table t1 set session autocommit = @ac; +set @bcs = @@binlog_cache_size; +set @ac = @@autocommit; +set global binlog_cache_size=4096; +set autocommit= 0; +reset master; +create table t1 (a int) engine=innodb; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 98 Server ver: 5.0.46-debug-log, Binlog ver: 4 +master-bin.000001 98 Query 1 198 use `test`; create table t1 (a int) engine=innodb +master-bin.000001 198 Query 1 266 use `test`; BEGIN +master-bin.000001 266 Query 1 357 use `test`; insert into t1 values( 400 ) +master-bin.000001 357 Query 1 448 use `test`; insert into t1 values( 399 ) +master-bin.000001 448 Query 1 539 use `test`; insert into t1 values( 398 ) +master-bin.000001 539 Query 1 630 use `test`; insert into t1 values( 397 ) +master-bin.000001 630 Query 1 721 use `test`; insert into t1 values( 396 ) +master-bin.000001 721 Query 1 812 use `test`; insert into t1 values( 395 ) +master-bin.000001 812 Query 1 903 use `test`; insert into t1 values( 394 ) +master-bin.000001 903 Query 1 994 use `test`; insert into t1 values( 393 ) +master-bin.000001 994 Query 1 1085 use `test`; insert into t1 values( 392 ) +master-bin.000001 1085 Query 1 1176 use `test`; insert into t1 values( 391 ) +master-bin.000001 1176 Query 1 1267 use `test`; insert into t1 values( 390 ) +master-bin.000001 1267 Query 1 1358 use `test`; insert into t1 values( 389 ) +master-bin.000001 1358 Query 1 1449 use `test`; insert into t1 values( 388 ) +master-bin.000001 1449 Query 1 1540 use `test`; insert into t1 values( 387 ) +master-bin.000001 1540 Query 1 1631 use `test`; insert into t1 values( 386 ) +master-bin.000001 1631 Query 1 1722 use `test`; insert into t1 values( 385 ) +master-bin.000001 1722 Query 1 1813 use `test`; insert into t1 values( 384 ) +master-bin.000001 1813 Query 1 1904 use `test`; insert into t1 values( 383 ) +master-bin.000001 1904 Query 1 1995 use `test`; insert into t1 values( 382 ) +master-bin.000001 1995 Query 1 2086 use `test`; insert into t1 values( 381 ) +master-bin.000001 2086 Query 1 2177 use `test`; insert into t1 values( 380 ) +master-bin.000001 2177 Query 1 2268 use `test`; insert into t1 values( 379 ) +master-bin.000001 2268 Query 1 2359 use `test`; insert into t1 values( 378 ) +master-bin.000001 2359 Query 1 2450 use `test`; insert into t1 values( 377 ) +master-bin.000001 2450 Query 1 2541 use `test`; insert into t1 values( 376 ) +master-bin.000001 2541 Query 1 2632 use `test`; insert into t1 values( 375 ) +master-bin.000001 2632 Query 1 2723 use `test`; insert into t1 values( 374 ) +master-bin.000001 2723 Query 1 2814 use `test`; insert into t1 values( 373 ) +master-bin.000001 2814 Query 1 2905 use `test`; insert into t1 values( 372 ) +master-bin.000001 2905 Query 1 2996 use `test`; insert into t1 values( 371 ) +master-bin.000001 2996 Query 1 3087 use `test`; insert into t1 values( 370 ) +master-bin.000001 3087 Query 1 3178 use `test`; insert into t1 values( 369 ) +master-bin.000001 3178 Query 1 3269 use `test`; insert into t1 values( 368 ) +master-bin.000001 3269 Query 1 3360 use `test`; insert into t1 values( 367 ) +master-bin.000001 3360 Query 1 3451 use `test`; insert into t1 values( 366 ) +master-bin.000001 3451 Query 1 3542 use `test`; insert into t1 values( 365 ) +master-bin.000001 3542 Query 1 3633 use `test`; insert into t1 values( 364 ) +master-bin.000001 3633 Query 1 3724 use `test`; insert into t1 values( 363 ) +master-bin.000001 3724 Query 1 3815 use `test`; insert into t1 values( 362 ) +master-bin.000001 3815 Query 1 3906 use `test`; insert into t1 values( 361 ) +master-bin.000001 3906 Query 1 3997 use `test`; insert into t1 values( 360 ) +master-bin.000001 3997 Query 1 4088 use `test`; insert into t1 values( 359 ) +master-bin.000001 4088 Query 1 4179 use `test`; insert into t1 values( 358 ) +master-bin.000001 4179 Query 1 4270 use `test`; insert into t1 values( 357 ) +master-bin.000001 4270 Query 1 4361 use `test`; insert into t1 values( 356 ) +master-bin.000001 4361 Query 1 4452 use `test`; insert into t1 values( 355 ) +master-bin.000001 4452 Query 1 4543 use `test`; insert into t1 values( 354 ) +master-bin.000001 4543 Query 1 4634 use `test`; insert into t1 values( 353 ) +master-bin.000001 4634 Query 1 4725 use `test`; insert into t1 values( 352 ) +master-bin.000001 4725 Query 1 4816 use `test`; insert into t1 values( 351 ) +master-bin.000001 4816 Query 1 4907 use `test`; insert into t1 values( 350 ) +master-bin.000001 4907 Query 1 4998 use `test`; insert into t1 values( 349 ) +master-bin.000001 4998 Query 1 5089 use `test`; insert into t1 values( 348 ) +master-bin.000001 5089 Query 1 5180 use `test`; insert into t1 values( 347 ) +master-bin.000001 5180 Query 1 5271 use `test`; insert into t1 values( 346 ) +master-bin.000001 5271 Query 1 5362 use `test`; insert into t1 values( 345 ) +master-bin.000001 5362 Query 1 5453 use `test`; insert into t1 values( 344 ) +master-bin.000001 5453 Query 1 5544 use `test`; insert into t1 values( 343 ) +master-bin.000001 5544 Query 1 5635 use `test`; insert into t1 values( 342 ) +master-bin.000001 5635 Query 1 5726 use `test`; insert into t1 values( 341 ) +master-bin.000001 5726 Query 1 5817 use `test`; insert into t1 values( 340 ) +master-bin.000001 5817 Query 1 5908 use `test`; insert into t1 values( 339 ) +master-bin.000001 5908 Query 1 5999 use `test`; insert into t1 values( 338 ) +master-bin.000001 5999 Query 1 6090 use `test`; insert into t1 values( 337 ) +master-bin.000001 6090 Query 1 6181 use `test`; insert into t1 values( 336 ) +master-bin.000001 6181 Query 1 6272 use `test`; insert into t1 values( 335 ) +master-bin.000001 6272 Query 1 6363 use `test`; insert into t1 values( 334 ) +master-bin.000001 6363 Query 1 6454 use `test`; insert into t1 values( 333 ) +master-bin.000001 6454 Query 1 6545 use `test`; insert into t1 values( 332 ) +master-bin.000001 6545 Query 1 6636 use `test`; insert into t1 values( 331 ) +master-bin.000001 6636 Query 1 6727 use `test`; insert into t1 values( 330 ) +master-bin.000001 6727 Query 1 6818 use `test`; insert into t1 values( 329 ) +master-bin.000001 6818 Query 1 6909 use `test`; insert into t1 values( 328 ) +master-bin.000001 6909 Query 1 7000 use `test`; insert into t1 values( 327 ) +master-bin.000001 7000 Query 1 7091 use `test`; insert into t1 values( 326 ) +master-bin.000001 7091 Query 1 7182 use `test`; insert into t1 values( 325 ) +master-bin.000001 7182 Query 1 7273 use `test`; insert into t1 values( 324 ) +master-bin.000001 7273 Query 1 7364 use `test`; insert into t1 values( 323 ) +master-bin.000001 7364 Query 1 7455 use `test`; insert into t1 values( 322 ) +master-bin.000001 7455 Query 1 7546 use `test`; insert into t1 values( 321 ) +master-bin.000001 7546 Query 1 7637 use `test`; insert into t1 values( 320 ) +master-bin.000001 7637 Query 1 7728 use `test`; insert into t1 values( 319 ) +master-bin.000001 7728 Query 1 7819 use `test`; insert into t1 values( 318 ) +master-bin.000001 7819 Query 1 7910 use `test`; insert into t1 values( 317 ) +master-bin.000001 7910 Query 1 8001 use `test`; insert into t1 values( 316 ) +master-bin.000001 8001 Query 1 8092 use `test`; insert into t1 values( 315 ) +master-bin.000001 8092 Query 1 8183 use `test`; insert into t1 values( 314 ) +master-bin.000001 8183 Query 1 8274 use `test`; insert into t1 values( 313 ) +master-bin.000001 8274 Query 1 8365 use `test`; insert into t1 values( 312 ) +master-bin.000001 8365 Query 1 8456 use `test`; insert into t1 values( 311 ) +master-bin.000001 8456 Query 1 8547 use `test`; insert into t1 values( 310 ) +master-bin.000001 8547 Query 1 8638 use `test`; insert into t1 values( 309 ) +master-bin.000001 8638 Query 1 8729 use `test`; insert into t1 values( 308 ) +master-bin.000001 8729 Query 1 8820 use `test`; insert into t1 values( 307 ) +master-bin.000001 8820 Query 1 8911 use `test`; insert into t1 values( 306 ) +master-bin.000001 8911 Query 1 9002 use `test`; insert into t1 values( 305 ) +master-bin.000001 9002 Query 1 9093 use `test`; insert into t1 values( 304 ) +master-bin.000001 9093 Query 1 9184 use `test`; insert into t1 values( 303 ) +master-bin.000001 9184 Query 1 9275 use `test`; insert into t1 values( 302 ) +master-bin.000001 9275 Query 1 9366 use `test`; insert into t1 values( 301 ) +master-bin.000001 9366 Query 1 9457 use `test`; insert into t1 values( 300 ) +master-bin.000001 9457 Query 1 9548 use `test`; insert into t1 values( 299 ) +master-bin.000001 9548 Query 1 9639 use `test`; insert into t1 values( 298 ) +master-bin.000001 9639 Query 1 9730 use `test`; insert into t1 values( 297 ) +master-bin.000001 9730 Query 1 9821 use `test`; insert into t1 values( 296 ) +master-bin.000001 9821 Query 1 9912 use `test`; insert into t1 values( 295 ) +master-bin.000001 9912 Query 1 10003 use `test`; insert into t1 values( 294 ) +master-bin.000001 10003 Query 1 10094 use `test`; insert into t1 values( 293 ) +master-bin.000001 10094 Query 1 10185 use `test`; insert into t1 values( 292 ) +master-bin.000001 10185 Query 1 10276 use `test`; insert into t1 values( 291 ) +master-bin.000001 10276 Query 1 10367 use `test`; insert into t1 values( 290 ) +master-bin.000001 10367 Query 1 10458 use `test`; insert into t1 values( 289 ) +master-bin.000001 10458 Query 1 10549 use `test`; insert into t1 values( 288 ) +master-bin.000001 10549 Query 1 10640 use `test`; insert into t1 values( 287 ) +master-bin.000001 10640 Query 1 10731 use `test`; insert into t1 values( 286 ) +master-bin.000001 10731 Query 1 10822 use `test`; insert into t1 values( 285 ) +master-bin.000001 10822 Query 1 10913 use `test`; insert into t1 values( 284 ) +master-bin.000001 10913 Query 1 11004 use `test`; insert into t1 values( 283 ) +master-bin.000001 11004 Query 1 11095 use `test`; insert into t1 values( 282 ) +master-bin.000001 11095 Query 1 11186 use `test`; insert into t1 values( 281 ) +master-bin.000001 11186 Query 1 11277 use `test`; insert into t1 values( 280 ) +master-bin.000001 11277 Query 1 11368 use `test`; insert into t1 values( 279 ) +master-bin.000001 11368 Query 1 11459 use `test`; insert into t1 values( 278 ) +master-bin.000001 11459 Query 1 11550 use `test`; insert into t1 values( 277 ) +master-bin.000001 11550 Query 1 11641 use `test`; insert into t1 values( 276 ) +master-bin.000001 11641 Query 1 11732 use `test`; insert into t1 values( 275 ) +master-bin.000001 11732 Query 1 11823 use `test`; insert into t1 values( 274 ) +master-bin.000001 11823 Query 1 11914 use `test`; insert into t1 values( 273 ) +master-bin.000001 11914 Query 1 12005 use `test`; insert into t1 values( 272 ) +master-bin.000001 12005 Query 1 12096 use `test`; insert into t1 values( 271 ) +master-bin.000001 12096 Query 1 12187 use `test`; insert into t1 values( 270 ) +master-bin.000001 12187 Query 1 12278 use `test`; insert into t1 values( 269 ) +master-bin.000001 12278 Query 1 12369 use `test`; insert into t1 values( 268 ) +master-bin.000001 12369 Query 1 12460 use `test`; insert into t1 values( 267 ) +master-bin.000001 12460 Query 1 12551 use `test`; insert into t1 values( 266 ) +master-bin.000001 12551 Query 1 12642 use `test`; insert into t1 values( 265 ) +master-bin.000001 12642 Query 1 12733 use `test`; insert into t1 values( 264 ) +master-bin.000001 12733 Query 1 12824 use `test`; insert into t1 values( 263 ) +master-bin.000001 12824 Query 1 12915 use `test`; insert into t1 values( 262 ) +master-bin.000001 12915 Query 1 13006 use `test`; insert into t1 values( 261 ) +master-bin.000001 13006 Query 1 13097 use `test`; insert into t1 values( 260 ) +master-bin.000001 13097 Query 1 13188 use `test`; insert into t1 values( 259 ) +master-bin.000001 13188 Query 1 13279 use `test`; insert into t1 values( 258 ) +master-bin.000001 13279 Query 1 13370 use `test`; insert into t1 values( 257 ) +master-bin.000001 13370 Query 1 13461 use `test`; insert into t1 values( 256 ) +master-bin.000001 13461 Query 1 13552 use `test`; insert into t1 values( 255 ) +master-bin.000001 13552 Query 1 13643 use `test`; insert into t1 values( 254 ) +master-bin.000001 13643 Query 1 13734 use `test`; insert into t1 values( 253 ) +master-bin.000001 13734 Query 1 13825 use `test`; insert into t1 values( 252 ) +master-bin.000001 13825 Query 1 13916 use `test`; insert into t1 values( 251 ) +master-bin.000001 13916 Query 1 14007 use `test`; insert into t1 values( 250 ) +master-bin.000001 14007 Query 1 14098 use `test`; insert into t1 values( 249 ) +master-bin.000001 14098 Query 1 14189 use `test`; insert into t1 values( 248 ) +master-bin.000001 14189 Query 1 14280 use `test`; insert into t1 values( 247 ) +master-bin.000001 14280 Query 1 14371 use `test`; insert into t1 values( 246 ) +master-bin.000001 14371 Query 1 14462 use `test`; insert into t1 values( 245 ) +master-bin.000001 14462 Query 1 14553 use `test`; insert into t1 values( 244 ) +master-bin.000001 14553 Query 1 14644 use `test`; insert into t1 values( 243 ) +master-bin.000001 14644 Query 1 14735 use `test`; insert into t1 values( 242 ) +master-bin.000001 14735 Query 1 14826 use `test`; insert into t1 values( 241 ) +master-bin.000001 14826 Query 1 14917 use `test`; insert into t1 values( 240 ) +master-bin.000001 14917 Query 1 15008 use `test`; insert into t1 values( 239 ) +master-bin.000001 15008 Query 1 15099 use `test`; insert into t1 values( 238 ) +master-bin.000001 15099 Query 1 15190 use `test`; insert into t1 values( 237 ) +master-bin.000001 15190 Query 1 15281 use `test`; insert into t1 values( 236 ) +master-bin.000001 15281 Query 1 15372 use `test`; insert into t1 values( 235 ) +master-bin.000001 15372 Query 1 15463 use `test`; insert into t1 values( 234 ) +master-bin.000001 15463 Query 1 15554 use `test`; insert into t1 values( 233 ) +master-bin.000001 15554 Query 1 15645 use `test`; insert into t1 values( 232 ) +master-bin.000001 15645 Query 1 15736 use `test`; insert into t1 values( 231 ) +master-bin.000001 15736 Query 1 15827 use `test`; insert into t1 values( 230 ) +master-bin.000001 15827 Query 1 15918 use `test`; insert into t1 values( 229 ) +master-bin.000001 15918 Query 1 16009 use `test`; insert into t1 values( 228 ) +master-bin.000001 16009 Query 1 16100 use `test`; insert into t1 values( 227 ) +master-bin.000001 16100 Query 1 16191 use `test`; insert into t1 values( 226 ) +master-bin.000001 16191 Query 1 16282 use `test`; insert into t1 values( 225 ) +master-bin.000001 16282 Query 1 16373 use `test`; insert into t1 values( 224 ) +master-bin.000001 16373 Query 1 16464 use `test`; insert into t1 values( 223 ) +master-bin.000001 16464 Query 1 16555 use `test`; insert into t1 values( 222 ) +master-bin.000001 16555 Query 1 16646 use `test`; insert into t1 values( 221 ) +master-bin.000001 16646 Query 1 16737 use `test`; insert into t1 values( 220 ) +master-bin.000001 16737 Query 1 16828 use `test`; insert into t1 values( 219 ) +master-bin.000001 16828 Query 1 16919 use `test`; insert into t1 values( 218 ) +master-bin.000001 16919 Query 1 17010 use `test`; insert into t1 values( 217 ) +master-bin.000001 17010 Query 1 17101 use `test`; insert into t1 values( 216 ) +master-bin.000001 17101 Query 1 17192 use `test`; insert into t1 values( 215 ) +master-bin.000001 17192 Query 1 17283 use `test`; insert into t1 values( 214 ) +master-bin.000001 17283 Query 1 17374 use `test`; insert into t1 values( 213 ) +master-bin.000001 17374 Query 1 17465 use `test`; insert into t1 values( 212 ) +master-bin.000001 17465 Query 1 17556 use `test`; insert into t1 values( 211 ) +master-bin.000001 17556 Query 1 17647 use `test`; insert into t1 values( 210 ) +master-bin.000001 17647 Query 1 17738 use `test`; insert into t1 values( 209 ) +master-bin.000001 17738 Query 1 17829 use `test`; insert into t1 values( 208 ) +master-bin.000001 17829 Query 1 17920 use `test`; insert into t1 values( 207 ) +master-bin.000001 17920 Query 1 18011 use `test`; insert into t1 values( 206 ) +master-bin.000001 18011 Query 1 18102 use `test`; insert into t1 values( 205 ) +master-bin.000001 18102 Query 1 18193 use `test`; insert into t1 values( 204 ) +master-bin.000001 18193 Query 1 18284 use `test`; insert into t1 values( 203 ) +master-bin.000001 18284 Query 1 18375 use `test`; insert into t1 values( 202 ) +master-bin.000001 18375 Query 1 18466 use `test`; insert into t1 values( 201 ) +master-bin.000001 18466 Query 1 18557 use `test`; insert into t1 values( 200 ) +master-bin.000001 18557 Query 1 18648 use `test`; insert into t1 values( 199 ) +master-bin.000001 18648 Query 1 18739 use `test`; insert into t1 values( 198 ) +master-bin.000001 18739 Query 1 18830 use `test`; insert into t1 values( 197 ) +master-bin.000001 18830 Query 1 18921 use `test`; insert into t1 values( 196 ) +master-bin.000001 18921 Query 1 19012 use `test`; insert into t1 values( 195 ) +master-bin.000001 19012 Query 1 19103 use `test`; insert into t1 values( 194 ) +master-bin.000001 19103 Query 1 19194 use `test`; insert into t1 values( 193 ) +master-bin.000001 19194 Query 1 19285 use `test`; insert into t1 values( 192 ) +master-bin.000001 19285 Query 1 19376 use `test`; insert into t1 values( 191 ) +master-bin.000001 19376 Query 1 19467 use `test`; insert into t1 values( 190 ) +master-bin.000001 19467 Query 1 19558 use `test`; insert into t1 values( 189 ) +master-bin.000001 19558 Query 1 19649 use `test`; insert into t1 values( 188 ) +master-bin.000001 19649 Query 1 19740 use `test`; insert into t1 values( 187 ) +master-bin.000001 19740 Query 1 19831 use `test`; insert into t1 values( 186 ) +master-bin.000001 19831 Query 1 19922 use `test`; insert into t1 values( 185 ) +master-bin.000001 19922 Query 1 20013 use `test`; insert into t1 values( 184 ) +master-bin.000001 20013 Query 1 20104 use `test`; insert into t1 values( 183 ) +master-bin.000001 20104 Query 1 20195 use `test`; insert into t1 values( 182 ) +master-bin.000001 20195 Query 1 20286 use `test`; insert into t1 values( 181 ) +master-bin.000001 20286 Query 1 20377 use `test`; insert into t1 values( 180 ) +master-bin.000001 20377 Query 1 20468 use `test`; insert into t1 values( 179 ) +master-bin.000001 20468 Query 1 20559 use `test`; insert into t1 values( 178 ) +master-bin.000001 20559 Query 1 20650 use `test`; insert into t1 values( 177 ) +master-bin.000001 20650 Query 1 20741 use `test`; insert into t1 values( 176 ) +master-bin.000001 20741 Query 1 20832 use `test`; insert into t1 values( 175 ) +master-bin.000001 20832 Query 1 20923 use `test`; insert into t1 values( 174 ) +master-bin.000001 20923 Query 1 21014 use `test`; insert into t1 values( 173 ) +master-bin.000001 21014 Query 1 21105 use `test`; insert into t1 values( 172 ) +master-bin.000001 21105 Query 1 21196 use `test`; insert into t1 values( 171 ) +master-bin.000001 21196 Query 1 21287 use `test`; insert into t1 values( 170 ) +master-bin.000001 21287 Query 1 21378 use `test`; insert into t1 values( 169 ) +master-bin.000001 21378 Query 1 21469 use `test`; insert into t1 values( 168 ) +master-bin.000001 21469 Query 1 21560 use `test`; insert into t1 values( 167 ) +master-bin.000001 21560 Query 1 21651 use `test`; insert into t1 values( 166 ) +master-bin.000001 21651 Query 1 21742 use `test`; insert into t1 values( 165 ) +master-bin.000001 21742 Query 1 21833 use `test`; insert into t1 values( 164 ) +master-bin.000001 21833 Query 1 21924 use `test`; insert into t1 values( 163 ) +master-bin.000001 21924 Query 1 22015 use `test`; insert into t1 values( 162 ) +master-bin.000001 22015 Query 1 22106 use `test`; insert into t1 values( 161 ) +master-bin.000001 22106 Query 1 22197 use `test`; insert into t1 values( 160 ) +master-bin.000001 22197 Query 1 22288 use `test`; insert into t1 values( 159 ) +master-bin.000001 22288 Query 1 22379 use `test`; insert into t1 values( 158 ) +master-bin.000001 22379 Query 1 22470 use `test`; insert into t1 values( 157 ) +master-bin.000001 22470 Query 1 22561 use `test`; insert into t1 values( 156 ) +master-bin.000001 22561 Query 1 22652 use `test`; insert into t1 values( 155 ) +master-bin.000001 22652 Query 1 22743 use `test`; insert into t1 values( 154 ) +master-bin.000001 22743 Query 1 22834 use `test`; insert into t1 values( 153 ) +master-bin.000001 22834 Query 1 22925 use `test`; insert into t1 values( 152 ) +master-bin.000001 22925 Query 1 23016 use `test`; insert into t1 values( 151 ) +master-bin.000001 23016 Query 1 23107 use `test`; insert into t1 values( 150 ) +master-bin.000001 23107 Query 1 23198 use `test`; insert into t1 values( 149 ) +master-bin.000001 23198 Query 1 23289 use `test`; insert into t1 values( 148 ) +master-bin.000001 23289 Query 1 23380 use `test`; insert into t1 values( 147 ) +master-bin.000001 23380 Query 1 23471 use `test`; insert into t1 values( 146 ) +master-bin.000001 23471 Query 1 23562 use `test`; insert into t1 values( 145 ) +master-bin.000001 23562 Query 1 23653 use `test`; insert into t1 values( 144 ) +master-bin.000001 23653 Query 1 23744 use `test`; insert into t1 values( 143 ) +master-bin.000001 23744 Query 1 23835 use `test`; insert into t1 values( 142 ) +master-bin.000001 23835 Query 1 23926 use `test`; insert into t1 values( 141 ) +master-bin.000001 23926 Query 1 24017 use `test`; insert into t1 values( 140 ) +master-bin.000001 24017 Query 1 24108 use `test`; insert into t1 values( 139 ) +master-bin.000001 24108 Query 1 24199 use `test`; insert into t1 values( 138 ) +master-bin.000001 24199 Query 1 24290 use `test`; insert into t1 values( 137 ) +master-bin.000001 24290 Query 1 24381 use `test`; insert into t1 values( 136 ) +master-bin.000001 24381 Query 1 24472 use `test`; insert into t1 values( 135 ) +master-bin.000001 24472 Query 1 24563 use `test`; insert into t1 values( 134 ) +master-bin.000001 24563 Query 1 24654 use `test`; insert into t1 values( 133 ) +master-bin.000001 24654 Query 1 24745 use `test`; insert into t1 values( 132 ) +master-bin.000001 24745 Query 1 24836 use `test`; insert into t1 values( 131 ) +master-bin.000001 24836 Query 1 24927 use `test`; insert into t1 values( 130 ) +master-bin.000001 24927 Query 1 25018 use `test`; insert into t1 values( 129 ) +master-bin.000001 25018 Query 1 25109 use `test`; insert into t1 values( 128 ) +master-bin.000001 25109 Query 1 25200 use `test`; insert into t1 values( 127 ) +master-bin.000001 25200 Query 1 25291 use `test`; insert into t1 values( 126 ) +master-bin.000001 25291 Query 1 25382 use `test`; insert into t1 values( 125 ) +master-bin.000001 25382 Query 1 25473 use `test`; insert into t1 values( 124 ) +master-bin.000001 25473 Query 1 25564 use `test`; insert into t1 values( 123 ) +master-bin.000001 25564 Query 1 25655 use `test`; insert into t1 values( 122 ) +master-bin.000001 25655 Query 1 25746 use `test`; insert into t1 values( 121 ) +master-bin.000001 25746 Query 1 25837 use `test`; insert into t1 values( 120 ) +master-bin.000001 25837 Query 1 25928 use `test`; insert into t1 values( 119 ) +master-bin.000001 25928 Query 1 26019 use `test`; insert into t1 values( 118 ) +master-bin.000001 26019 Query 1 26110 use `test`; insert into t1 values( 117 ) +master-bin.000001 26110 Query 1 26201 use `test`; insert into t1 values( 116 ) +master-bin.000001 26201 Query 1 26292 use `test`; insert into t1 values( 115 ) +master-bin.000001 26292 Query 1 26383 use `test`; insert into t1 values( 114 ) +master-bin.000001 26383 Query 1 26474 use `test`; insert into t1 values( 113 ) +master-bin.000001 26474 Query 1 26565 use `test`; insert into t1 values( 112 ) +master-bin.000001 26565 Query 1 26656 use `test`; insert into t1 values( 111 ) +master-bin.000001 26656 Query 1 26747 use `test`; insert into t1 values( 110 ) +master-bin.000001 26747 Query 1 26838 use `test`; insert into t1 values( 109 ) +master-bin.000001 26838 Query 1 26929 use `test`; insert into t1 values( 108 ) +master-bin.000001 26929 Query 1 27020 use `test`; insert into t1 values( 107 ) +master-bin.000001 27020 Query 1 27111 use `test`; insert into t1 values( 106 ) +master-bin.000001 27111 Query 1 27202 use `test`; insert into t1 values( 105 ) +master-bin.000001 27202 Query 1 27293 use `test`; insert into t1 values( 104 ) +master-bin.000001 27293 Query 1 27384 use `test`; insert into t1 values( 103 ) +master-bin.000001 27384 Query 1 27475 use `test`; insert into t1 values( 102 ) +master-bin.000001 27475 Query 1 27566 use `test`; insert into t1 values( 101 ) +master-bin.000001 27566 Query 1 27657 use `test`; insert into t1 values( 100 ) +master-bin.000001 27657 Query 1 27747 use `test`; insert into t1 values( 99 ) +master-bin.000001 27747 Query 1 27837 use `test`; insert into t1 values( 98 ) +master-bin.000001 27837 Query 1 27927 use `test`; insert into t1 values( 97 ) +master-bin.000001 27927 Query 1 28017 use `test`; insert into t1 values( 96 ) +master-bin.000001 28017 Query 1 28107 use `test`; insert into t1 values( 95 ) +master-bin.000001 28107 Query 1 28197 use `test`; insert into t1 values( 94 ) +master-bin.000001 28197 Query 1 28287 use `test`; insert into t1 values( 93 ) +master-bin.000001 28287 Query 1 28377 use `test`; insert into t1 values( 92 ) +master-bin.000001 28377 Query 1 28467 use `test`; insert into t1 values( 91 ) +master-bin.000001 28467 Query 1 28557 use `test`; insert into t1 values( 90 ) +master-bin.000001 28557 Query 1 28647 use `test`; insert into t1 values( 89 ) +master-bin.000001 28647 Query 1 28737 use `test`; insert into t1 values( 88 ) +master-bin.000001 28737 Query 1 28827 use `test`; insert into t1 values( 87 ) +master-bin.000001 28827 Query 1 28917 use `test`; insert into t1 values( 86 ) +master-bin.000001 28917 Query 1 29007 use `test`; insert into t1 values( 85 ) +master-bin.000001 29007 Query 1 29097 use `test`; insert into t1 values( 84 ) +master-bin.000001 29097 Query 1 29187 use `test`; insert into t1 values( 83 ) +master-bin.000001 29187 Query 1 29277 use `test`; insert into t1 values( 82 ) +master-bin.000001 29277 Query 1 29367 use `test`; insert into t1 values( 81 ) +master-bin.000001 29367 Query 1 29457 use `test`; insert into t1 values( 80 ) +master-bin.000001 29457 Query 1 29547 use `test`; insert into t1 values( 79 ) +master-bin.000001 29547 Query 1 29637 use `test`; insert into t1 values( 78 ) +master-bin.000001 29637 Query 1 29727 use `test`; insert into t1 values( 77 ) +master-bin.000001 29727 Query 1 29817 use `test`; insert into t1 values( 76 ) +master-bin.000001 29817 Query 1 29907 use `test`; insert into t1 values( 75 ) +master-bin.000001 29907 Query 1 29997 use `test`; insert into t1 values( 74 ) +master-bin.000001 29997 Query 1 30087 use `test`; insert into t1 values( 73 ) +master-bin.000001 30087 Query 1 30177 use `test`; insert into t1 values( 72 ) +master-bin.000001 30177 Query 1 30267 use `test`; insert into t1 values( 71 ) +master-bin.000001 30267 Query 1 30357 use `test`; insert into t1 values( 70 ) +master-bin.000001 30357 Query 1 30447 use `test`; insert into t1 values( 69 ) +master-bin.000001 30447 Query 1 30537 use `test`; insert into t1 values( 68 ) +master-bin.000001 30537 Query 1 30627 use `test`; insert into t1 values( 67 ) +master-bin.000001 30627 Query 1 30717 use `test`; insert into t1 values( 66 ) +master-bin.000001 30717 Query 1 30807 use `test`; insert into t1 values( 65 ) +master-bin.000001 30807 Query 1 30897 use `test`; insert into t1 values( 64 ) +master-bin.000001 30897 Query 1 30987 use `test`; insert into t1 values( 63 ) +master-bin.000001 30987 Query 1 31077 use `test`; insert into t1 values( 62 ) +master-bin.000001 31077 Query 1 31167 use `test`; insert into t1 values( 61 ) +master-bin.000001 31167 Query 1 31257 use `test`; insert into t1 values( 60 ) +master-bin.000001 31257 Query 1 31347 use `test`; insert into t1 values( 59 ) +master-bin.000001 31347 Query 1 31437 use `test`; insert into t1 values( 58 ) +master-bin.000001 31437 Query 1 31527 use `test`; insert into t1 values( 57 ) +master-bin.000001 31527 Query 1 31617 use `test`; insert into t1 values( 56 ) +master-bin.000001 31617 Query 1 31707 use `test`; insert into t1 values( 55 ) +master-bin.000001 31707 Query 1 31797 use `test`; insert into t1 values( 54 ) +master-bin.000001 31797 Query 1 31887 use `test`; insert into t1 values( 53 ) +master-bin.000001 31887 Query 1 31977 use `test`; insert into t1 values( 52 ) +master-bin.000001 31977 Query 1 32067 use `test`; insert into t1 values( 51 ) +master-bin.000001 32067 Query 1 32157 use `test`; insert into t1 values( 50 ) +master-bin.000001 32157 Query 1 32247 use `test`; insert into t1 values( 49 ) +master-bin.000001 32247 Query 1 32337 use `test`; insert into t1 values( 48 ) +master-bin.000001 32337 Query 1 32427 use `test`; insert into t1 values( 47 ) +master-bin.000001 32427 Query 1 32517 use `test`; insert into t1 values( 46 ) +master-bin.000001 32517 Query 1 32607 use `test`; insert into t1 values( 45 ) +master-bin.000001 32607 Query 1 32697 use `test`; insert into t1 values( 44 ) +master-bin.000001 32697 Query 1 32787 use `test`; insert into t1 values( 43 ) +master-bin.000001 32787 Query 1 32877 use `test`; insert into t1 values( 42 ) +master-bin.000001 32877 Query 1 32967 use `test`; insert into t1 values( 41 ) +master-bin.000001 32967 Query 1 33057 use `test`; insert into t1 values( 40 ) +master-bin.000001 33057 Query 1 33147 use `test`; insert into t1 values( 39 ) +master-bin.000001 33147 Query 1 33237 use `test`; insert into t1 values( 38 ) +master-bin.000001 33237 Query 1 33327 use `test`; insert into t1 values( 37 ) +master-bin.000001 33327 Query 1 33417 use `test`; insert into t1 values( 36 ) +master-bin.000001 33417 Query 1 33507 use `test`; insert into t1 values( 35 ) +master-bin.000001 33507 Query 1 33597 use `test`; insert into t1 values( 34 ) +master-bin.000001 33597 Query 1 33687 use `test`; insert into t1 values( 33 ) +master-bin.000001 33687 Query 1 33777 use `test`; insert into t1 values( 32 ) +master-bin.000001 33777 Query 1 33867 use `test`; insert into t1 values( 31 ) +master-bin.000001 33867 Query 1 33957 use `test`; insert into t1 values( 30 ) +master-bin.000001 33957 Query 1 34047 use `test`; insert into t1 values( 29 ) +master-bin.000001 34047 Query 1 34137 use `test`; insert into t1 values( 28 ) +master-bin.000001 34137 Query 1 34227 use `test`; insert into t1 values( 27 ) +master-bin.000001 34227 Query 1 34317 use `test`; insert into t1 values( 26 ) +master-bin.000001 34317 Query 1 34407 use `test`; insert into t1 values( 25 ) +master-bin.000001 34407 Query 1 34497 use `test`; insert into t1 values( 24 ) +master-bin.000001 34497 Query 1 34587 use `test`; insert into t1 values( 23 ) +master-bin.000001 34587 Query 1 34677 use `test`; insert into t1 values( 22 ) +master-bin.000001 34677 Query 1 34767 use `test`; insert into t1 values( 21 ) +master-bin.000001 34767 Query 1 34857 use `test`; insert into t1 values( 20 ) +master-bin.000001 34857 Query 1 34947 use `test`; insert into t1 values( 19 ) +master-bin.000001 34947 Query 1 35037 use `test`; insert into t1 values( 18 ) +master-bin.000001 35037 Query 1 35127 use `test`; insert into t1 values( 17 ) +master-bin.000001 35127 Query 1 35217 use `test`; insert into t1 values( 16 ) +master-bin.000001 35217 Query 1 35307 use `test`; insert into t1 values( 15 ) +master-bin.000001 35307 Query 1 35397 use `test`; insert into t1 values( 14 ) +master-bin.000001 35397 Query 1 35487 use `test`; insert into t1 values( 13 ) +master-bin.000001 35487 Query 1 35577 use `test`; insert into t1 values( 12 ) +master-bin.000001 35577 Query 1 35667 use `test`; insert into t1 values( 11 ) +master-bin.000001 35667 Query 1 35757 use `test`; insert into t1 values( 10 ) +master-bin.000001 35757 Query 1 35846 use `test`; insert into t1 values( 9 ) +master-bin.000001 35846 Query 1 35935 use `test`; insert into t1 values( 8 ) +master-bin.000001 35935 Query 1 36024 use `test`; insert into t1 values( 7 ) +master-bin.000001 36024 Query 1 36113 use `test`; insert into t1 values( 6 ) +master-bin.000001 36113 Query 1 36202 use `test`; insert into t1 values( 5 ) +master-bin.000001 36202 Query 1 36291 use `test`; insert into t1 values( 4 ) +master-bin.000001 36291 Query 1 36380 use `test`; insert into t1 values( 3 ) +master-bin.000001 36380 Query 1 36469 use `test`; insert into t1 values( 2 ) +master-bin.000001 36469 Query 1 36558 use `test`; insert into t1 values( 1 ) +master-bin.000001 36558 Xid 1 36585 COMMIT /* xid=186 */ +master-bin.000001 36585 Rotate 1 36629 master-bin.000002;pos=4 +drop table t1; +set global binlog_cache_size=@bcs; +set session autocommit = @ac; End of 5.0 tests diff --git a/mysql-test/t/binlog.test b/mysql-test/t/binlog.test index 6271a8f95a8..d5479a45226 100644 --- a/mysql-test/t/binlog.test +++ b/mysql-test/t/binlog.test @@ -4,7 +4,6 @@ -- source include/have_log_bin.inc -- source include/not_embedded.inc -- source include/have_innodb.inc --- source include/have_log_bin.inc --disable_warnings drop table if exists t1, t2; @@ -137,4 +136,34 @@ show binlog events from 0; set session autocommit = @ac; +# now show that nothing breaks if we need to read from the cache more +# than once, resulting in split event-headers + +set @bcs = @@binlog_cache_size; +set @ac = @@autocommit; + +set global binlog_cache_size=4096; +set autocommit= 0; +reset master; + +create table t1 (a int) engine=innodb; + +let $1=400; +disable_query_log; +begin; +while ($1) +{ + eval insert into t1 values( $1 ); + dec $1; +} +commit; +enable_query_log; + +show binlog events from 0; + +drop table t1; + +set global binlog_cache_size=@bcs; +set session autocommit = @ac; + --echo End of 5.0 tests diff --git a/sql/log.cc b/sql/log.cc index af8168c6a46..289d98e63d3 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1918,58 +1918,61 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) memcpy((char *)cache->read_pos, &header[carry], LOG_EVENT_HEADER_LEN - carry); /* next event header at ... */ - hdr_offs = LOG_EVENT_HEADER_LEN - carry + - uint4korr(&header[EVENT_LEN_OFFSET]); + hdr_offs = uint4korr(&header[EVENT_LEN_OFFSET]) - carry; carry= 0; } /* if there is anything to write, process it. */ - if(likely(length > 0)) + if (likely(length > 0)) { /* - next header beyond current read-buffer? we'll get it later - (though not necessarily in the very next iteration). + process all event-headers in this (partial) cache. + if next header is beyond current read-buffer, + we'll get it later (though not necessarily in the + very next iteration, just "eventually"). */ - if (hdr_offs >= length) - hdr_offs -= length; - else + while (hdr_offs < length) { + /* + partial header only? save what we can get, process once + we get the rest. + */ - /* process all event-headers in this (partial) cache. */ + if (hdr_offs + LOG_EVENT_HEADER_LEN > length) + { + carry= length - hdr_offs; + memcpy(header, (char *)cache->read_pos + hdr_offs, carry); + length= hdr_offs; + } + else + { + /* we've got a full event-header, and it came in one piece */ - do { + char *log_pos= (char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET; - /* - partial header only? save what we can get, process once - we get the rest. - */ + /* fix end_log_pos */ + val= uint4korr(log_pos) + group; + int4store(log_pos, val); - if (hdr_offs + LOG_EVENT_HEADER_LEN > length) - { - carry= length - hdr_offs; - memcpy(header, (char *)cache->read_pos + hdr_offs, carry); - length= hdr_offs; - } - else - { - /* we've got a full event-header, and it came in one piece */ + /* next event header at ... */ + log_pos= (char *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET; + hdr_offs += uint4korr(log_pos); - char *log_pos= (char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET; - - /* fix end_log_pos */ - val= uint4korr(log_pos) + group; - int4store(log_pos, val); - - /* next event header at ... */ - log_pos= (char *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET; - hdr_offs += uint4korr(log_pos); - - } - } while (hdr_offs < length); + } } + + /* + Adjust hdr_offs. Note that this doesn't mean it will necessarily + be valid in the next iteration; if the current event is very long, + it may take a couple of read-iterations (and subsequent fixings + of hdr_offs) for it to become valid again. + if we had a split header, hdr_offs was already fixed above. + */ + if (carry == 0) + hdr_offs -= length; } /* Write data to the binary log file */ From 5b98b71db609403ce16c9a133b3866cb403feb1e Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Sat, 30 Jun 2007 03:32:33 +0200 Subject: [PATCH 32/38] Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB previous correction didn't. make sure "tail" is fixed up when filling cache several times; rework formulae. --- Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 into sin.intern.azundris.com:/home/tnurnberg/22540/51-22540 --- mysql-test/extra/binlog_tests/binlog.test | 31 +- mysql-test/r/binlog_row_binlog.result | 947 ++++++++++++++++++++++ mysql-test/r/binlog_stm_binlog.result | 416 ++++++++++ mysql-test/r/rpl_row_create_table.result | 28 +- sql/log.cc | 73 +- 5 files changed, 1445 insertions(+), 50 deletions(-) diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test index 02d5a92ea38..0a2b84e055b 100644 --- a/mysql-test/extra/binlog_tests/binlog.test +++ b/mysql-test/extra/binlog_tests/binlog.test @@ -5,7 +5,6 @@ -- source include/have_log_bin.inc -- source include/not_embedded.inc -- source include/have_innodb.inc --- source include/have_log_bin.inc -- source include/have_debug.inc --disable_warnings @@ -139,6 +138,36 @@ show binlog events from 0; set session autocommit = @ac; +# now show that nothing breaks if we need to read from the cache more +# than once, resulting in split event-headers + +set @bcs = @@binlog_cache_size; +set @ac = @@autocommit; + +set global binlog_cache_size=4096; +set autocommit= 0; +reset master; + +create table t1 (a int) engine=innodb; + +let $1=400; +disable_query_log; +begin; +while ($1) +{ + eval insert into t1 values( $1 ); + dec $1; +} +commit; +enable_query_log; + +show binlog events from 0; + +drop table t1; + +set global binlog_cache_size=@bcs; +set session autocommit = @ac; + --echo End of 5.0 tests # Test of a too big SET INSERT_ID: see if the truncated value goes diff --git a/mysql-test/r/binlog_row_binlog.result b/mysql-test/r/binlog_row_binlog.result index 6fcaad010d2..89618d37cc1 100644 --- a/mysql-test/r/binlog_row_binlog.result +++ b/mysql-test/r/binlog_row_binlog.result @@ -235,6 +235,953 @@ master-bin.000001 # Rotate 1 # master-bin.000002;pos=4 show binlog events in 'master-bin.000002' from 106; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000002 # Query 1 # use `test`; drop table t1 +set @ac = @@autocommit; +set autocommit= 0; +reset master; +create table t1(n int) engine=innodb; +begin; +insert into t1 values (1); +insert into t1 values (2); +insert into t1 values (3); +commit; +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb +master-bin.000001 205 Query 1 273 use `test`; BEGIN +master-bin.000001 273 Table_map 1 312 table_id: # (test.t1) +master-bin.000001 312 Write_rows 1 346 table_id: # flags: STMT_END_F +master-bin.000001 346 Table_map 1 385 table_id: # (test.t1) +master-bin.000001 385 Write_rows 1 419 table_id: # flags: STMT_END_F +master-bin.000001 419 Table_map 1 458 table_id: # (test.t1) +master-bin.000001 458 Write_rows 1 492 table_id: # flags: STMT_END_F +master-bin.000001 492 Xid 1 519 COMMIT /* XID */ +master-bin.000001 519 Query 1 595 use `test`; drop table t1 +set autocommit= 1; +reset master; +create table t1(n int) engine=innodb; +insert into t1 values (1); +insert into t1 values (2); +insert into t1 values (3); +commit; +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb +master-bin.000001 205 Table_map 1 244 table_id: # (test.t1) +master-bin.000001 244 Write_rows 1 278 table_id: # flags: STMT_END_F +master-bin.000001 278 Xid 1 305 COMMIT /* XID */ +master-bin.000001 305 Table_map 1 344 table_id: # (test.t1) +master-bin.000001 344 Write_rows 1 378 table_id: # flags: STMT_END_F +master-bin.000001 378 Xid 1 405 COMMIT /* XID */ +master-bin.000001 405 Table_map 1 444 table_id: # (test.t1) +master-bin.000001 444 Write_rows 1 478 table_id: # flags: STMT_END_F +master-bin.000001 478 Xid 1 505 COMMIT /* XID */ +master-bin.000001 505 Query 1 581 use `test`; drop table t1 +reset master; +create table t1(n int) engine=myisam; +begin; +insert into t1 values (4); +insert into t1 values (5); +insert into t1 values (6); +commit; +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=myisam +master-bin.000001 205 Table_map 1 244 table_id: # (test.t1) +master-bin.000001 244 Write_rows 1 278 table_id: # flags: STMT_END_F +master-bin.000001 278 Table_map 1 317 table_id: # (test.t1) +master-bin.000001 317 Write_rows 1 351 table_id: # flags: STMT_END_F +master-bin.000001 351 Table_map 1 390 table_id: # (test.t1) +master-bin.000001 390 Write_rows 1 424 table_id: # flags: STMT_END_F +master-bin.000001 424 Query 1 500 use `test`; drop table t1 +set autocommit= 1; +reset master; +create table t1(n int) engine=innodb; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 205 +insert into t1 values (1); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 305 +insert into t1 values (2); +insert into t1 values (3); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 505 +commit; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 505 +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb +master-bin.000001 205 Table_map 1 244 table_id: # (test.t1) +master-bin.000001 244 Write_rows 1 278 table_id: # flags: STMT_END_F +master-bin.000001 278 Xid 1 305 COMMIT /* XID */ +master-bin.000001 305 Table_map 1 344 table_id: # (test.t1) +master-bin.000001 344 Write_rows 1 378 table_id: # flags: STMT_END_F +master-bin.000001 378 Xid 1 405 COMMIT /* XID */ +master-bin.000001 405 Table_map 1 444 table_id: # (test.t1) +master-bin.000001 444 Write_rows 1 478 table_id: # flags: STMT_END_F +master-bin.000001 478 Xid 1 505 COMMIT /* XID */ +master-bin.000001 505 Query 1 581 use `test`; drop table t1 +set autocommit= 0; +reset master; +create table t1(n int) engine=myisam; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 205 +insert into t1 values (4); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 278 +insert into t1 values (5); +insert into t1 values (6); +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 424 +commit; +show master status; +File Position Binlog_Do_DB Binlog_Ignore_DB +master-bin.000001 424 +drop table t1; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 +master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=myisam +master-bin.000001 205 Table_map 1 244 table_id: # (test.t1) +master-bin.000001 244 Write_rows 1 278 table_id: # flags: STMT_END_F +master-bin.000001 278 Table_map 1 317 table_id: # (test.t1) +master-bin.000001 317 Write_rows 1 351 table_id: # flags: STMT_END_F +master-bin.000001 351 Table_map 1 390 table_id: # (test.t1) +master-bin.000001 390 Write_rows 1 424 table_id: # flags: STMT_END_F +master-bin.000001 424 Query 1 500 use `test`; drop table t1 +set session autocommit = @ac; +set @bcs = @@binlog_cache_size; +set @ac = @@autocommit; +set global binlog_cache_size=4096; +set autocommit= 0; +reset master; +create table t1 (a int) engine=innodb; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server ver: 5.1.21-beta-debug-log, Binlog ver: 4 +master-bin.000001 106 Query 1 206 use `test`; create table t1 (a int) engine=innodb +master-bin.000001 206 Query 1 274 use `test`; BEGIN +master-bin.000001 274 Table_map 1 313 table_id: 25 (test.t1) +master-bin.000001 313 Write_rows 1 347 table_id: 25 flags: STMT_END_F +master-bin.000001 347 Table_map 1 386 table_id: 25 (test.t1) +master-bin.000001 386 Write_rows 1 420 table_id: 25 flags: STMT_END_F +master-bin.000001 420 Table_map 1 459 table_id: 25 (test.t1) +master-bin.000001 459 Write_rows 1 493 table_id: 25 flags: STMT_END_F +master-bin.000001 493 Table_map 1 532 table_id: 25 (test.t1) +master-bin.000001 532 Write_rows 1 566 table_id: 25 flags: STMT_END_F +master-bin.000001 566 Table_map 1 605 table_id: 25 (test.t1) +master-bin.000001 605 Write_rows 1 639 table_id: 25 flags: STMT_END_F +master-bin.000001 639 Table_map 1 678 table_id: 25 (test.t1) +master-bin.000001 678 Write_rows 1 712 table_id: 25 flags: STMT_END_F +master-bin.000001 712 Table_map 1 751 table_id: 25 (test.t1) +master-bin.000001 751 Write_rows 1 785 table_id: 25 flags: STMT_END_F +master-bin.000001 785 Table_map 1 824 table_id: 25 (test.t1) +master-bin.000001 824 Write_rows 1 858 table_id: 25 flags: STMT_END_F +master-bin.000001 858 Table_map 1 897 table_id: 25 (test.t1) +master-bin.000001 897 Write_rows 1 931 table_id: 25 flags: STMT_END_F +master-bin.000001 931 Table_map 1 970 table_id: 25 (test.t1) +master-bin.000001 970 Write_rows 1 1004 table_id: 25 flags: STMT_END_F +master-bin.000001 1004 Table_map 1 1043 table_id: 25 (test.t1) +master-bin.000001 1043 Write_rows 1 1077 table_id: 25 flags: STMT_END_F +master-bin.000001 1077 Table_map 1 1116 table_id: 25 (test.t1) +master-bin.000001 1116 Write_rows 1 1150 table_id: 25 flags: STMT_END_F +master-bin.000001 1150 Table_map 1 1189 table_id: 25 (test.t1) +master-bin.000001 1189 Write_rows 1 1223 table_id: 25 flags: STMT_END_F +master-bin.000001 1223 Table_map 1 1262 table_id: 25 (test.t1) +master-bin.000001 1262 Write_rows 1 1296 table_id: 25 flags: STMT_END_F +master-bin.000001 1296 Table_map 1 1335 table_id: 25 (test.t1) +master-bin.000001 1335 Write_rows 1 1369 table_id: 25 flags: STMT_END_F +master-bin.000001 1369 Table_map 1 1408 table_id: 25 (test.t1) +master-bin.000001 1408 Write_rows 1 1442 table_id: 25 flags: STMT_END_F +master-bin.000001 1442 Table_map 1 1481 table_id: 25 (test.t1) +master-bin.000001 1481 Write_rows 1 1515 table_id: 25 flags: STMT_END_F +master-bin.000001 1515 Table_map 1 1554 table_id: 25 (test.t1) +master-bin.000001 1554 Write_rows 1 1588 table_id: 25 flags: STMT_END_F +master-bin.000001 1588 Table_map 1 1627 table_id: 25 (test.t1) +master-bin.000001 1627 Write_rows 1 1661 table_id: 25 flags: STMT_END_F +master-bin.000001 1661 Table_map 1 1700 table_id: 25 (test.t1) +master-bin.000001 1700 Write_rows 1 1734 table_id: 25 flags: STMT_END_F +master-bin.000001 1734 Table_map 1 1773 table_id: 25 (test.t1) +master-bin.000001 1773 Write_rows 1 1807 table_id: 25 flags: STMT_END_F +master-bin.000001 1807 Table_map 1 1846 table_id: 25 (test.t1) +master-bin.000001 1846 Write_rows 1 1880 table_id: 25 flags: STMT_END_F +master-bin.000001 1880 Table_map 1 1919 table_id: 25 (test.t1) +master-bin.000001 1919 Write_rows 1 1953 table_id: 25 flags: STMT_END_F +master-bin.000001 1953 Table_map 1 1992 table_id: 25 (test.t1) +master-bin.000001 1992 Write_rows 1 2026 table_id: 25 flags: STMT_END_F +master-bin.000001 2026 Table_map 1 2065 table_id: 25 (test.t1) +master-bin.000001 2065 Write_rows 1 2099 table_id: 25 flags: STMT_END_F +master-bin.000001 2099 Table_map 1 2138 table_id: 25 (test.t1) +master-bin.000001 2138 Write_rows 1 2172 table_id: 25 flags: STMT_END_F +master-bin.000001 2172 Table_map 1 2211 table_id: 25 (test.t1) +master-bin.000001 2211 Write_rows 1 2245 table_id: 25 flags: STMT_END_F +master-bin.000001 2245 Table_map 1 2284 table_id: 25 (test.t1) +master-bin.000001 2284 Write_rows 1 2318 table_id: 25 flags: STMT_END_F +master-bin.000001 2318 Table_map 1 2357 table_id: 25 (test.t1) +master-bin.000001 2357 Write_rows 1 2391 table_id: 25 flags: STMT_END_F +master-bin.000001 2391 Table_map 1 2430 table_id: 25 (test.t1) +master-bin.000001 2430 Write_rows 1 2464 table_id: 25 flags: STMT_END_F +master-bin.000001 2464 Table_map 1 2503 table_id: 25 (test.t1) +master-bin.000001 2503 Write_rows 1 2537 table_id: 25 flags: STMT_END_F +master-bin.000001 2537 Table_map 1 2576 table_id: 25 (test.t1) +master-bin.000001 2576 Write_rows 1 2610 table_id: 25 flags: STMT_END_F +master-bin.000001 2610 Table_map 1 2649 table_id: 25 (test.t1) +master-bin.000001 2649 Write_rows 1 2683 table_id: 25 flags: STMT_END_F +master-bin.000001 2683 Table_map 1 2722 table_id: 25 (test.t1) +master-bin.000001 2722 Write_rows 1 2756 table_id: 25 flags: STMT_END_F +master-bin.000001 2756 Table_map 1 2795 table_id: 25 (test.t1) +master-bin.000001 2795 Write_rows 1 2829 table_id: 25 flags: STMT_END_F +master-bin.000001 2829 Table_map 1 2868 table_id: 25 (test.t1) +master-bin.000001 2868 Write_rows 1 2902 table_id: 25 flags: STMT_END_F +master-bin.000001 2902 Table_map 1 2941 table_id: 25 (test.t1) +master-bin.000001 2941 Write_rows 1 2975 table_id: 25 flags: STMT_END_F +master-bin.000001 2975 Table_map 1 3014 table_id: 25 (test.t1) +master-bin.000001 3014 Write_rows 1 3048 table_id: 25 flags: STMT_END_F +master-bin.000001 3048 Table_map 1 3087 table_id: 25 (test.t1) +master-bin.000001 3087 Write_rows 1 3121 table_id: 25 flags: STMT_END_F +master-bin.000001 3121 Table_map 1 3160 table_id: 25 (test.t1) +master-bin.000001 3160 Write_rows 1 3194 table_id: 25 flags: STMT_END_F +master-bin.000001 3194 Table_map 1 3233 table_id: 25 (test.t1) +master-bin.000001 3233 Write_rows 1 3267 table_id: 25 flags: STMT_END_F +master-bin.000001 3267 Table_map 1 3306 table_id: 25 (test.t1) +master-bin.000001 3306 Write_rows 1 3340 table_id: 25 flags: STMT_END_F +master-bin.000001 3340 Table_map 1 3379 table_id: 25 (test.t1) +master-bin.000001 3379 Write_rows 1 3413 table_id: 25 flags: STMT_END_F +master-bin.000001 3413 Table_map 1 3452 table_id: 25 (test.t1) +master-bin.000001 3452 Write_rows 1 3486 table_id: 25 flags: STMT_END_F +master-bin.000001 3486 Table_map 1 3525 table_id: 25 (test.t1) +master-bin.000001 3525 Write_rows 1 3559 table_id: 25 flags: STMT_END_F +master-bin.000001 3559 Table_map 1 3598 table_id: 25 (test.t1) +master-bin.000001 3598 Write_rows 1 3632 table_id: 25 flags: STMT_END_F +master-bin.000001 3632 Table_map 1 3671 table_id: 25 (test.t1) +master-bin.000001 3671 Write_rows 1 3705 table_id: 25 flags: STMT_END_F +master-bin.000001 3705 Table_map 1 3744 table_id: 25 (test.t1) +master-bin.000001 3744 Write_rows 1 3778 table_id: 25 flags: STMT_END_F +master-bin.000001 3778 Table_map 1 3817 table_id: 25 (test.t1) +master-bin.000001 3817 Write_rows 1 3851 table_id: 25 flags: STMT_END_F +master-bin.000001 3851 Table_map 1 3890 table_id: 25 (test.t1) +master-bin.000001 3890 Write_rows 1 3924 table_id: 25 flags: STMT_END_F +master-bin.000001 3924 Table_map 1 3963 table_id: 25 (test.t1) +master-bin.000001 3963 Write_rows 1 3997 table_id: 25 flags: STMT_END_F +master-bin.000001 3997 Table_map 1 4036 table_id: 25 (test.t1) +master-bin.000001 4036 Write_rows 1 4070 table_id: 25 flags: STMT_END_F +master-bin.000001 4070 Table_map 1 4109 table_id: 25 (test.t1) +master-bin.000001 4109 Write_rows 1 4143 table_id: 25 flags: STMT_END_F +master-bin.000001 4143 Table_map 1 4182 table_id: 25 (test.t1) +master-bin.000001 4182 Write_rows 1 4216 table_id: 25 flags: STMT_END_F +master-bin.000001 4216 Table_map 1 4255 table_id: 25 (test.t1) +master-bin.000001 4255 Write_rows 1 4289 table_id: 25 flags: STMT_END_F +master-bin.000001 4289 Table_map 1 4328 table_id: 25 (test.t1) +master-bin.000001 4328 Write_rows 1 4362 table_id: 25 flags: STMT_END_F +master-bin.000001 4362 Table_map 1 4401 table_id: 25 (test.t1) +master-bin.000001 4401 Write_rows 1 4435 table_id: 25 flags: STMT_END_F +master-bin.000001 4435 Table_map 1 4474 table_id: 25 (test.t1) +master-bin.000001 4474 Write_rows 1 4508 table_id: 25 flags: STMT_END_F +master-bin.000001 4508 Table_map 1 4547 table_id: 25 (test.t1) +master-bin.000001 4547 Write_rows 1 4581 table_id: 25 flags: STMT_END_F +master-bin.000001 4581 Table_map 1 4620 table_id: 25 (test.t1) +master-bin.000001 4620 Write_rows 1 4654 table_id: 25 flags: STMT_END_F +master-bin.000001 4654 Table_map 1 4693 table_id: 25 (test.t1) +master-bin.000001 4693 Write_rows 1 4727 table_id: 25 flags: STMT_END_F +master-bin.000001 4727 Table_map 1 4766 table_id: 25 (test.t1) +master-bin.000001 4766 Write_rows 1 4800 table_id: 25 flags: STMT_END_F +master-bin.000001 4800 Table_map 1 4839 table_id: 25 (test.t1) +master-bin.000001 4839 Write_rows 1 4873 table_id: 25 flags: STMT_END_F +master-bin.000001 4873 Table_map 1 4912 table_id: 25 (test.t1) +master-bin.000001 4912 Write_rows 1 4946 table_id: 25 flags: STMT_END_F +master-bin.000001 4946 Table_map 1 4985 table_id: 25 (test.t1) +master-bin.000001 4985 Write_rows 1 5019 table_id: 25 flags: STMT_END_F +master-bin.000001 5019 Table_map 1 5058 table_id: 25 (test.t1) +master-bin.000001 5058 Write_rows 1 5092 table_id: 25 flags: STMT_END_F +master-bin.000001 5092 Table_map 1 5131 table_id: 25 (test.t1) +master-bin.000001 5131 Write_rows 1 5165 table_id: 25 flags: STMT_END_F +master-bin.000001 5165 Table_map 1 5204 table_id: 25 (test.t1) +master-bin.000001 5204 Write_rows 1 5238 table_id: 25 flags: STMT_END_F +master-bin.000001 5238 Table_map 1 5277 table_id: 25 (test.t1) +master-bin.000001 5277 Write_rows 1 5311 table_id: 25 flags: STMT_END_F +master-bin.000001 5311 Table_map 1 5350 table_id: 25 (test.t1) +master-bin.000001 5350 Write_rows 1 5384 table_id: 25 flags: STMT_END_F +master-bin.000001 5384 Table_map 1 5423 table_id: 25 (test.t1) +master-bin.000001 5423 Write_rows 1 5457 table_id: 25 flags: STMT_END_F +master-bin.000001 5457 Table_map 1 5496 table_id: 25 (test.t1) +master-bin.000001 5496 Write_rows 1 5530 table_id: 25 flags: STMT_END_F +master-bin.000001 5530 Table_map 1 5569 table_id: 25 (test.t1) +master-bin.000001 5569 Write_rows 1 5603 table_id: 25 flags: STMT_END_F +master-bin.000001 5603 Table_map 1 5642 table_id: 25 (test.t1) +master-bin.000001 5642 Write_rows 1 5676 table_id: 25 flags: STMT_END_F +master-bin.000001 5676 Table_map 1 5715 table_id: 25 (test.t1) +master-bin.000001 5715 Write_rows 1 5749 table_id: 25 flags: STMT_END_F +master-bin.000001 5749 Table_map 1 5788 table_id: 25 (test.t1) +master-bin.000001 5788 Write_rows 1 5822 table_id: 25 flags: STMT_END_F +master-bin.000001 5822 Table_map 1 5861 table_id: 25 (test.t1) +master-bin.000001 5861 Write_rows 1 5895 table_id: 25 flags: STMT_END_F +master-bin.000001 5895 Table_map 1 5934 table_id: 25 (test.t1) +master-bin.000001 5934 Write_rows 1 5968 table_id: 25 flags: STMT_END_F +master-bin.000001 5968 Table_map 1 6007 table_id: 25 (test.t1) +master-bin.000001 6007 Write_rows 1 6041 table_id: 25 flags: STMT_END_F +master-bin.000001 6041 Table_map 1 6080 table_id: 25 (test.t1) +master-bin.000001 6080 Write_rows 1 6114 table_id: 25 flags: STMT_END_F +master-bin.000001 6114 Table_map 1 6153 table_id: 25 (test.t1) +master-bin.000001 6153 Write_rows 1 6187 table_id: 25 flags: STMT_END_F +master-bin.000001 6187 Table_map 1 6226 table_id: 25 (test.t1) +master-bin.000001 6226 Write_rows 1 6260 table_id: 25 flags: STMT_END_F +master-bin.000001 6260 Table_map 1 6299 table_id: 25 (test.t1) +master-bin.000001 6299 Write_rows 1 6333 table_id: 25 flags: STMT_END_F +master-bin.000001 6333 Table_map 1 6372 table_id: 25 (test.t1) +master-bin.000001 6372 Write_rows 1 6406 table_id: 25 flags: STMT_END_F +master-bin.000001 6406 Table_map 1 6445 table_id: 25 (test.t1) +master-bin.000001 6445 Write_rows 1 6479 table_id: 25 flags: STMT_END_F +master-bin.000001 6479 Table_map 1 6518 table_id: 25 (test.t1) +master-bin.000001 6518 Write_rows 1 6552 table_id: 25 flags: STMT_END_F +master-bin.000001 6552 Table_map 1 6591 table_id: 25 (test.t1) +master-bin.000001 6591 Write_rows 1 6625 table_id: 25 flags: STMT_END_F +master-bin.000001 6625 Table_map 1 6664 table_id: 25 (test.t1) +master-bin.000001 6664 Write_rows 1 6698 table_id: 25 flags: STMT_END_F +master-bin.000001 6698 Table_map 1 6737 table_id: 25 (test.t1) +master-bin.000001 6737 Write_rows 1 6771 table_id: 25 flags: STMT_END_F +master-bin.000001 6771 Table_map 1 6810 table_id: 25 (test.t1) +master-bin.000001 6810 Write_rows 1 6844 table_id: 25 flags: STMT_END_F +master-bin.000001 6844 Table_map 1 6883 table_id: 25 (test.t1) +master-bin.000001 6883 Write_rows 1 6917 table_id: 25 flags: STMT_END_F +master-bin.000001 6917 Table_map 1 6956 table_id: 25 (test.t1) +master-bin.000001 6956 Write_rows 1 6990 table_id: 25 flags: STMT_END_F +master-bin.000001 6990 Table_map 1 7029 table_id: 25 (test.t1) +master-bin.000001 7029 Write_rows 1 7063 table_id: 25 flags: STMT_END_F +master-bin.000001 7063 Table_map 1 7102 table_id: 25 (test.t1) +master-bin.000001 7102 Write_rows 1 7136 table_id: 25 flags: STMT_END_F +master-bin.000001 7136 Table_map 1 7175 table_id: 25 (test.t1) +master-bin.000001 7175 Write_rows 1 7209 table_id: 25 flags: STMT_END_F +master-bin.000001 7209 Table_map 1 7248 table_id: 25 (test.t1) +master-bin.000001 7248 Write_rows 1 7282 table_id: 25 flags: STMT_END_F +master-bin.000001 7282 Table_map 1 7321 table_id: 25 (test.t1) +master-bin.000001 7321 Write_rows 1 7355 table_id: 25 flags: STMT_END_F +master-bin.000001 7355 Table_map 1 7394 table_id: 25 (test.t1) +master-bin.000001 7394 Write_rows 1 7428 table_id: 25 flags: STMT_END_F +master-bin.000001 7428 Table_map 1 7467 table_id: 25 (test.t1) +master-bin.000001 7467 Write_rows 1 7501 table_id: 25 flags: STMT_END_F +master-bin.000001 7501 Table_map 1 7540 table_id: 25 (test.t1) +master-bin.000001 7540 Write_rows 1 7574 table_id: 25 flags: STMT_END_F +master-bin.000001 7574 Table_map 1 7613 table_id: 25 (test.t1) +master-bin.000001 7613 Write_rows 1 7647 table_id: 25 flags: STMT_END_F +master-bin.000001 7647 Table_map 1 7686 table_id: 25 (test.t1) +master-bin.000001 7686 Write_rows 1 7720 table_id: 25 flags: STMT_END_F +master-bin.000001 7720 Table_map 1 7759 table_id: 25 (test.t1) +master-bin.000001 7759 Write_rows 1 7793 table_id: 25 flags: STMT_END_F +master-bin.000001 7793 Table_map 1 7832 table_id: 25 (test.t1) +master-bin.000001 7832 Write_rows 1 7866 table_id: 25 flags: STMT_END_F +master-bin.000001 7866 Table_map 1 7905 table_id: 25 (test.t1) +master-bin.000001 7905 Write_rows 1 7939 table_id: 25 flags: STMT_END_F +master-bin.000001 7939 Table_map 1 7978 table_id: 25 (test.t1) +master-bin.000001 7978 Write_rows 1 8012 table_id: 25 flags: STMT_END_F +master-bin.000001 8012 Table_map 1 8051 table_id: 25 (test.t1) +master-bin.000001 8051 Write_rows 1 8085 table_id: 25 flags: STMT_END_F +master-bin.000001 8085 Table_map 1 8124 table_id: 25 (test.t1) +master-bin.000001 8124 Write_rows 1 8158 table_id: 25 flags: STMT_END_F +master-bin.000001 8158 Table_map 1 8197 table_id: 25 (test.t1) +master-bin.000001 8197 Write_rows 1 8231 table_id: 25 flags: STMT_END_F +master-bin.000001 8231 Table_map 1 8270 table_id: 25 (test.t1) +master-bin.000001 8270 Write_rows 1 8304 table_id: 25 flags: STMT_END_F +master-bin.000001 8304 Table_map 1 8343 table_id: 25 (test.t1) +master-bin.000001 8343 Write_rows 1 8377 table_id: 25 flags: STMT_END_F +master-bin.000001 8377 Table_map 1 8416 table_id: 25 (test.t1) +master-bin.000001 8416 Write_rows 1 8450 table_id: 25 flags: STMT_END_F +master-bin.000001 8450 Table_map 1 8489 table_id: 25 (test.t1) +master-bin.000001 8489 Write_rows 1 8523 table_id: 25 flags: STMT_END_F +master-bin.000001 8523 Table_map 1 8562 table_id: 25 (test.t1) +master-bin.000001 8562 Write_rows 1 8596 table_id: 25 flags: STMT_END_F +master-bin.000001 8596 Table_map 1 8635 table_id: 25 (test.t1) +master-bin.000001 8635 Write_rows 1 8669 table_id: 25 flags: STMT_END_F +master-bin.000001 8669 Table_map 1 8708 table_id: 25 (test.t1) +master-bin.000001 8708 Write_rows 1 8742 table_id: 25 flags: STMT_END_F +master-bin.000001 8742 Table_map 1 8781 table_id: 25 (test.t1) +master-bin.000001 8781 Write_rows 1 8815 table_id: 25 flags: STMT_END_F +master-bin.000001 8815 Table_map 1 8854 table_id: 25 (test.t1) +master-bin.000001 8854 Write_rows 1 8888 table_id: 25 flags: STMT_END_F +master-bin.000001 8888 Table_map 1 8927 table_id: 25 (test.t1) +master-bin.000001 8927 Write_rows 1 8961 table_id: 25 flags: STMT_END_F +master-bin.000001 8961 Table_map 1 9000 table_id: 25 (test.t1) +master-bin.000001 9000 Write_rows 1 9034 table_id: 25 flags: STMT_END_F +master-bin.000001 9034 Table_map 1 9073 table_id: 25 (test.t1) +master-bin.000001 9073 Write_rows 1 9107 table_id: 25 flags: STMT_END_F +master-bin.000001 9107 Table_map 1 9146 table_id: 25 (test.t1) +master-bin.000001 9146 Write_rows 1 9180 table_id: 25 flags: STMT_END_F +master-bin.000001 9180 Table_map 1 9219 table_id: 25 (test.t1) +master-bin.000001 9219 Write_rows 1 9253 table_id: 25 flags: STMT_END_F +master-bin.000001 9253 Table_map 1 9292 table_id: 25 (test.t1) +master-bin.000001 9292 Write_rows 1 9326 table_id: 25 flags: STMT_END_F +master-bin.000001 9326 Table_map 1 9365 table_id: 25 (test.t1) +master-bin.000001 9365 Write_rows 1 9399 table_id: 25 flags: STMT_END_F +master-bin.000001 9399 Table_map 1 9438 table_id: 25 (test.t1) +master-bin.000001 9438 Write_rows 1 9472 table_id: 25 flags: STMT_END_F +master-bin.000001 9472 Table_map 1 9511 table_id: 25 (test.t1) +master-bin.000001 9511 Write_rows 1 9545 table_id: 25 flags: STMT_END_F +master-bin.000001 9545 Table_map 1 9584 table_id: 25 (test.t1) +master-bin.000001 9584 Write_rows 1 9618 table_id: 25 flags: STMT_END_F +master-bin.000001 9618 Table_map 1 9657 table_id: 25 (test.t1) +master-bin.000001 9657 Write_rows 1 9691 table_id: 25 flags: STMT_END_F +master-bin.000001 9691 Table_map 1 9730 table_id: 25 (test.t1) +master-bin.000001 9730 Write_rows 1 9764 table_id: 25 flags: STMT_END_F +master-bin.000001 9764 Table_map 1 9803 table_id: 25 (test.t1) +master-bin.000001 9803 Write_rows 1 9837 table_id: 25 flags: STMT_END_F +master-bin.000001 9837 Table_map 1 9876 table_id: 25 (test.t1) +master-bin.000001 9876 Write_rows 1 9910 table_id: 25 flags: STMT_END_F +master-bin.000001 9910 Table_map 1 9949 table_id: 25 (test.t1) +master-bin.000001 9949 Write_rows 1 9983 table_id: 25 flags: STMT_END_F +master-bin.000001 9983 Table_map 1 10022 table_id: 25 (test.t1) +master-bin.000001 10022 Write_rows 1 10056 table_id: 25 flags: STMT_END_F +master-bin.000001 10056 Table_map 1 10095 table_id: 25 (test.t1) +master-bin.000001 10095 Write_rows 1 10129 table_id: 25 flags: STMT_END_F +master-bin.000001 10129 Table_map 1 10168 table_id: 25 (test.t1) +master-bin.000001 10168 Write_rows 1 10202 table_id: 25 flags: STMT_END_F +master-bin.000001 10202 Table_map 1 10241 table_id: 25 (test.t1) +master-bin.000001 10241 Write_rows 1 10275 table_id: 25 flags: STMT_END_F +master-bin.000001 10275 Table_map 1 10314 table_id: 25 (test.t1) +master-bin.000001 10314 Write_rows 1 10348 table_id: 25 flags: STMT_END_F +master-bin.000001 10348 Table_map 1 10387 table_id: 25 (test.t1) +master-bin.000001 10387 Write_rows 1 10421 table_id: 25 flags: STMT_END_F +master-bin.000001 10421 Table_map 1 10460 table_id: 25 (test.t1) +master-bin.000001 10460 Write_rows 1 10494 table_id: 25 flags: STMT_END_F +master-bin.000001 10494 Table_map 1 10533 table_id: 25 (test.t1) +master-bin.000001 10533 Write_rows 1 10567 table_id: 25 flags: STMT_END_F +master-bin.000001 10567 Table_map 1 10606 table_id: 25 (test.t1) +master-bin.000001 10606 Write_rows 1 10640 table_id: 25 flags: STMT_END_F +master-bin.000001 10640 Table_map 1 10679 table_id: 25 (test.t1) +master-bin.000001 10679 Write_rows 1 10713 table_id: 25 flags: STMT_END_F +master-bin.000001 10713 Table_map 1 10752 table_id: 25 (test.t1) +master-bin.000001 10752 Write_rows 1 10786 table_id: 25 flags: STMT_END_F +master-bin.000001 10786 Table_map 1 10825 table_id: 25 (test.t1) +master-bin.000001 10825 Write_rows 1 10859 table_id: 25 flags: STMT_END_F +master-bin.000001 10859 Table_map 1 10898 table_id: 25 (test.t1) +master-bin.000001 10898 Write_rows 1 10932 table_id: 25 flags: STMT_END_F +master-bin.000001 10932 Table_map 1 10971 table_id: 25 (test.t1) +master-bin.000001 10971 Write_rows 1 11005 table_id: 25 flags: STMT_END_F +master-bin.000001 11005 Table_map 1 11044 table_id: 25 (test.t1) +master-bin.000001 11044 Write_rows 1 11078 table_id: 25 flags: STMT_END_F +master-bin.000001 11078 Table_map 1 11117 table_id: 25 (test.t1) +master-bin.000001 11117 Write_rows 1 11151 table_id: 25 flags: STMT_END_F +master-bin.000001 11151 Table_map 1 11190 table_id: 25 (test.t1) +master-bin.000001 11190 Write_rows 1 11224 table_id: 25 flags: STMT_END_F +master-bin.000001 11224 Table_map 1 11263 table_id: 25 (test.t1) +master-bin.000001 11263 Write_rows 1 11297 table_id: 25 flags: STMT_END_F +master-bin.000001 11297 Table_map 1 11336 table_id: 25 (test.t1) +master-bin.000001 11336 Write_rows 1 11370 table_id: 25 flags: STMT_END_F +master-bin.000001 11370 Table_map 1 11409 table_id: 25 (test.t1) +master-bin.000001 11409 Write_rows 1 11443 table_id: 25 flags: STMT_END_F +master-bin.000001 11443 Table_map 1 11482 table_id: 25 (test.t1) +master-bin.000001 11482 Write_rows 1 11516 table_id: 25 flags: STMT_END_F +master-bin.000001 11516 Table_map 1 11555 table_id: 25 (test.t1) +master-bin.000001 11555 Write_rows 1 11589 table_id: 25 flags: STMT_END_F +master-bin.000001 11589 Table_map 1 11628 table_id: 25 (test.t1) +master-bin.000001 11628 Write_rows 1 11662 table_id: 25 flags: STMT_END_F +master-bin.000001 11662 Table_map 1 11701 table_id: 25 (test.t1) +master-bin.000001 11701 Write_rows 1 11735 table_id: 25 flags: STMT_END_F +master-bin.000001 11735 Table_map 1 11774 table_id: 25 (test.t1) +master-bin.000001 11774 Write_rows 1 11808 table_id: 25 flags: STMT_END_F +master-bin.000001 11808 Table_map 1 11847 table_id: 25 (test.t1) +master-bin.000001 11847 Write_rows 1 11881 table_id: 25 flags: STMT_END_F +master-bin.000001 11881 Table_map 1 11920 table_id: 25 (test.t1) +master-bin.000001 11920 Write_rows 1 11954 table_id: 25 flags: STMT_END_F +master-bin.000001 11954 Table_map 1 11993 table_id: 25 (test.t1) +master-bin.000001 11993 Write_rows 1 12027 table_id: 25 flags: STMT_END_F +master-bin.000001 12027 Table_map 1 12066 table_id: 25 (test.t1) +master-bin.000001 12066 Write_rows 1 12100 table_id: 25 flags: STMT_END_F +master-bin.000001 12100 Table_map 1 12139 table_id: 25 (test.t1) +master-bin.000001 12139 Write_rows 1 12173 table_id: 25 flags: STMT_END_F +master-bin.000001 12173 Table_map 1 12212 table_id: 25 (test.t1) +master-bin.000001 12212 Write_rows 1 12246 table_id: 25 flags: STMT_END_F +master-bin.000001 12246 Table_map 1 12285 table_id: 25 (test.t1) +master-bin.000001 12285 Write_rows 1 12319 table_id: 25 flags: STMT_END_F +master-bin.000001 12319 Table_map 1 12358 table_id: 25 (test.t1) +master-bin.000001 12358 Write_rows 1 12392 table_id: 25 flags: STMT_END_F +master-bin.000001 12392 Table_map 1 12431 table_id: 25 (test.t1) +master-bin.000001 12431 Write_rows 1 12465 table_id: 25 flags: STMT_END_F +master-bin.000001 12465 Table_map 1 12504 table_id: 25 (test.t1) +master-bin.000001 12504 Write_rows 1 12538 table_id: 25 flags: STMT_END_F +master-bin.000001 12538 Table_map 1 12577 table_id: 25 (test.t1) +master-bin.000001 12577 Write_rows 1 12611 table_id: 25 flags: STMT_END_F +master-bin.000001 12611 Table_map 1 12650 table_id: 25 (test.t1) +master-bin.000001 12650 Write_rows 1 12684 table_id: 25 flags: STMT_END_F +master-bin.000001 12684 Table_map 1 12723 table_id: 25 (test.t1) +master-bin.000001 12723 Write_rows 1 12757 table_id: 25 flags: STMT_END_F +master-bin.000001 12757 Table_map 1 12796 table_id: 25 (test.t1) +master-bin.000001 12796 Write_rows 1 12830 table_id: 25 flags: STMT_END_F +master-bin.000001 12830 Table_map 1 12869 table_id: 25 (test.t1) +master-bin.000001 12869 Write_rows 1 12903 table_id: 25 flags: STMT_END_F +master-bin.000001 12903 Table_map 1 12942 table_id: 25 (test.t1) +master-bin.000001 12942 Write_rows 1 12976 table_id: 25 flags: STMT_END_F +master-bin.000001 12976 Table_map 1 13015 table_id: 25 (test.t1) +master-bin.000001 13015 Write_rows 1 13049 table_id: 25 flags: STMT_END_F +master-bin.000001 13049 Table_map 1 13088 table_id: 25 (test.t1) +master-bin.000001 13088 Write_rows 1 13122 table_id: 25 flags: STMT_END_F +master-bin.000001 13122 Table_map 1 13161 table_id: 25 (test.t1) +master-bin.000001 13161 Write_rows 1 13195 table_id: 25 flags: STMT_END_F +master-bin.000001 13195 Table_map 1 13234 table_id: 25 (test.t1) +master-bin.000001 13234 Write_rows 1 13268 table_id: 25 flags: STMT_END_F +master-bin.000001 13268 Table_map 1 13307 table_id: 25 (test.t1) +master-bin.000001 13307 Write_rows 1 13341 table_id: 25 flags: STMT_END_F +master-bin.000001 13341 Table_map 1 13380 table_id: 25 (test.t1) +master-bin.000001 13380 Write_rows 1 13414 table_id: 25 flags: STMT_END_F +master-bin.000001 13414 Table_map 1 13453 table_id: 25 (test.t1) +master-bin.000001 13453 Write_rows 1 13487 table_id: 25 flags: STMT_END_F +master-bin.000001 13487 Table_map 1 13526 table_id: 25 (test.t1) +master-bin.000001 13526 Write_rows 1 13560 table_id: 25 flags: STMT_END_F +master-bin.000001 13560 Table_map 1 13599 table_id: 25 (test.t1) +master-bin.000001 13599 Write_rows 1 13633 table_id: 25 flags: STMT_END_F +master-bin.000001 13633 Table_map 1 13672 table_id: 25 (test.t1) +master-bin.000001 13672 Write_rows 1 13706 table_id: 25 flags: STMT_END_F +master-bin.000001 13706 Table_map 1 13745 table_id: 25 (test.t1) +master-bin.000001 13745 Write_rows 1 13779 table_id: 25 flags: STMT_END_F +master-bin.000001 13779 Table_map 1 13818 table_id: 25 (test.t1) +master-bin.000001 13818 Write_rows 1 13852 table_id: 25 flags: STMT_END_F +master-bin.000001 13852 Table_map 1 13891 table_id: 25 (test.t1) +master-bin.000001 13891 Write_rows 1 13925 table_id: 25 flags: STMT_END_F +master-bin.000001 13925 Table_map 1 13964 table_id: 25 (test.t1) +master-bin.000001 13964 Write_rows 1 13998 table_id: 25 flags: STMT_END_F +master-bin.000001 13998 Table_map 1 14037 table_id: 25 (test.t1) +master-bin.000001 14037 Write_rows 1 14071 table_id: 25 flags: STMT_END_F +master-bin.000001 14071 Table_map 1 14110 table_id: 25 (test.t1) +master-bin.000001 14110 Write_rows 1 14144 table_id: 25 flags: STMT_END_F +master-bin.000001 14144 Table_map 1 14183 table_id: 25 (test.t1) +master-bin.000001 14183 Write_rows 1 14217 table_id: 25 flags: STMT_END_F +master-bin.000001 14217 Table_map 1 14256 table_id: 25 (test.t1) +master-bin.000001 14256 Write_rows 1 14290 table_id: 25 flags: STMT_END_F +master-bin.000001 14290 Table_map 1 14329 table_id: 25 (test.t1) +master-bin.000001 14329 Write_rows 1 14363 table_id: 25 flags: STMT_END_F +master-bin.000001 14363 Table_map 1 14402 table_id: 25 (test.t1) +master-bin.000001 14402 Write_rows 1 14436 table_id: 25 flags: STMT_END_F +master-bin.000001 14436 Table_map 1 14475 table_id: 25 (test.t1) +master-bin.000001 14475 Write_rows 1 14509 table_id: 25 flags: STMT_END_F +master-bin.000001 14509 Table_map 1 14548 table_id: 25 (test.t1) +master-bin.000001 14548 Write_rows 1 14582 table_id: 25 flags: STMT_END_F +master-bin.000001 14582 Table_map 1 14621 table_id: 25 (test.t1) +master-bin.000001 14621 Write_rows 1 14655 table_id: 25 flags: STMT_END_F +master-bin.000001 14655 Table_map 1 14694 table_id: 25 (test.t1) +master-bin.000001 14694 Write_rows 1 14728 table_id: 25 flags: STMT_END_F +master-bin.000001 14728 Table_map 1 14767 table_id: 25 (test.t1) +master-bin.000001 14767 Write_rows 1 14801 table_id: 25 flags: STMT_END_F +master-bin.000001 14801 Table_map 1 14840 table_id: 25 (test.t1) +master-bin.000001 14840 Write_rows 1 14874 table_id: 25 flags: STMT_END_F +master-bin.000001 14874 Table_map 1 14913 table_id: 25 (test.t1) +master-bin.000001 14913 Write_rows 1 14947 table_id: 25 flags: STMT_END_F +master-bin.000001 14947 Table_map 1 14986 table_id: 25 (test.t1) +master-bin.000001 14986 Write_rows 1 15020 table_id: 25 flags: STMT_END_F +master-bin.000001 15020 Table_map 1 15059 table_id: 25 (test.t1) +master-bin.000001 15059 Write_rows 1 15093 table_id: 25 flags: STMT_END_F +master-bin.000001 15093 Table_map 1 15132 table_id: 25 (test.t1) +master-bin.000001 15132 Write_rows 1 15166 table_id: 25 flags: STMT_END_F +master-bin.000001 15166 Table_map 1 15205 table_id: 25 (test.t1) +master-bin.000001 15205 Write_rows 1 15239 table_id: 25 flags: STMT_END_F +master-bin.000001 15239 Table_map 1 15278 table_id: 25 (test.t1) +master-bin.000001 15278 Write_rows 1 15312 table_id: 25 flags: STMT_END_F +master-bin.000001 15312 Table_map 1 15351 table_id: 25 (test.t1) +master-bin.000001 15351 Write_rows 1 15385 table_id: 25 flags: STMT_END_F +master-bin.000001 15385 Table_map 1 15424 table_id: 25 (test.t1) +master-bin.000001 15424 Write_rows 1 15458 table_id: 25 flags: STMT_END_F +master-bin.000001 15458 Table_map 1 15497 table_id: 25 (test.t1) +master-bin.000001 15497 Write_rows 1 15531 table_id: 25 flags: STMT_END_F +master-bin.000001 15531 Table_map 1 15570 table_id: 25 (test.t1) +master-bin.000001 15570 Write_rows 1 15604 table_id: 25 flags: STMT_END_F +master-bin.000001 15604 Table_map 1 15643 table_id: 25 (test.t1) +master-bin.000001 15643 Write_rows 1 15677 table_id: 25 flags: STMT_END_F +master-bin.000001 15677 Table_map 1 15716 table_id: 25 (test.t1) +master-bin.000001 15716 Write_rows 1 15750 table_id: 25 flags: STMT_END_F +master-bin.000001 15750 Table_map 1 15789 table_id: 25 (test.t1) +master-bin.000001 15789 Write_rows 1 15823 table_id: 25 flags: STMT_END_F +master-bin.000001 15823 Table_map 1 15862 table_id: 25 (test.t1) +master-bin.000001 15862 Write_rows 1 15896 table_id: 25 flags: STMT_END_F +master-bin.000001 15896 Table_map 1 15935 table_id: 25 (test.t1) +master-bin.000001 15935 Write_rows 1 15969 table_id: 25 flags: STMT_END_F +master-bin.000001 15969 Table_map 1 16008 table_id: 25 (test.t1) +master-bin.000001 16008 Write_rows 1 16042 table_id: 25 flags: STMT_END_F +master-bin.000001 16042 Table_map 1 16081 table_id: 25 (test.t1) +master-bin.000001 16081 Write_rows 1 16115 table_id: 25 flags: STMT_END_F +master-bin.000001 16115 Table_map 1 16154 table_id: 25 (test.t1) +master-bin.000001 16154 Write_rows 1 16188 table_id: 25 flags: STMT_END_F +master-bin.000001 16188 Table_map 1 16227 table_id: 25 (test.t1) +master-bin.000001 16227 Write_rows 1 16261 table_id: 25 flags: STMT_END_F +master-bin.000001 16261 Table_map 1 16300 table_id: 25 (test.t1) +master-bin.000001 16300 Write_rows 1 16334 table_id: 25 flags: STMT_END_F +master-bin.000001 16334 Table_map 1 16373 table_id: 25 (test.t1) +master-bin.000001 16373 Write_rows 1 16407 table_id: 25 flags: STMT_END_F +master-bin.000001 16407 Table_map 1 16446 table_id: 25 (test.t1) +master-bin.000001 16446 Write_rows 1 16480 table_id: 25 flags: STMT_END_F +master-bin.000001 16480 Table_map 1 16519 table_id: 25 (test.t1) +master-bin.000001 16519 Write_rows 1 16553 table_id: 25 flags: STMT_END_F +master-bin.000001 16553 Table_map 1 16592 table_id: 25 (test.t1) +master-bin.000001 16592 Write_rows 1 16626 table_id: 25 flags: STMT_END_F +master-bin.000001 16626 Table_map 1 16665 table_id: 25 (test.t1) +master-bin.000001 16665 Write_rows 1 16699 table_id: 25 flags: STMT_END_F +master-bin.000001 16699 Table_map 1 16738 table_id: 25 (test.t1) +master-bin.000001 16738 Write_rows 1 16772 table_id: 25 flags: STMT_END_F +master-bin.000001 16772 Table_map 1 16811 table_id: 25 (test.t1) +master-bin.000001 16811 Write_rows 1 16845 table_id: 25 flags: STMT_END_F +master-bin.000001 16845 Table_map 1 16884 table_id: 25 (test.t1) +master-bin.000001 16884 Write_rows 1 16918 table_id: 25 flags: STMT_END_F +master-bin.000001 16918 Table_map 1 16957 table_id: 25 (test.t1) +master-bin.000001 16957 Write_rows 1 16991 table_id: 25 flags: STMT_END_F +master-bin.000001 16991 Table_map 1 17030 table_id: 25 (test.t1) +master-bin.000001 17030 Write_rows 1 17064 table_id: 25 flags: STMT_END_F +master-bin.000001 17064 Table_map 1 17103 table_id: 25 (test.t1) +master-bin.000001 17103 Write_rows 1 17137 table_id: 25 flags: STMT_END_F +master-bin.000001 17137 Table_map 1 17176 table_id: 25 (test.t1) +master-bin.000001 17176 Write_rows 1 17210 table_id: 25 flags: STMT_END_F +master-bin.000001 17210 Table_map 1 17249 table_id: 25 (test.t1) +master-bin.000001 17249 Write_rows 1 17283 table_id: 25 flags: STMT_END_F +master-bin.000001 17283 Table_map 1 17322 table_id: 25 (test.t1) +master-bin.000001 17322 Write_rows 1 17356 table_id: 25 flags: STMT_END_F +master-bin.000001 17356 Table_map 1 17395 table_id: 25 (test.t1) +master-bin.000001 17395 Write_rows 1 17429 table_id: 25 flags: STMT_END_F +master-bin.000001 17429 Table_map 1 17468 table_id: 25 (test.t1) +master-bin.000001 17468 Write_rows 1 17502 table_id: 25 flags: STMT_END_F +master-bin.000001 17502 Table_map 1 17541 table_id: 25 (test.t1) +master-bin.000001 17541 Write_rows 1 17575 table_id: 25 flags: STMT_END_F +master-bin.000001 17575 Table_map 1 17614 table_id: 25 (test.t1) +master-bin.000001 17614 Write_rows 1 17648 table_id: 25 flags: STMT_END_F +master-bin.000001 17648 Table_map 1 17687 table_id: 25 (test.t1) +master-bin.000001 17687 Write_rows 1 17721 table_id: 25 flags: STMT_END_F +master-bin.000001 17721 Table_map 1 17760 table_id: 25 (test.t1) +master-bin.000001 17760 Write_rows 1 17794 table_id: 25 flags: STMT_END_F +master-bin.000001 17794 Table_map 1 17833 table_id: 25 (test.t1) +master-bin.000001 17833 Write_rows 1 17867 table_id: 25 flags: STMT_END_F +master-bin.000001 17867 Table_map 1 17906 table_id: 25 (test.t1) +master-bin.000001 17906 Write_rows 1 17940 table_id: 25 flags: STMT_END_F +master-bin.000001 17940 Table_map 1 17979 table_id: 25 (test.t1) +master-bin.000001 17979 Write_rows 1 18013 table_id: 25 flags: STMT_END_F +master-bin.000001 18013 Table_map 1 18052 table_id: 25 (test.t1) +master-bin.000001 18052 Write_rows 1 18086 table_id: 25 flags: STMT_END_F +master-bin.000001 18086 Table_map 1 18125 table_id: 25 (test.t1) +master-bin.000001 18125 Write_rows 1 18159 table_id: 25 flags: STMT_END_F +master-bin.000001 18159 Table_map 1 18198 table_id: 25 (test.t1) +master-bin.000001 18198 Write_rows 1 18232 table_id: 25 flags: STMT_END_F +master-bin.000001 18232 Table_map 1 18271 table_id: 25 (test.t1) +master-bin.000001 18271 Write_rows 1 18305 table_id: 25 flags: STMT_END_F +master-bin.000001 18305 Table_map 1 18344 table_id: 25 (test.t1) +master-bin.000001 18344 Write_rows 1 18378 table_id: 25 flags: STMT_END_F +master-bin.000001 18378 Table_map 1 18417 table_id: 25 (test.t1) +master-bin.000001 18417 Write_rows 1 18451 table_id: 25 flags: STMT_END_F +master-bin.000001 18451 Table_map 1 18490 table_id: 25 (test.t1) +master-bin.000001 18490 Write_rows 1 18524 table_id: 25 flags: STMT_END_F +master-bin.000001 18524 Table_map 1 18563 table_id: 25 (test.t1) +master-bin.000001 18563 Write_rows 1 18597 table_id: 25 flags: STMT_END_F +master-bin.000001 18597 Table_map 1 18636 table_id: 25 (test.t1) +master-bin.000001 18636 Write_rows 1 18670 table_id: 25 flags: STMT_END_F +master-bin.000001 18670 Table_map 1 18709 table_id: 25 (test.t1) +master-bin.000001 18709 Write_rows 1 18743 table_id: 25 flags: STMT_END_F +master-bin.000001 18743 Table_map 1 18782 table_id: 25 (test.t1) +master-bin.000001 18782 Write_rows 1 18816 table_id: 25 flags: STMT_END_F +master-bin.000001 18816 Table_map 1 18855 table_id: 25 (test.t1) +master-bin.000001 18855 Write_rows 1 18889 table_id: 25 flags: STMT_END_F +master-bin.000001 18889 Table_map 1 18928 table_id: 25 (test.t1) +master-bin.000001 18928 Write_rows 1 18962 table_id: 25 flags: STMT_END_F +master-bin.000001 18962 Table_map 1 19001 table_id: 25 (test.t1) +master-bin.000001 19001 Write_rows 1 19035 table_id: 25 flags: STMT_END_F +master-bin.000001 19035 Table_map 1 19074 table_id: 25 (test.t1) +master-bin.000001 19074 Write_rows 1 19108 table_id: 25 flags: STMT_END_F +master-bin.000001 19108 Table_map 1 19147 table_id: 25 (test.t1) +master-bin.000001 19147 Write_rows 1 19181 table_id: 25 flags: STMT_END_F +master-bin.000001 19181 Table_map 1 19220 table_id: 25 (test.t1) +master-bin.000001 19220 Write_rows 1 19254 table_id: 25 flags: STMT_END_F +master-bin.000001 19254 Table_map 1 19293 table_id: 25 (test.t1) +master-bin.000001 19293 Write_rows 1 19327 table_id: 25 flags: STMT_END_F +master-bin.000001 19327 Table_map 1 19366 table_id: 25 (test.t1) +master-bin.000001 19366 Write_rows 1 19400 table_id: 25 flags: STMT_END_F +master-bin.000001 19400 Table_map 1 19439 table_id: 25 (test.t1) +master-bin.000001 19439 Write_rows 1 19473 table_id: 25 flags: STMT_END_F +master-bin.000001 19473 Table_map 1 19512 table_id: 25 (test.t1) +master-bin.000001 19512 Write_rows 1 19546 table_id: 25 flags: STMT_END_F +master-bin.000001 19546 Table_map 1 19585 table_id: 25 (test.t1) +master-bin.000001 19585 Write_rows 1 19619 table_id: 25 flags: STMT_END_F +master-bin.000001 19619 Table_map 1 19658 table_id: 25 (test.t1) +master-bin.000001 19658 Write_rows 1 19692 table_id: 25 flags: STMT_END_F +master-bin.000001 19692 Table_map 1 19731 table_id: 25 (test.t1) +master-bin.000001 19731 Write_rows 1 19765 table_id: 25 flags: STMT_END_F +master-bin.000001 19765 Table_map 1 19804 table_id: 25 (test.t1) +master-bin.000001 19804 Write_rows 1 19838 table_id: 25 flags: STMT_END_F +master-bin.000001 19838 Table_map 1 19877 table_id: 25 (test.t1) +master-bin.000001 19877 Write_rows 1 19911 table_id: 25 flags: STMT_END_F +master-bin.000001 19911 Table_map 1 19950 table_id: 25 (test.t1) +master-bin.000001 19950 Write_rows 1 19984 table_id: 25 flags: STMT_END_F +master-bin.000001 19984 Table_map 1 20023 table_id: 25 (test.t1) +master-bin.000001 20023 Write_rows 1 20057 table_id: 25 flags: STMT_END_F +master-bin.000001 20057 Table_map 1 20096 table_id: 25 (test.t1) +master-bin.000001 20096 Write_rows 1 20130 table_id: 25 flags: STMT_END_F +master-bin.000001 20130 Table_map 1 20169 table_id: 25 (test.t1) +master-bin.000001 20169 Write_rows 1 20203 table_id: 25 flags: STMT_END_F +master-bin.000001 20203 Table_map 1 20242 table_id: 25 (test.t1) +master-bin.000001 20242 Write_rows 1 20276 table_id: 25 flags: STMT_END_F +master-bin.000001 20276 Table_map 1 20315 table_id: 25 (test.t1) +master-bin.000001 20315 Write_rows 1 20349 table_id: 25 flags: STMT_END_F +master-bin.000001 20349 Table_map 1 20388 table_id: 25 (test.t1) +master-bin.000001 20388 Write_rows 1 20422 table_id: 25 flags: STMT_END_F +master-bin.000001 20422 Table_map 1 20461 table_id: 25 (test.t1) +master-bin.000001 20461 Write_rows 1 20495 table_id: 25 flags: STMT_END_F +master-bin.000001 20495 Table_map 1 20534 table_id: 25 (test.t1) +master-bin.000001 20534 Write_rows 1 20568 table_id: 25 flags: STMT_END_F +master-bin.000001 20568 Table_map 1 20607 table_id: 25 (test.t1) +master-bin.000001 20607 Write_rows 1 20641 table_id: 25 flags: STMT_END_F +master-bin.000001 20641 Table_map 1 20680 table_id: 25 (test.t1) +master-bin.000001 20680 Write_rows 1 20714 table_id: 25 flags: STMT_END_F +master-bin.000001 20714 Table_map 1 20753 table_id: 25 (test.t1) +master-bin.000001 20753 Write_rows 1 20787 table_id: 25 flags: STMT_END_F +master-bin.000001 20787 Table_map 1 20826 table_id: 25 (test.t1) +master-bin.000001 20826 Write_rows 1 20860 table_id: 25 flags: STMT_END_F +master-bin.000001 20860 Table_map 1 20899 table_id: 25 (test.t1) +master-bin.000001 20899 Write_rows 1 20933 table_id: 25 flags: STMT_END_F +master-bin.000001 20933 Table_map 1 20972 table_id: 25 (test.t1) +master-bin.000001 20972 Write_rows 1 21006 table_id: 25 flags: STMT_END_F +master-bin.000001 21006 Table_map 1 21045 table_id: 25 (test.t1) +master-bin.000001 21045 Write_rows 1 21079 table_id: 25 flags: STMT_END_F +master-bin.000001 21079 Table_map 1 21118 table_id: 25 (test.t1) +master-bin.000001 21118 Write_rows 1 21152 table_id: 25 flags: STMT_END_F +master-bin.000001 21152 Table_map 1 21191 table_id: 25 (test.t1) +master-bin.000001 21191 Write_rows 1 21225 table_id: 25 flags: STMT_END_F +master-bin.000001 21225 Table_map 1 21264 table_id: 25 (test.t1) +master-bin.000001 21264 Write_rows 1 21298 table_id: 25 flags: STMT_END_F +master-bin.000001 21298 Table_map 1 21337 table_id: 25 (test.t1) +master-bin.000001 21337 Write_rows 1 21371 table_id: 25 flags: STMT_END_F +master-bin.000001 21371 Table_map 1 21410 table_id: 25 (test.t1) +master-bin.000001 21410 Write_rows 1 21444 table_id: 25 flags: STMT_END_F +master-bin.000001 21444 Table_map 1 21483 table_id: 25 (test.t1) +master-bin.000001 21483 Write_rows 1 21517 table_id: 25 flags: STMT_END_F +master-bin.000001 21517 Table_map 1 21556 table_id: 25 (test.t1) +master-bin.000001 21556 Write_rows 1 21590 table_id: 25 flags: STMT_END_F +master-bin.000001 21590 Table_map 1 21629 table_id: 25 (test.t1) +master-bin.000001 21629 Write_rows 1 21663 table_id: 25 flags: STMT_END_F +master-bin.000001 21663 Table_map 1 21702 table_id: 25 (test.t1) +master-bin.000001 21702 Write_rows 1 21736 table_id: 25 flags: STMT_END_F +master-bin.000001 21736 Table_map 1 21775 table_id: 25 (test.t1) +master-bin.000001 21775 Write_rows 1 21809 table_id: 25 flags: STMT_END_F +master-bin.000001 21809 Table_map 1 21848 table_id: 25 (test.t1) +master-bin.000001 21848 Write_rows 1 21882 table_id: 25 flags: STMT_END_F +master-bin.000001 21882 Table_map 1 21921 table_id: 25 (test.t1) +master-bin.000001 21921 Write_rows 1 21955 table_id: 25 flags: STMT_END_F +master-bin.000001 21955 Table_map 1 21994 table_id: 25 (test.t1) +master-bin.000001 21994 Write_rows 1 22028 table_id: 25 flags: STMT_END_F +master-bin.000001 22028 Table_map 1 22067 table_id: 25 (test.t1) +master-bin.000001 22067 Write_rows 1 22101 table_id: 25 flags: STMT_END_F +master-bin.000001 22101 Table_map 1 22140 table_id: 25 (test.t1) +master-bin.000001 22140 Write_rows 1 22174 table_id: 25 flags: STMT_END_F +master-bin.000001 22174 Table_map 1 22213 table_id: 25 (test.t1) +master-bin.000001 22213 Write_rows 1 22247 table_id: 25 flags: STMT_END_F +master-bin.000001 22247 Table_map 1 22286 table_id: 25 (test.t1) +master-bin.000001 22286 Write_rows 1 22320 table_id: 25 flags: STMT_END_F +master-bin.000001 22320 Table_map 1 22359 table_id: 25 (test.t1) +master-bin.000001 22359 Write_rows 1 22393 table_id: 25 flags: STMT_END_F +master-bin.000001 22393 Table_map 1 22432 table_id: 25 (test.t1) +master-bin.000001 22432 Write_rows 1 22466 table_id: 25 flags: STMT_END_F +master-bin.000001 22466 Table_map 1 22505 table_id: 25 (test.t1) +master-bin.000001 22505 Write_rows 1 22539 table_id: 25 flags: STMT_END_F +master-bin.000001 22539 Table_map 1 22578 table_id: 25 (test.t1) +master-bin.000001 22578 Write_rows 1 22612 table_id: 25 flags: STMT_END_F +master-bin.000001 22612 Table_map 1 22651 table_id: 25 (test.t1) +master-bin.000001 22651 Write_rows 1 22685 table_id: 25 flags: STMT_END_F +master-bin.000001 22685 Table_map 1 22724 table_id: 25 (test.t1) +master-bin.000001 22724 Write_rows 1 22758 table_id: 25 flags: STMT_END_F +master-bin.000001 22758 Table_map 1 22797 table_id: 25 (test.t1) +master-bin.000001 22797 Write_rows 1 22831 table_id: 25 flags: STMT_END_F +master-bin.000001 22831 Table_map 1 22870 table_id: 25 (test.t1) +master-bin.000001 22870 Write_rows 1 22904 table_id: 25 flags: STMT_END_F +master-bin.000001 22904 Table_map 1 22943 table_id: 25 (test.t1) +master-bin.000001 22943 Write_rows 1 22977 table_id: 25 flags: STMT_END_F +master-bin.000001 22977 Table_map 1 23016 table_id: 25 (test.t1) +master-bin.000001 23016 Write_rows 1 23050 table_id: 25 flags: STMT_END_F +master-bin.000001 23050 Table_map 1 23089 table_id: 25 (test.t1) +master-bin.000001 23089 Write_rows 1 23123 table_id: 25 flags: STMT_END_F +master-bin.000001 23123 Table_map 1 23162 table_id: 25 (test.t1) +master-bin.000001 23162 Write_rows 1 23196 table_id: 25 flags: STMT_END_F +master-bin.000001 23196 Table_map 1 23235 table_id: 25 (test.t1) +master-bin.000001 23235 Write_rows 1 23269 table_id: 25 flags: STMT_END_F +master-bin.000001 23269 Table_map 1 23308 table_id: 25 (test.t1) +master-bin.000001 23308 Write_rows 1 23342 table_id: 25 flags: STMT_END_F +master-bin.000001 23342 Table_map 1 23381 table_id: 25 (test.t1) +master-bin.000001 23381 Write_rows 1 23415 table_id: 25 flags: STMT_END_F +master-bin.000001 23415 Table_map 1 23454 table_id: 25 (test.t1) +master-bin.000001 23454 Write_rows 1 23488 table_id: 25 flags: STMT_END_F +master-bin.000001 23488 Table_map 1 23527 table_id: 25 (test.t1) +master-bin.000001 23527 Write_rows 1 23561 table_id: 25 flags: STMT_END_F +master-bin.000001 23561 Table_map 1 23600 table_id: 25 (test.t1) +master-bin.000001 23600 Write_rows 1 23634 table_id: 25 flags: STMT_END_F +master-bin.000001 23634 Table_map 1 23673 table_id: 25 (test.t1) +master-bin.000001 23673 Write_rows 1 23707 table_id: 25 flags: STMT_END_F +master-bin.000001 23707 Table_map 1 23746 table_id: 25 (test.t1) +master-bin.000001 23746 Write_rows 1 23780 table_id: 25 flags: STMT_END_F +master-bin.000001 23780 Table_map 1 23819 table_id: 25 (test.t1) +master-bin.000001 23819 Write_rows 1 23853 table_id: 25 flags: STMT_END_F +master-bin.000001 23853 Table_map 1 23892 table_id: 25 (test.t1) +master-bin.000001 23892 Write_rows 1 23926 table_id: 25 flags: STMT_END_F +master-bin.000001 23926 Table_map 1 23965 table_id: 25 (test.t1) +master-bin.000001 23965 Write_rows 1 23999 table_id: 25 flags: STMT_END_F +master-bin.000001 23999 Table_map 1 24038 table_id: 25 (test.t1) +master-bin.000001 24038 Write_rows 1 24072 table_id: 25 flags: STMT_END_F +master-bin.000001 24072 Table_map 1 24111 table_id: 25 (test.t1) +master-bin.000001 24111 Write_rows 1 24145 table_id: 25 flags: STMT_END_F +master-bin.000001 24145 Table_map 1 24184 table_id: 25 (test.t1) +master-bin.000001 24184 Write_rows 1 24218 table_id: 25 flags: STMT_END_F +master-bin.000001 24218 Table_map 1 24257 table_id: 25 (test.t1) +master-bin.000001 24257 Write_rows 1 24291 table_id: 25 flags: STMT_END_F +master-bin.000001 24291 Table_map 1 24330 table_id: 25 (test.t1) +master-bin.000001 24330 Write_rows 1 24364 table_id: 25 flags: STMT_END_F +master-bin.000001 24364 Table_map 1 24403 table_id: 25 (test.t1) +master-bin.000001 24403 Write_rows 1 24437 table_id: 25 flags: STMT_END_F +master-bin.000001 24437 Table_map 1 24476 table_id: 25 (test.t1) +master-bin.000001 24476 Write_rows 1 24510 table_id: 25 flags: STMT_END_F +master-bin.000001 24510 Table_map 1 24549 table_id: 25 (test.t1) +master-bin.000001 24549 Write_rows 1 24583 table_id: 25 flags: STMT_END_F +master-bin.000001 24583 Table_map 1 24622 table_id: 25 (test.t1) +master-bin.000001 24622 Write_rows 1 24656 table_id: 25 flags: STMT_END_F +master-bin.000001 24656 Table_map 1 24695 table_id: 25 (test.t1) +master-bin.000001 24695 Write_rows 1 24729 table_id: 25 flags: STMT_END_F +master-bin.000001 24729 Table_map 1 24768 table_id: 25 (test.t1) +master-bin.000001 24768 Write_rows 1 24802 table_id: 25 flags: STMT_END_F +master-bin.000001 24802 Table_map 1 24841 table_id: 25 (test.t1) +master-bin.000001 24841 Write_rows 1 24875 table_id: 25 flags: STMT_END_F +master-bin.000001 24875 Table_map 1 24914 table_id: 25 (test.t1) +master-bin.000001 24914 Write_rows 1 24948 table_id: 25 flags: STMT_END_F +master-bin.000001 24948 Table_map 1 24987 table_id: 25 (test.t1) +master-bin.000001 24987 Write_rows 1 25021 table_id: 25 flags: STMT_END_F +master-bin.000001 25021 Table_map 1 25060 table_id: 25 (test.t1) +master-bin.000001 25060 Write_rows 1 25094 table_id: 25 flags: STMT_END_F +master-bin.000001 25094 Table_map 1 25133 table_id: 25 (test.t1) +master-bin.000001 25133 Write_rows 1 25167 table_id: 25 flags: STMT_END_F +master-bin.000001 25167 Table_map 1 25206 table_id: 25 (test.t1) +master-bin.000001 25206 Write_rows 1 25240 table_id: 25 flags: STMT_END_F +master-bin.000001 25240 Table_map 1 25279 table_id: 25 (test.t1) +master-bin.000001 25279 Write_rows 1 25313 table_id: 25 flags: STMT_END_F +master-bin.000001 25313 Table_map 1 25352 table_id: 25 (test.t1) +master-bin.000001 25352 Write_rows 1 25386 table_id: 25 flags: STMT_END_F +master-bin.000001 25386 Table_map 1 25425 table_id: 25 (test.t1) +master-bin.000001 25425 Write_rows 1 25459 table_id: 25 flags: STMT_END_F +master-bin.000001 25459 Table_map 1 25498 table_id: 25 (test.t1) +master-bin.000001 25498 Write_rows 1 25532 table_id: 25 flags: STMT_END_F +master-bin.000001 25532 Table_map 1 25571 table_id: 25 (test.t1) +master-bin.000001 25571 Write_rows 1 25605 table_id: 25 flags: STMT_END_F +master-bin.000001 25605 Table_map 1 25644 table_id: 25 (test.t1) +master-bin.000001 25644 Write_rows 1 25678 table_id: 25 flags: STMT_END_F +master-bin.000001 25678 Table_map 1 25717 table_id: 25 (test.t1) +master-bin.000001 25717 Write_rows 1 25751 table_id: 25 flags: STMT_END_F +master-bin.000001 25751 Table_map 1 25790 table_id: 25 (test.t1) +master-bin.000001 25790 Write_rows 1 25824 table_id: 25 flags: STMT_END_F +master-bin.000001 25824 Table_map 1 25863 table_id: 25 (test.t1) +master-bin.000001 25863 Write_rows 1 25897 table_id: 25 flags: STMT_END_F +master-bin.000001 25897 Table_map 1 25936 table_id: 25 (test.t1) +master-bin.000001 25936 Write_rows 1 25970 table_id: 25 flags: STMT_END_F +master-bin.000001 25970 Table_map 1 26009 table_id: 25 (test.t1) +master-bin.000001 26009 Write_rows 1 26043 table_id: 25 flags: STMT_END_F +master-bin.000001 26043 Table_map 1 26082 table_id: 25 (test.t1) +master-bin.000001 26082 Write_rows 1 26116 table_id: 25 flags: STMT_END_F +master-bin.000001 26116 Table_map 1 26155 table_id: 25 (test.t1) +master-bin.000001 26155 Write_rows 1 26189 table_id: 25 flags: STMT_END_F +master-bin.000001 26189 Table_map 1 26228 table_id: 25 (test.t1) +master-bin.000001 26228 Write_rows 1 26262 table_id: 25 flags: STMT_END_F +master-bin.000001 26262 Table_map 1 26301 table_id: 25 (test.t1) +master-bin.000001 26301 Write_rows 1 26335 table_id: 25 flags: STMT_END_F +master-bin.000001 26335 Table_map 1 26374 table_id: 25 (test.t1) +master-bin.000001 26374 Write_rows 1 26408 table_id: 25 flags: STMT_END_F +master-bin.000001 26408 Table_map 1 26447 table_id: 25 (test.t1) +master-bin.000001 26447 Write_rows 1 26481 table_id: 25 flags: STMT_END_F +master-bin.000001 26481 Table_map 1 26520 table_id: 25 (test.t1) +master-bin.000001 26520 Write_rows 1 26554 table_id: 25 flags: STMT_END_F +master-bin.000001 26554 Table_map 1 26593 table_id: 25 (test.t1) +master-bin.000001 26593 Write_rows 1 26627 table_id: 25 flags: STMT_END_F +master-bin.000001 26627 Table_map 1 26666 table_id: 25 (test.t1) +master-bin.000001 26666 Write_rows 1 26700 table_id: 25 flags: STMT_END_F +master-bin.000001 26700 Table_map 1 26739 table_id: 25 (test.t1) +master-bin.000001 26739 Write_rows 1 26773 table_id: 25 flags: STMT_END_F +master-bin.000001 26773 Table_map 1 26812 table_id: 25 (test.t1) +master-bin.000001 26812 Write_rows 1 26846 table_id: 25 flags: STMT_END_F +master-bin.000001 26846 Table_map 1 26885 table_id: 25 (test.t1) +master-bin.000001 26885 Write_rows 1 26919 table_id: 25 flags: STMT_END_F +master-bin.000001 26919 Table_map 1 26958 table_id: 25 (test.t1) +master-bin.000001 26958 Write_rows 1 26992 table_id: 25 flags: STMT_END_F +master-bin.000001 26992 Table_map 1 27031 table_id: 25 (test.t1) +master-bin.000001 27031 Write_rows 1 27065 table_id: 25 flags: STMT_END_F +master-bin.000001 27065 Table_map 1 27104 table_id: 25 (test.t1) +master-bin.000001 27104 Write_rows 1 27138 table_id: 25 flags: STMT_END_F +master-bin.000001 27138 Table_map 1 27177 table_id: 25 (test.t1) +master-bin.000001 27177 Write_rows 1 27211 table_id: 25 flags: STMT_END_F +master-bin.000001 27211 Table_map 1 27250 table_id: 25 (test.t1) +master-bin.000001 27250 Write_rows 1 27284 table_id: 25 flags: STMT_END_F +master-bin.000001 27284 Table_map 1 27323 table_id: 25 (test.t1) +master-bin.000001 27323 Write_rows 1 27357 table_id: 25 flags: STMT_END_F +master-bin.000001 27357 Table_map 1 27396 table_id: 25 (test.t1) +master-bin.000001 27396 Write_rows 1 27430 table_id: 25 flags: STMT_END_F +master-bin.000001 27430 Table_map 1 27469 table_id: 25 (test.t1) +master-bin.000001 27469 Write_rows 1 27503 table_id: 25 flags: STMT_END_F +master-bin.000001 27503 Table_map 1 27542 table_id: 25 (test.t1) +master-bin.000001 27542 Write_rows 1 27576 table_id: 25 flags: STMT_END_F +master-bin.000001 27576 Table_map 1 27615 table_id: 25 (test.t1) +master-bin.000001 27615 Write_rows 1 27649 table_id: 25 flags: STMT_END_F +master-bin.000001 27649 Table_map 1 27688 table_id: 25 (test.t1) +master-bin.000001 27688 Write_rows 1 27722 table_id: 25 flags: STMT_END_F +master-bin.000001 27722 Table_map 1 27761 table_id: 25 (test.t1) +master-bin.000001 27761 Write_rows 1 27795 table_id: 25 flags: STMT_END_F +master-bin.000001 27795 Table_map 1 27834 table_id: 25 (test.t1) +master-bin.000001 27834 Write_rows 1 27868 table_id: 25 flags: STMT_END_F +master-bin.000001 27868 Table_map 1 27907 table_id: 25 (test.t1) +master-bin.000001 27907 Write_rows 1 27941 table_id: 25 flags: STMT_END_F +master-bin.000001 27941 Table_map 1 27980 table_id: 25 (test.t1) +master-bin.000001 27980 Write_rows 1 28014 table_id: 25 flags: STMT_END_F +master-bin.000001 28014 Table_map 1 28053 table_id: 25 (test.t1) +master-bin.000001 28053 Write_rows 1 28087 table_id: 25 flags: STMT_END_F +master-bin.000001 28087 Table_map 1 28126 table_id: 25 (test.t1) +master-bin.000001 28126 Write_rows 1 28160 table_id: 25 flags: STMT_END_F +master-bin.000001 28160 Table_map 1 28199 table_id: 25 (test.t1) +master-bin.000001 28199 Write_rows 1 28233 table_id: 25 flags: STMT_END_F +master-bin.000001 28233 Table_map 1 28272 table_id: 25 (test.t1) +master-bin.000001 28272 Write_rows 1 28306 table_id: 25 flags: STMT_END_F +master-bin.000001 28306 Table_map 1 28345 table_id: 25 (test.t1) +master-bin.000001 28345 Write_rows 1 28379 table_id: 25 flags: STMT_END_F +master-bin.000001 28379 Table_map 1 28418 table_id: 25 (test.t1) +master-bin.000001 28418 Write_rows 1 28452 table_id: 25 flags: STMT_END_F +master-bin.000001 28452 Table_map 1 28491 table_id: 25 (test.t1) +master-bin.000001 28491 Write_rows 1 28525 table_id: 25 flags: STMT_END_F +master-bin.000001 28525 Table_map 1 28564 table_id: 25 (test.t1) +master-bin.000001 28564 Write_rows 1 28598 table_id: 25 flags: STMT_END_F +master-bin.000001 28598 Table_map 1 28637 table_id: 25 (test.t1) +master-bin.000001 28637 Write_rows 1 28671 table_id: 25 flags: STMT_END_F +master-bin.000001 28671 Table_map 1 28710 table_id: 25 (test.t1) +master-bin.000001 28710 Write_rows 1 28744 table_id: 25 flags: STMT_END_F +master-bin.000001 28744 Table_map 1 28783 table_id: 25 (test.t1) +master-bin.000001 28783 Write_rows 1 28817 table_id: 25 flags: STMT_END_F +master-bin.000001 28817 Table_map 1 28856 table_id: 25 (test.t1) +master-bin.000001 28856 Write_rows 1 28890 table_id: 25 flags: STMT_END_F +master-bin.000001 28890 Table_map 1 28929 table_id: 25 (test.t1) +master-bin.000001 28929 Write_rows 1 28963 table_id: 25 flags: STMT_END_F +master-bin.000001 28963 Table_map 1 29002 table_id: 25 (test.t1) +master-bin.000001 29002 Write_rows 1 29036 table_id: 25 flags: STMT_END_F +master-bin.000001 29036 Table_map 1 29075 table_id: 25 (test.t1) +master-bin.000001 29075 Write_rows 1 29109 table_id: 25 flags: STMT_END_F +master-bin.000001 29109 Table_map 1 29148 table_id: 25 (test.t1) +master-bin.000001 29148 Write_rows 1 29182 table_id: 25 flags: STMT_END_F +master-bin.000001 29182 Table_map 1 29221 table_id: 25 (test.t1) +master-bin.000001 29221 Write_rows 1 29255 table_id: 25 flags: STMT_END_F +master-bin.000001 29255 Table_map 1 29294 table_id: 25 (test.t1) +master-bin.000001 29294 Write_rows 1 29328 table_id: 25 flags: STMT_END_F +master-bin.000001 29328 Table_map 1 29367 table_id: 25 (test.t1) +master-bin.000001 29367 Write_rows 1 29401 table_id: 25 flags: STMT_END_F +master-bin.000001 29401 Table_map 1 29440 table_id: 25 (test.t1) +master-bin.000001 29440 Write_rows 1 29474 table_id: 25 flags: STMT_END_F +master-bin.000001 29474 Xid 1 29501 COMMIT /* xid=189 */ +master-bin.000001 29501 Rotate 1 29545 master-bin.000002;pos=4 +drop table t1; +set global binlog_cache_size=@bcs; +set session autocommit = @ac; +End of 5.0 tests reset master; create table t1 (id tinyint auto_increment primary key); set insert_id=128; diff --git a/mysql-test/r/binlog_stm_binlog.result b/mysql-test/r/binlog_stm_binlog.result index 1bc7430fde0..45fef628357 100644 --- a/mysql-test/r/binlog_stm_binlog.result +++ b/mysql-test/r/binlog_stm_binlog.result @@ -260,6 +260,422 @@ master-bin.000001 293 Query 1 381 use `test`; insert into t1 values (5) master-bin.000001 381 Query 1 469 use `test`; insert into t1 values (6) master-bin.000001 469 Query 1 545 use `test`; drop table t1 set session autocommit = @ac; +set @bcs = @@binlog_cache_size; +set @ac = @@autocommit; +set global binlog_cache_size=4096; +set autocommit= 0; +reset master; +create table t1 (a int) engine=innodb; +show binlog events from 0; +Log_name Pos Event_type Server_id End_log_pos Info +master-bin.000001 4 Format_desc 1 106 Server ver: 5.1.21-beta-debug-log, Binlog ver: 4 +master-bin.000001 106 Query 1 206 use `test`; create table t1 (a int) engine=innodb +master-bin.000001 206 Query 1 274 use `test`; BEGIN +master-bin.000001 274 Query 1 365 use `test`; insert into t1 values( 400 ) +master-bin.000001 365 Query 1 456 use `test`; insert into t1 values( 399 ) +master-bin.000001 456 Query 1 547 use `test`; insert into t1 values( 398 ) +master-bin.000001 547 Query 1 638 use `test`; insert into t1 values( 397 ) +master-bin.000001 638 Query 1 729 use `test`; insert into t1 values( 396 ) +master-bin.000001 729 Query 1 820 use `test`; insert into t1 values( 395 ) +master-bin.000001 820 Query 1 911 use `test`; insert into t1 values( 394 ) +master-bin.000001 911 Query 1 1002 use `test`; insert into t1 values( 393 ) +master-bin.000001 1002 Query 1 1093 use `test`; insert into t1 values( 392 ) +master-bin.000001 1093 Query 1 1184 use `test`; insert into t1 values( 391 ) +master-bin.000001 1184 Query 1 1275 use `test`; insert into t1 values( 390 ) +master-bin.000001 1275 Query 1 1366 use `test`; insert into t1 values( 389 ) +master-bin.000001 1366 Query 1 1457 use `test`; insert into t1 values( 388 ) +master-bin.000001 1457 Query 1 1548 use `test`; insert into t1 values( 387 ) +master-bin.000001 1548 Query 1 1639 use `test`; insert into t1 values( 386 ) +master-bin.000001 1639 Query 1 1730 use `test`; insert into t1 values( 385 ) +master-bin.000001 1730 Query 1 1821 use `test`; insert into t1 values( 384 ) +master-bin.000001 1821 Query 1 1912 use `test`; insert into t1 values( 383 ) +master-bin.000001 1912 Query 1 2003 use `test`; insert into t1 values( 382 ) +master-bin.000001 2003 Query 1 2094 use `test`; insert into t1 values( 381 ) +master-bin.000001 2094 Query 1 2185 use `test`; insert into t1 values( 380 ) +master-bin.000001 2185 Query 1 2276 use `test`; insert into t1 values( 379 ) +master-bin.000001 2276 Query 1 2367 use `test`; insert into t1 values( 378 ) +master-bin.000001 2367 Query 1 2458 use `test`; insert into t1 values( 377 ) +master-bin.000001 2458 Query 1 2549 use `test`; insert into t1 values( 376 ) +master-bin.000001 2549 Query 1 2640 use `test`; insert into t1 values( 375 ) +master-bin.000001 2640 Query 1 2731 use `test`; insert into t1 values( 374 ) +master-bin.000001 2731 Query 1 2822 use `test`; insert into t1 values( 373 ) +master-bin.000001 2822 Query 1 2913 use `test`; insert into t1 values( 372 ) +master-bin.000001 2913 Query 1 3004 use `test`; insert into t1 values( 371 ) +master-bin.000001 3004 Query 1 3095 use `test`; insert into t1 values( 370 ) +master-bin.000001 3095 Query 1 3186 use `test`; insert into t1 values( 369 ) +master-bin.000001 3186 Query 1 3277 use `test`; insert into t1 values( 368 ) +master-bin.000001 3277 Query 1 3368 use `test`; insert into t1 values( 367 ) +master-bin.000001 3368 Query 1 3459 use `test`; insert into t1 values( 366 ) +master-bin.000001 3459 Query 1 3550 use `test`; insert into t1 values( 365 ) +master-bin.000001 3550 Query 1 3641 use `test`; insert into t1 values( 364 ) +master-bin.000001 3641 Query 1 3732 use `test`; insert into t1 values( 363 ) +master-bin.000001 3732 Query 1 3823 use `test`; insert into t1 values( 362 ) +master-bin.000001 3823 Query 1 3914 use `test`; insert into t1 values( 361 ) +master-bin.000001 3914 Query 1 4005 use `test`; insert into t1 values( 360 ) +master-bin.000001 4005 Query 1 4096 use `test`; insert into t1 values( 359 ) +master-bin.000001 4096 Query 1 4187 use `test`; insert into t1 values( 358 ) +master-bin.000001 4187 Query 1 4278 use `test`; insert into t1 values( 357 ) +master-bin.000001 4278 Query 1 4369 use `test`; insert into t1 values( 356 ) +master-bin.000001 4369 Query 1 4460 use `test`; insert into t1 values( 355 ) +master-bin.000001 4460 Query 1 4551 use `test`; insert into t1 values( 354 ) +master-bin.000001 4551 Query 1 4642 use `test`; insert into t1 values( 353 ) +master-bin.000001 4642 Query 1 4733 use `test`; insert into t1 values( 352 ) +master-bin.000001 4733 Query 1 4824 use `test`; insert into t1 values( 351 ) +master-bin.000001 4824 Query 1 4915 use `test`; insert into t1 values( 350 ) +master-bin.000001 4915 Query 1 5006 use `test`; insert into t1 values( 349 ) +master-bin.000001 5006 Query 1 5097 use `test`; insert into t1 values( 348 ) +master-bin.000001 5097 Query 1 5188 use `test`; insert into t1 values( 347 ) +master-bin.000001 5188 Query 1 5279 use `test`; insert into t1 values( 346 ) +master-bin.000001 5279 Query 1 5370 use `test`; insert into t1 values( 345 ) +master-bin.000001 5370 Query 1 5461 use `test`; insert into t1 values( 344 ) +master-bin.000001 5461 Query 1 5552 use `test`; insert into t1 values( 343 ) +master-bin.000001 5552 Query 1 5643 use `test`; insert into t1 values( 342 ) +master-bin.000001 5643 Query 1 5734 use `test`; insert into t1 values( 341 ) +master-bin.000001 5734 Query 1 5825 use `test`; insert into t1 values( 340 ) +master-bin.000001 5825 Query 1 5916 use `test`; insert into t1 values( 339 ) +master-bin.000001 5916 Query 1 6007 use `test`; insert into t1 values( 338 ) +master-bin.000001 6007 Query 1 6098 use `test`; insert into t1 values( 337 ) +master-bin.000001 6098 Query 1 6189 use `test`; insert into t1 values( 336 ) +master-bin.000001 6189 Query 1 6280 use `test`; insert into t1 values( 335 ) +master-bin.000001 6280 Query 1 6371 use `test`; insert into t1 values( 334 ) +master-bin.000001 6371 Query 1 6462 use `test`; insert into t1 values( 333 ) +master-bin.000001 6462 Query 1 6553 use `test`; insert into t1 values( 332 ) +master-bin.000001 6553 Query 1 6644 use `test`; insert into t1 values( 331 ) +master-bin.000001 6644 Query 1 6735 use `test`; insert into t1 values( 330 ) +master-bin.000001 6735 Query 1 6826 use `test`; insert into t1 values( 329 ) +master-bin.000001 6826 Query 1 6917 use `test`; insert into t1 values( 328 ) +master-bin.000001 6917 Query 1 7008 use `test`; insert into t1 values( 327 ) +master-bin.000001 7008 Query 1 7099 use `test`; insert into t1 values( 326 ) +master-bin.000001 7099 Query 1 7190 use `test`; insert into t1 values( 325 ) +master-bin.000001 7190 Query 1 7281 use `test`; insert into t1 values( 324 ) +master-bin.000001 7281 Query 1 7372 use `test`; insert into t1 values( 323 ) +master-bin.000001 7372 Query 1 7463 use `test`; insert into t1 values( 322 ) +master-bin.000001 7463 Query 1 7554 use `test`; insert into t1 values( 321 ) +master-bin.000001 7554 Query 1 7645 use `test`; insert into t1 values( 320 ) +master-bin.000001 7645 Query 1 7736 use `test`; insert into t1 values( 319 ) +master-bin.000001 7736 Query 1 7827 use `test`; insert into t1 values( 318 ) +master-bin.000001 7827 Query 1 7918 use `test`; insert into t1 values( 317 ) +master-bin.000001 7918 Query 1 8009 use `test`; insert into t1 values( 316 ) +master-bin.000001 8009 Query 1 8100 use `test`; insert into t1 values( 315 ) +master-bin.000001 8100 Query 1 8191 use `test`; insert into t1 values( 314 ) +master-bin.000001 8191 Query 1 8282 use `test`; insert into t1 values( 313 ) +master-bin.000001 8282 Query 1 8373 use `test`; insert into t1 values( 312 ) +master-bin.000001 8373 Query 1 8464 use `test`; insert into t1 values( 311 ) +master-bin.000001 8464 Query 1 8555 use `test`; insert into t1 values( 310 ) +master-bin.000001 8555 Query 1 8646 use `test`; insert into t1 values( 309 ) +master-bin.000001 8646 Query 1 8737 use `test`; insert into t1 values( 308 ) +master-bin.000001 8737 Query 1 8828 use `test`; insert into t1 values( 307 ) +master-bin.000001 8828 Query 1 8919 use `test`; insert into t1 values( 306 ) +master-bin.000001 8919 Query 1 9010 use `test`; insert into t1 values( 305 ) +master-bin.000001 9010 Query 1 9101 use `test`; insert into t1 values( 304 ) +master-bin.000001 9101 Query 1 9192 use `test`; insert into t1 values( 303 ) +master-bin.000001 9192 Query 1 9283 use `test`; insert into t1 values( 302 ) +master-bin.000001 9283 Query 1 9374 use `test`; insert into t1 values( 301 ) +master-bin.000001 9374 Query 1 9465 use `test`; insert into t1 values( 300 ) +master-bin.000001 9465 Query 1 9556 use `test`; insert into t1 values( 299 ) +master-bin.000001 9556 Query 1 9647 use `test`; insert into t1 values( 298 ) +master-bin.000001 9647 Query 1 9738 use `test`; insert into t1 values( 297 ) +master-bin.000001 9738 Query 1 9829 use `test`; insert into t1 values( 296 ) +master-bin.000001 9829 Query 1 9920 use `test`; insert into t1 values( 295 ) +master-bin.000001 9920 Query 1 10011 use `test`; insert into t1 values( 294 ) +master-bin.000001 10011 Query 1 10102 use `test`; insert into t1 values( 293 ) +master-bin.000001 10102 Query 1 10193 use `test`; insert into t1 values( 292 ) +master-bin.000001 10193 Query 1 10284 use `test`; insert into t1 values( 291 ) +master-bin.000001 10284 Query 1 10375 use `test`; insert into t1 values( 290 ) +master-bin.000001 10375 Query 1 10466 use `test`; insert into t1 values( 289 ) +master-bin.000001 10466 Query 1 10557 use `test`; insert into t1 values( 288 ) +master-bin.000001 10557 Query 1 10648 use `test`; insert into t1 values( 287 ) +master-bin.000001 10648 Query 1 10739 use `test`; insert into t1 values( 286 ) +master-bin.000001 10739 Query 1 10830 use `test`; insert into t1 values( 285 ) +master-bin.000001 10830 Query 1 10921 use `test`; insert into t1 values( 284 ) +master-bin.000001 10921 Query 1 11012 use `test`; insert into t1 values( 283 ) +master-bin.000001 11012 Query 1 11103 use `test`; insert into t1 values( 282 ) +master-bin.000001 11103 Query 1 11194 use `test`; insert into t1 values( 281 ) +master-bin.000001 11194 Query 1 11285 use `test`; insert into t1 values( 280 ) +master-bin.000001 11285 Query 1 11376 use `test`; insert into t1 values( 279 ) +master-bin.000001 11376 Query 1 11467 use `test`; insert into t1 values( 278 ) +master-bin.000001 11467 Query 1 11558 use `test`; insert into t1 values( 277 ) +master-bin.000001 11558 Query 1 11649 use `test`; insert into t1 values( 276 ) +master-bin.000001 11649 Query 1 11740 use `test`; insert into t1 values( 275 ) +master-bin.000001 11740 Query 1 11831 use `test`; insert into t1 values( 274 ) +master-bin.000001 11831 Query 1 11922 use `test`; insert into t1 values( 273 ) +master-bin.000001 11922 Query 1 12013 use `test`; insert into t1 values( 272 ) +master-bin.000001 12013 Query 1 12104 use `test`; insert into t1 values( 271 ) +master-bin.000001 12104 Query 1 12195 use `test`; insert into t1 values( 270 ) +master-bin.000001 12195 Query 1 12286 use `test`; insert into t1 values( 269 ) +master-bin.000001 12286 Query 1 12377 use `test`; insert into t1 values( 268 ) +master-bin.000001 12377 Query 1 12468 use `test`; insert into t1 values( 267 ) +master-bin.000001 12468 Query 1 12559 use `test`; insert into t1 values( 266 ) +master-bin.000001 12559 Query 1 12650 use `test`; insert into t1 values( 265 ) +master-bin.000001 12650 Query 1 12741 use `test`; insert into t1 values( 264 ) +master-bin.000001 12741 Query 1 12832 use `test`; insert into t1 values( 263 ) +master-bin.000001 12832 Query 1 12923 use `test`; insert into t1 values( 262 ) +master-bin.000001 12923 Query 1 13014 use `test`; insert into t1 values( 261 ) +master-bin.000001 13014 Query 1 13105 use `test`; insert into t1 values( 260 ) +master-bin.000001 13105 Query 1 13196 use `test`; insert into t1 values( 259 ) +master-bin.000001 13196 Query 1 13287 use `test`; insert into t1 values( 258 ) +master-bin.000001 13287 Query 1 13378 use `test`; insert into t1 values( 257 ) +master-bin.000001 13378 Query 1 13469 use `test`; insert into t1 values( 256 ) +master-bin.000001 13469 Query 1 13560 use `test`; insert into t1 values( 255 ) +master-bin.000001 13560 Query 1 13651 use `test`; insert into t1 values( 254 ) +master-bin.000001 13651 Query 1 13742 use `test`; insert into t1 values( 253 ) +master-bin.000001 13742 Query 1 13833 use `test`; insert into t1 values( 252 ) +master-bin.000001 13833 Query 1 13924 use `test`; insert into t1 values( 251 ) +master-bin.000001 13924 Query 1 14015 use `test`; insert into t1 values( 250 ) +master-bin.000001 14015 Query 1 14106 use `test`; insert into t1 values( 249 ) +master-bin.000001 14106 Query 1 14197 use `test`; insert into t1 values( 248 ) +master-bin.000001 14197 Query 1 14288 use `test`; insert into t1 values( 247 ) +master-bin.000001 14288 Query 1 14379 use `test`; insert into t1 values( 246 ) +master-bin.000001 14379 Query 1 14470 use `test`; insert into t1 values( 245 ) +master-bin.000001 14470 Query 1 14561 use `test`; insert into t1 values( 244 ) +master-bin.000001 14561 Query 1 14652 use `test`; insert into t1 values( 243 ) +master-bin.000001 14652 Query 1 14743 use `test`; insert into t1 values( 242 ) +master-bin.000001 14743 Query 1 14834 use `test`; insert into t1 values( 241 ) +master-bin.000001 14834 Query 1 14925 use `test`; insert into t1 values( 240 ) +master-bin.000001 14925 Query 1 15016 use `test`; insert into t1 values( 239 ) +master-bin.000001 15016 Query 1 15107 use `test`; insert into t1 values( 238 ) +master-bin.000001 15107 Query 1 15198 use `test`; insert into t1 values( 237 ) +master-bin.000001 15198 Query 1 15289 use `test`; insert into t1 values( 236 ) +master-bin.000001 15289 Query 1 15380 use `test`; insert into t1 values( 235 ) +master-bin.000001 15380 Query 1 15471 use `test`; insert into t1 values( 234 ) +master-bin.000001 15471 Query 1 15562 use `test`; insert into t1 values( 233 ) +master-bin.000001 15562 Query 1 15653 use `test`; insert into t1 values( 232 ) +master-bin.000001 15653 Query 1 15744 use `test`; insert into t1 values( 231 ) +master-bin.000001 15744 Query 1 15835 use `test`; insert into t1 values( 230 ) +master-bin.000001 15835 Query 1 15926 use `test`; insert into t1 values( 229 ) +master-bin.000001 15926 Query 1 16017 use `test`; insert into t1 values( 228 ) +master-bin.000001 16017 Query 1 16108 use `test`; insert into t1 values( 227 ) +master-bin.000001 16108 Query 1 16199 use `test`; insert into t1 values( 226 ) +master-bin.000001 16199 Query 1 16290 use `test`; insert into t1 values( 225 ) +master-bin.000001 16290 Query 1 16381 use `test`; insert into t1 values( 224 ) +master-bin.000001 16381 Query 1 16472 use `test`; insert into t1 values( 223 ) +master-bin.000001 16472 Query 1 16563 use `test`; insert into t1 values( 222 ) +master-bin.000001 16563 Query 1 16654 use `test`; insert into t1 values( 221 ) +master-bin.000001 16654 Query 1 16745 use `test`; insert into t1 values( 220 ) +master-bin.000001 16745 Query 1 16836 use `test`; insert into t1 values( 219 ) +master-bin.000001 16836 Query 1 16927 use `test`; insert into t1 values( 218 ) +master-bin.000001 16927 Query 1 17018 use `test`; insert into t1 values( 217 ) +master-bin.000001 17018 Query 1 17109 use `test`; insert into t1 values( 216 ) +master-bin.000001 17109 Query 1 17200 use `test`; insert into t1 values( 215 ) +master-bin.000001 17200 Query 1 17291 use `test`; insert into t1 values( 214 ) +master-bin.000001 17291 Query 1 17382 use `test`; insert into t1 values( 213 ) +master-bin.000001 17382 Query 1 17473 use `test`; insert into t1 values( 212 ) +master-bin.000001 17473 Query 1 17564 use `test`; insert into t1 values( 211 ) +master-bin.000001 17564 Query 1 17655 use `test`; insert into t1 values( 210 ) +master-bin.000001 17655 Query 1 17746 use `test`; insert into t1 values( 209 ) +master-bin.000001 17746 Query 1 17837 use `test`; insert into t1 values( 208 ) +master-bin.000001 17837 Query 1 17928 use `test`; insert into t1 values( 207 ) +master-bin.000001 17928 Query 1 18019 use `test`; insert into t1 values( 206 ) +master-bin.000001 18019 Query 1 18110 use `test`; insert into t1 values( 205 ) +master-bin.000001 18110 Query 1 18201 use `test`; insert into t1 values( 204 ) +master-bin.000001 18201 Query 1 18292 use `test`; insert into t1 values( 203 ) +master-bin.000001 18292 Query 1 18383 use `test`; insert into t1 values( 202 ) +master-bin.000001 18383 Query 1 18474 use `test`; insert into t1 values( 201 ) +master-bin.000001 18474 Query 1 18565 use `test`; insert into t1 values( 200 ) +master-bin.000001 18565 Query 1 18656 use `test`; insert into t1 values( 199 ) +master-bin.000001 18656 Query 1 18747 use `test`; insert into t1 values( 198 ) +master-bin.000001 18747 Query 1 18838 use `test`; insert into t1 values( 197 ) +master-bin.000001 18838 Query 1 18929 use `test`; insert into t1 values( 196 ) +master-bin.000001 18929 Query 1 19020 use `test`; insert into t1 values( 195 ) +master-bin.000001 19020 Query 1 19111 use `test`; insert into t1 values( 194 ) +master-bin.000001 19111 Query 1 19202 use `test`; insert into t1 values( 193 ) +master-bin.000001 19202 Query 1 19293 use `test`; insert into t1 values( 192 ) +master-bin.000001 19293 Query 1 19384 use `test`; insert into t1 values( 191 ) +master-bin.000001 19384 Query 1 19475 use `test`; insert into t1 values( 190 ) +master-bin.000001 19475 Query 1 19566 use `test`; insert into t1 values( 189 ) +master-bin.000001 19566 Query 1 19657 use `test`; insert into t1 values( 188 ) +master-bin.000001 19657 Query 1 19748 use `test`; insert into t1 values( 187 ) +master-bin.000001 19748 Query 1 19839 use `test`; insert into t1 values( 186 ) +master-bin.000001 19839 Query 1 19930 use `test`; insert into t1 values( 185 ) +master-bin.000001 19930 Query 1 20021 use `test`; insert into t1 values( 184 ) +master-bin.000001 20021 Query 1 20112 use `test`; insert into t1 values( 183 ) +master-bin.000001 20112 Query 1 20203 use `test`; insert into t1 values( 182 ) +master-bin.000001 20203 Query 1 20294 use `test`; insert into t1 values( 181 ) +master-bin.000001 20294 Query 1 20385 use `test`; insert into t1 values( 180 ) +master-bin.000001 20385 Query 1 20476 use `test`; insert into t1 values( 179 ) +master-bin.000001 20476 Query 1 20567 use `test`; insert into t1 values( 178 ) +master-bin.000001 20567 Query 1 20658 use `test`; insert into t1 values( 177 ) +master-bin.000001 20658 Query 1 20749 use `test`; insert into t1 values( 176 ) +master-bin.000001 20749 Query 1 20840 use `test`; insert into t1 values( 175 ) +master-bin.000001 20840 Query 1 20931 use `test`; insert into t1 values( 174 ) +master-bin.000001 20931 Query 1 21022 use `test`; insert into t1 values( 173 ) +master-bin.000001 21022 Query 1 21113 use `test`; insert into t1 values( 172 ) +master-bin.000001 21113 Query 1 21204 use `test`; insert into t1 values( 171 ) +master-bin.000001 21204 Query 1 21295 use `test`; insert into t1 values( 170 ) +master-bin.000001 21295 Query 1 21386 use `test`; insert into t1 values( 169 ) +master-bin.000001 21386 Query 1 21477 use `test`; insert into t1 values( 168 ) +master-bin.000001 21477 Query 1 21568 use `test`; insert into t1 values( 167 ) +master-bin.000001 21568 Query 1 21659 use `test`; insert into t1 values( 166 ) +master-bin.000001 21659 Query 1 21750 use `test`; insert into t1 values( 165 ) +master-bin.000001 21750 Query 1 21841 use `test`; insert into t1 values( 164 ) +master-bin.000001 21841 Query 1 21932 use `test`; insert into t1 values( 163 ) +master-bin.000001 21932 Query 1 22023 use `test`; insert into t1 values( 162 ) +master-bin.000001 22023 Query 1 22114 use `test`; insert into t1 values( 161 ) +master-bin.000001 22114 Query 1 22205 use `test`; insert into t1 values( 160 ) +master-bin.000001 22205 Query 1 22296 use `test`; insert into t1 values( 159 ) +master-bin.000001 22296 Query 1 22387 use `test`; insert into t1 values( 158 ) +master-bin.000001 22387 Query 1 22478 use `test`; insert into t1 values( 157 ) +master-bin.000001 22478 Query 1 22569 use `test`; insert into t1 values( 156 ) +master-bin.000001 22569 Query 1 22660 use `test`; insert into t1 values( 155 ) +master-bin.000001 22660 Query 1 22751 use `test`; insert into t1 values( 154 ) +master-bin.000001 22751 Query 1 22842 use `test`; insert into t1 values( 153 ) +master-bin.000001 22842 Query 1 22933 use `test`; insert into t1 values( 152 ) +master-bin.000001 22933 Query 1 23024 use `test`; insert into t1 values( 151 ) +master-bin.000001 23024 Query 1 23115 use `test`; insert into t1 values( 150 ) +master-bin.000001 23115 Query 1 23206 use `test`; insert into t1 values( 149 ) +master-bin.000001 23206 Query 1 23297 use `test`; insert into t1 values( 148 ) +master-bin.000001 23297 Query 1 23388 use `test`; insert into t1 values( 147 ) +master-bin.000001 23388 Query 1 23479 use `test`; insert into t1 values( 146 ) +master-bin.000001 23479 Query 1 23570 use `test`; insert into t1 values( 145 ) +master-bin.000001 23570 Query 1 23661 use `test`; insert into t1 values( 144 ) +master-bin.000001 23661 Query 1 23752 use `test`; insert into t1 values( 143 ) +master-bin.000001 23752 Query 1 23843 use `test`; insert into t1 values( 142 ) +master-bin.000001 23843 Query 1 23934 use `test`; insert into t1 values( 141 ) +master-bin.000001 23934 Query 1 24025 use `test`; insert into t1 values( 140 ) +master-bin.000001 24025 Query 1 24116 use `test`; insert into t1 values( 139 ) +master-bin.000001 24116 Query 1 24207 use `test`; insert into t1 values( 138 ) +master-bin.000001 24207 Query 1 24298 use `test`; insert into t1 values( 137 ) +master-bin.000001 24298 Query 1 24389 use `test`; insert into t1 values( 136 ) +master-bin.000001 24389 Query 1 24480 use `test`; insert into t1 values( 135 ) +master-bin.000001 24480 Query 1 24571 use `test`; insert into t1 values( 134 ) +master-bin.000001 24571 Query 1 24662 use `test`; insert into t1 values( 133 ) +master-bin.000001 24662 Query 1 24753 use `test`; insert into t1 values( 132 ) +master-bin.000001 24753 Query 1 24844 use `test`; insert into t1 values( 131 ) +master-bin.000001 24844 Query 1 24935 use `test`; insert into t1 values( 130 ) +master-bin.000001 24935 Query 1 25026 use `test`; insert into t1 values( 129 ) +master-bin.000001 25026 Query 1 25117 use `test`; insert into t1 values( 128 ) +master-bin.000001 25117 Query 1 25208 use `test`; insert into t1 values( 127 ) +master-bin.000001 25208 Query 1 25299 use `test`; insert into t1 values( 126 ) +master-bin.000001 25299 Query 1 25390 use `test`; insert into t1 values( 125 ) +master-bin.000001 25390 Query 1 25481 use `test`; insert into t1 values( 124 ) +master-bin.000001 25481 Query 1 25572 use `test`; insert into t1 values( 123 ) +master-bin.000001 25572 Query 1 25663 use `test`; insert into t1 values( 122 ) +master-bin.000001 25663 Query 1 25754 use `test`; insert into t1 values( 121 ) +master-bin.000001 25754 Query 1 25845 use `test`; insert into t1 values( 120 ) +master-bin.000001 25845 Query 1 25936 use `test`; insert into t1 values( 119 ) +master-bin.000001 25936 Query 1 26027 use `test`; insert into t1 values( 118 ) +master-bin.000001 26027 Query 1 26118 use `test`; insert into t1 values( 117 ) +master-bin.000001 26118 Query 1 26209 use `test`; insert into t1 values( 116 ) +master-bin.000001 26209 Query 1 26300 use `test`; insert into t1 values( 115 ) +master-bin.000001 26300 Query 1 26391 use `test`; insert into t1 values( 114 ) +master-bin.000001 26391 Query 1 26482 use `test`; insert into t1 values( 113 ) +master-bin.000001 26482 Query 1 26573 use `test`; insert into t1 values( 112 ) +master-bin.000001 26573 Query 1 26664 use `test`; insert into t1 values( 111 ) +master-bin.000001 26664 Query 1 26755 use `test`; insert into t1 values( 110 ) +master-bin.000001 26755 Query 1 26846 use `test`; insert into t1 values( 109 ) +master-bin.000001 26846 Query 1 26937 use `test`; insert into t1 values( 108 ) +master-bin.000001 26937 Query 1 27028 use `test`; insert into t1 values( 107 ) +master-bin.000001 27028 Query 1 27119 use `test`; insert into t1 values( 106 ) +master-bin.000001 27119 Query 1 27210 use `test`; insert into t1 values( 105 ) +master-bin.000001 27210 Query 1 27301 use `test`; insert into t1 values( 104 ) +master-bin.000001 27301 Query 1 27392 use `test`; insert into t1 values( 103 ) +master-bin.000001 27392 Query 1 27483 use `test`; insert into t1 values( 102 ) +master-bin.000001 27483 Query 1 27574 use `test`; insert into t1 values( 101 ) +master-bin.000001 27574 Query 1 27665 use `test`; insert into t1 values( 100 ) +master-bin.000001 27665 Query 1 27755 use `test`; insert into t1 values( 99 ) +master-bin.000001 27755 Query 1 27845 use `test`; insert into t1 values( 98 ) +master-bin.000001 27845 Query 1 27935 use `test`; insert into t1 values( 97 ) +master-bin.000001 27935 Query 1 28025 use `test`; insert into t1 values( 96 ) +master-bin.000001 28025 Query 1 28115 use `test`; insert into t1 values( 95 ) +master-bin.000001 28115 Query 1 28205 use `test`; insert into t1 values( 94 ) +master-bin.000001 28205 Query 1 28295 use `test`; insert into t1 values( 93 ) +master-bin.000001 28295 Query 1 28385 use `test`; insert into t1 values( 92 ) +master-bin.000001 28385 Query 1 28475 use `test`; insert into t1 values( 91 ) +master-bin.000001 28475 Query 1 28565 use `test`; insert into t1 values( 90 ) +master-bin.000001 28565 Query 1 28655 use `test`; insert into t1 values( 89 ) +master-bin.000001 28655 Query 1 28745 use `test`; insert into t1 values( 88 ) +master-bin.000001 28745 Query 1 28835 use `test`; insert into t1 values( 87 ) +master-bin.000001 28835 Query 1 28925 use `test`; insert into t1 values( 86 ) +master-bin.000001 28925 Query 1 29015 use `test`; insert into t1 values( 85 ) +master-bin.000001 29015 Query 1 29105 use `test`; insert into t1 values( 84 ) +master-bin.000001 29105 Query 1 29195 use `test`; insert into t1 values( 83 ) +master-bin.000001 29195 Query 1 29285 use `test`; insert into t1 values( 82 ) +master-bin.000001 29285 Query 1 29375 use `test`; insert into t1 values( 81 ) +master-bin.000001 29375 Query 1 29465 use `test`; insert into t1 values( 80 ) +master-bin.000001 29465 Query 1 29555 use `test`; insert into t1 values( 79 ) +master-bin.000001 29555 Query 1 29645 use `test`; insert into t1 values( 78 ) +master-bin.000001 29645 Query 1 29735 use `test`; insert into t1 values( 77 ) +master-bin.000001 29735 Query 1 29825 use `test`; insert into t1 values( 76 ) +master-bin.000001 29825 Query 1 29915 use `test`; insert into t1 values( 75 ) +master-bin.000001 29915 Query 1 30005 use `test`; insert into t1 values( 74 ) +master-bin.000001 30005 Query 1 30095 use `test`; insert into t1 values( 73 ) +master-bin.000001 30095 Query 1 30185 use `test`; insert into t1 values( 72 ) +master-bin.000001 30185 Query 1 30275 use `test`; insert into t1 values( 71 ) +master-bin.000001 30275 Query 1 30365 use `test`; insert into t1 values( 70 ) +master-bin.000001 30365 Query 1 30455 use `test`; insert into t1 values( 69 ) +master-bin.000001 30455 Query 1 30545 use `test`; insert into t1 values( 68 ) +master-bin.000001 30545 Query 1 30635 use `test`; insert into t1 values( 67 ) +master-bin.000001 30635 Query 1 30725 use `test`; insert into t1 values( 66 ) +master-bin.000001 30725 Query 1 30815 use `test`; insert into t1 values( 65 ) +master-bin.000001 30815 Query 1 30905 use `test`; insert into t1 values( 64 ) +master-bin.000001 30905 Query 1 30995 use `test`; insert into t1 values( 63 ) +master-bin.000001 30995 Query 1 31085 use `test`; insert into t1 values( 62 ) +master-bin.000001 31085 Query 1 31175 use `test`; insert into t1 values( 61 ) +master-bin.000001 31175 Query 1 31265 use `test`; insert into t1 values( 60 ) +master-bin.000001 31265 Query 1 31355 use `test`; insert into t1 values( 59 ) +master-bin.000001 31355 Query 1 31445 use `test`; insert into t1 values( 58 ) +master-bin.000001 31445 Query 1 31535 use `test`; insert into t1 values( 57 ) +master-bin.000001 31535 Query 1 31625 use `test`; insert into t1 values( 56 ) +master-bin.000001 31625 Query 1 31715 use `test`; insert into t1 values( 55 ) +master-bin.000001 31715 Query 1 31805 use `test`; insert into t1 values( 54 ) +master-bin.000001 31805 Query 1 31895 use `test`; insert into t1 values( 53 ) +master-bin.000001 31895 Query 1 31985 use `test`; insert into t1 values( 52 ) +master-bin.000001 31985 Query 1 32075 use `test`; insert into t1 values( 51 ) +master-bin.000001 32075 Query 1 32165 use `test`; insert into t1 values( 50 ) +master-bin.000001 32165 Query 1 32255 use `test`; insert into t1 values( 49 ) +master-bin.000001 32255 Query 1 32345 use `test`; insert into t1 values( 48 ) +master-bin.000001 32345 Query 1 32435 use `test`; insert into t1 values( 47 ) +master-bin.000001 32435 Query 1 32525 use `test`; insert into t1 values( 46 ) +master-bin.000001 32525 Query 1 32615 use `test`; insert into t1 values( 45 ) +master-bin.000001 32615 Query 1 32705 use `test`; insert into t1 values( 44 ) +master-bin.000001 32705 Query 1 32795 use `test`; insert into t1 values( 43 ) +master-bin.000001 32795 Query 1 32885 use `test`; insert into t1 values( 42 ) +master-bin.000001 32885 Query 1 32975 use `test`; insert into t1 values( 41 ) +master-bin.000001 32975 Query 1 33065 use `test`; insert into t1 values( 40 ) +master-bin.000001 33065 Query 1 33155 use `test`; insert into t1 values( 39 ) +master-bin.000001 33155 Query 1 33245 use `test`; insert into t1 values( 38 ) +master-bin.000001 33245 Query 1 33335 use `test`; insert into t1 values( 37 ) +master-bin.000001 33335 Query 1 33425 use `test`; insert into t1 values( 36 ) +master-bin.000001 33425 Query 1 33515 use `test`; insert into t1 values( 35 ) +master-bin.000001 33515 Query 1 33605 use `test`; insert into t1 values( 34 ) +master-bin.000001 33605 Query 1 33695 use `test`; insert into t1 values( 33 ) +master-bin.000001 33695 Query 1 33785 use `test`; insert into t1 values( 32 ) +master-bin.000001 33785 Query 1 33875 use `test`; insert into t1 values( 31 ) +master-bin.000001 33875 Query 1 33965 use `test`; insert into t1 values( 30 ) +master-bin.000001 33965 Query 1 34055 use `test`; insert into t1 values( 29 ) +master-bin.000001 34055 Query 1 34145 use `test`; insert into t1 values( 28 ) +master-bin.000001 34145 Query 1 34235 use `test`; insert into t1 values( 27 ) +master-bin.000001 34235 Query 1 34325 use `test`; insert into t1 values( 26 ) +master-bin.000001 34325 Query 1 34415 use `test`; insert into t1 values( 25 ) +master-bin.000001 34415 Query 1 34505 use `test`; insert into t1 values( 24 ) +master-bin.000001 34505 Query 1 34595 use `test`; insert into t1 values( 23 ) +master-bin.000001 34595 Query 1 34685 use `test`; insert into t1 values( 22 ) +master-bin.000001 34685 Query 1 34775 use `test`; insert into t1 values( 21 ) +master-bin.000001 34775 Query 1 34865 use `test`; insert into t1 values( 20 ) +master-bin.000001 34865 Query 1 34955 use `test`; insert into t1 values( 19 ) +master-bin.000001 34955 Query 1 35045 use `test`; insert into t1 values( 18 ) +master-bin.000001 35045 Query 1 35135 use `test`; insert into t1 values( 17 ) +master-bin.000001 35135 Query 1 35225 use `test`; insert into t1 values( 16 ) +master-bin.000001 35225 Query 1 35315 use `test`; insert into t1 values( 15 ) +master-bin.000001 35315 Query 1 35405 use `test`; insert into t1 values( 14 ) +master-bin.000001 35405 Query 1 35495 use `test`; insert into t1 values( 13 ) +master-bin.000001 35495 Query 1 35585 use `test`; insert into t1 values( 12 ) +master-bin.000001 35585 Query 1 35675 use `test`; insert into t1 values( 11 ) +master-bin.000001 35675 Query 1 35765 use `test`; insert into t1 values( 10 ) +master-bin.000001 35765 Query 1 35854 use `test`; insert into t1 values( 9 ) +master-bin.000001 35854 Query 1 35943 use `test`; insert into t1 values( 8 ) +master-bin.000001 35943 Query 1 36032 use `test`; insert into t1 values( 7 ) +master-bin.000001 36032 Query 1 36121 use `test`; insert into t1 values( 6 ) +master-bin.000001 36121 Query 1 36210 use `test`; insert into t1 values( 5 ) +master-bin.000001 36210 Query 1 36299 use `test`; insert into t1 values( 4 ) +master-bin.000001 36299 Query 1 36388 use `test`; insert into t1 values( 3 ) +master-bin.000001 36388 Query 1 36477 use `test`; insert into t1 values( 2 ) +master-bin.000001 36477 Query 1 36566 use `test`; insert into t1 values( 1 ) +master-bin.000001 36566 Xid 1 36593 COMMIT /* xid=196 */ +master-bin.000001 36593 Rotate 1 36637 master-bin.000002;pos=4 +drop table t1; +set global binlog_cache_size=@bcs; +set session autocommit = @ac; End of 5.0 tests reset master; create table t1 (id tinyint auto_increment primary key); diff --git a/mysql-test/r/rpl_row_create_table.result b/mysql-test/r/rpl_row_create_table.result index e76ce5b962d..f22881bd4a9 100644 --- a/mysql-test/r/rpl_row_create_table.result +++ b/mysql-test/r/rpl_row_create_table.result @@ -279,25 +279,25 @@ Log_name Pos Event_type Server_id End_log_pos Info # 192 Table_map # 231 table_id: # (test.t1) # 231 Write_rows # 275 table_id: # flags: STMT_END_F # 275 Query # 343 use `test`; BEGIN -# 343 Query # 125 use `test`; CREATE TABLE `t2` ( +# 343 Query # 468 use `test`; CREATE TABLE `t2` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB -# 468 Table_map # 164 table_id: # (test.t2) -# 507 Write_rows # 208 table_id: # flags: STMT_END_F +# 468 Table_map # 507 table_id: # (test.t2) +# 507 Write_rows # 551 table_id: # flags: STMT_END_F # 551 Xid # 578 COMMIT /* XID */ # 578 Query # 646 use `test`; BEGIN -# 646 Query # 125 use `test`; CREATE TABLE `t3` ( +# 646 Query # 771 use `test`; CREATE TABLE `t3` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB -# 771 Table_map # 164 table_id: # (test.t3) -# 810 Write_rows # 208 table_id: # flags: STMT_END_F +# 771 Table_map # 810 table_id: # (test.t3) +# 810 Write_rows # 854 table_id: # flags: STMT_END_F # 854 Xid # 881 COMMIT /* XID */ # 881 Query # 949 use `test`; BEGIN -# 949 Query # 125 use `test`; CREATE TABLE `t4` ( +# 949 Query # 1074 use `test`; CREATE TABLE `t4` ( `a` int(11) DEFAULT NULL ) ENGINE=InnoDB -# 1074 Table_map # 164 table_id: # (test.t4) -# 1113 Write_rows # 208 table_id: # flags: STMT_END_F +# 1074 Table_map # 1113 table_id: # (test.t4) +# 1113 Write_rows # 1157 table_id: # flags: STMT_END_F # 1157 Xid # 1184 COMMIT /* XID */ # 1184 Table_map # 1223 table_id: # (test.t1) # 1223 Write_rows # 1267 table_id: # flags: STMT_END_F @@ -371,10 +371,10 @@ Log_name Pos Event_type Server_id End_log_pos Info # 231 Write_rows # 275 table_id: # flags: STMT_END_F # 275 Query # 375 use `test`; CREATE TABLE t2 (a INT) ENGINE=INNODB # 375 Query # 443 use `test`; BEGIN -# 443 Table_map # 39 table_id: # (test.t2) -# 482 Write_rows # 83 table_id: # flags: STMT_END_F -# 526 Table_map # 122 table_id: # (test.t2) -# 565 Write_rows # 161 table_id: # flags: STMT_END_F +# 443 Table_map # 482 table_id: # (test.t2) +# 482 Write_rows # 526 table_id: # flags: STMT_END_F +# 526 Table_map # 565 table_id: # (test.t2) +# 565 Write_rows # 604 table_id: # flags: STMT_END_F # 604 Xid # 631 COMMIT /* XID */ SELECT * FROM t2 ORDER BY a; a @@ -396,7 +396,7 @@ SELECT * FROM t2 ORDER BY a; a SHOW BINLOG EVENTS FROM 631; Log_name Pos Event_type Server_id End_log_pos Info -# 631 Query # 80 use `test`; TRUNCATE TABLE t2 +# 631 Query # 711 use `test`; TRUNCATE TABLE t2 # 711 Xid # 738 COMMIT /* XID */ SELECT * FROM t2 ORDER BY a; a diff --git a/sql/log.cc b/sql/log.cc index 5f3ff9b10f7..2821fb399a4 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3995,58 +3995,61 @@ int MYSQL_BIN_LOG::write_cache(IO_CACHE *cache, bool lock_log, bool sync_log) memcpy((char *)cache->read_pos, &header[carry], LOG_EVENT_HEADER_LEN - carry); /* next event header at ... */ - hdr_offs = LOG_EVENT_HEADER_LEN - carry + - uint4korr(&header[EVENT_LEN_OFFSET]); + hdr_offs = uint4korr(&header[EVENT_LEN_OFFSET]) - carry; carry= 0; } /* if there is anything to write, process it. */ - if(likely(bytes > 0)) + if (likely(bytes > 0)) { /* - next header beyond current read-buffer? we'll get it later - (though not necessarily in the very next iteration). + process all event-headers in this (partial) cache. + if next header is beyond current read-buffer, + we'll get it later (though not necessarily in the + very next iteration, just "eventually"). */ - if (hdr_offs >= bytes) - hdr_offs -= bytes; - else + while (hdr_offs < bytes) { + /* + partial header only? save what we can get, process once + we get the rest. + */ - /* process all event-headers in this (partial) cache. */ + if (hdr_offs + LOG_EVENT_HEADER_LEN > bytes) + { + carry= bytes - hdr_offs; + memcpy(header, (char *)cache->read_pos + hdr_offs, carry); + bytes= hdr_offs; + } + else + { + /* we've got a full event-header, and it came in one piece */ - do { + uchar *log_pos= (uchar *)cache->read_pos + hdr_offs + LOG_POS_OFFSET; - /* - partial header only? save what we can get, process once - we get the rest. - */ + /* fix end_log_pos */ + val= uint4korr(log_pos) + group; + int4store(log_pos, val); - if (hdr_offs + LOG_EVENT_HEADER_LEN > bytes) - { - carry= bytes - hdr_offs; - memcpy(header, (char *)cache->read_pos + hdr_offs, carry); - bytes= hdr_offs; - } - else - { - /* we've got a full event-header, and it came in one piece */ + /* next event header at ... */ + log_pos= (uchar *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET; + hdr_offs += uint4korr(log_pos); - uchar *log_pos= (uchar *)cache->read_pos + hdr_offs + LOG_POS_OFFSET; - - /* fix end_log_pos */ - val= uint4korr(log_pos) + group; - int4store(log_pos, val); - - /* next event header at ... */ - log_pos= (uchar *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET; - hdr_offs += uint4korr(log_pos); - - } - } while (hdr_offs < bytes); + } } + + /* + Adjust hdr_offs. Note that this doesn't mean it will necessarily + be valid in the next iteration; if the current event is very long, + it may take a couple of read-iterations (and subsequent fixings + of hdr_offs) for it to become valid again. + if we had a split header, hdr_offs was already fixed above. + */ + if (carry == 0) + hdr_offs -= bytes; } /* Write data to the binary log file */ From 2fbd3a2ecaaeedb45db4e6b328da1668f4a50252 Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Mon, 2 Jul 2007 07:13:40 +0200 Subject: [PATCH 33/38] Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB minor fixes to appease pushbuild. --- mysql-test/r/binlog.result | 4 ++-- mysql-test/t/binlog.test | 1 + sql/log.cc | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mysql-test/r/binlog.result b/mysql-test/r/binlog.result index 77b015a4688..aa5c6e88d65 100644 --- a/mysql-test/r/binlog.result +++ b/mysql-test/r/binlog.result @@ -256,7 +256,7 @@ reset master; create table t1 (a int) engine=innodb; show binlog events from 0; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 98 Server ver: 5.0.46-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 98 Server version, Binlog ver: 4 master-bin.000001 98 Query 1 198 use `test`; create table t1 (a int) engine=innodb master-bin.000001 198 Query 1 266 use `test`; BEGIN master-bin.000001 266 Query 1 357 use `test`; insert into t1 values( 400 ) @@ -659,7 +659,7 @@ master-bin.000001 36202 Query 1 36291 use `test`; insert into t1 values( 4 ) master-bin.000001 36291 Query 1 36380 use `test`; insert into t1 values( 3 ) master-bin.000001 36380 Query 1 36469 use `test`; insert into t1 values( 2 ) master-bin.000001 36469 Query 1 36558 use `test`; insert into t1 values( 1 ) -master-bin.000001 36558 Xid 1 36585 COMMIT /* xid=186 */ +master-bin.000001 36558 Xid 1 36585 COMMIT /* XID */ master-bin.000001 36585 Rotate 1 36629 master-bin.000002;pos=4 drop table t1; set global binlog_cache_size=@bcs; diff --git a/mysql-test/t/binlog.test b/mysql-test/t/binlog.test index d5479a45226..b9996a2b380 100644 --- a/mysql-test/t/binlog.test +++ b/mysql-test/t/binlog.test @@ -159,6 +159,7 @@ while ($1) commit; enable_query_log; +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/ show binlog events from 0; drop table t1; diff --git a/sql/log.cc b/sql/log.cc index 289d98e63d3..bcaf352f620 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1951,14 +1951,14 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) { /* we've got a full event-header, and it came in one piece */ - char *log_pos= (char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET; + uchar *log_pos= (uchar *)cache->read_pos + hdr_offs + LOG_POS_OFFSET; /* fix end_log_pos */ val= uint4korr(log_pos) + group; int4store(log_pos, val); /* next event header at ... */ - log_pos= (char *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET; + log_pos= (uchar *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET; hdr_offs += uint4korr(log_pos); } From a403815e3d137805b3646eff5995611c8ccbd17c Mon Sep 17 00:00:00 2001 From: "tnurnberg@sin.intern.azundris.com" <> Date: Mon, 2 Jul 2007 07:34:42 +0200 Subject: [PATCH 34/38] Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB minor fixes to appease pushbuild. --- Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540 into sin.intern.azundris.com:/home/tnurnberg/22540/51-22540 --- mysql-test/extra/binlog_tests/binlog.test | 1 + .../suite/binlog/r/binlog_row_binlog.result | 1604 ++++++++--------- .../suite/binlog/r/binlog_stm_binlog.result | 4 +- 3 files changed, 805 insertions(+), 804 deletions(-) diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test index 0a2b84e055b..57008b6af3c 100644 --- a/mysql-test/extra/binlog_tests/binlog.test +++ b/mysql-test/extra/binlog_tests/binlog.test @@ -161,6 +161,7 @@ while ($1) commit; enable_query_log; +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/ show binlog events from 0; drop table t1; diff --git a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result index 89618d37cc1..37fe49e79dc 100644 --- a/mysql-test/suite/binlog/r/binlog_row_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result @@ -373,810 +373,810 @@ reset master; create table t1 (a int) engine=innodb; show binlog events from 0; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 106 Server ver: 5.1.21-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 master-bin.000001 106 Query 1 206 use `test`; create table t1 (a int) engine=innodb master-bin.000001 206 Query 1 274 use `test`; BEGIN -master-bin.000001 274 Table_map 1 313 table_id: 25 (test.t1) -master-bin.000001 313 Write_rows 1 347 table_id: 25 flags: STMT_END_F -master-bin.000001 347 Table_map 1 386 table_id: 25 (test.t1) -master-bin.000001 386 Write_rows 1 420 table_id: 25 flags: STMT_END_F -master-bin.000001 420 Table_map 1 459 table_id: 25 (test.t1) -master-bin.000001 459 Write_rows 1 493 table_id: 25 flags: STMT_END_F -master-bin.000001 493 Table_map 1 532 table_id: 25 (test.t1) -master-bin.000001 532 Write_rows 1 566 table_id: 25 flags: STMT_END_F -master-bin.000001 566 Table_map 1 605 table_id: 25 (test.t1) -master-bin.000001 605 Write_rows 1 639 table_id: 25 flags: STMT_END_F -master-bin.000001 639 Table_map 1 678 table_id: 25 (test.t1) -master-bin.000001 678 Write_rows 1 712 table_id: 25 flags: STMT_END_F -master-bin.000001 712 Table_map 1 751 table_id: 25 (test.t1) -master-bin.000001 751 Write_rows 1 785 table_id: 25 flags: STMT_END_F -master-bin.000001 785 Table_map 1 824 table_id: 25 (test.t1) -master-bin.000001 824 Write_rows 1 858 table_id: 25 flags: STMT_END_F -master-bin.000001 858 Table_map 1 897 table_id: 25 (test.t1) -master-bin.000001 897 Write_rows 1 931 table_id: 25 flags: STMT_END_F -master-bin.000001 931 Table_map 1 970 table_id: 25 (test.t1) -master-bin.000001 970 Write_rows 1 1004 table_id: 25 flags: STMT_END_F -master-bin.000001 1004 Table_map 1 1043 table_id: 25 (test.t1) -master-bin.000001 1043 Write_rows 1 1077 table_id: 25 flags: STMT_END_F -master-bin.000001 1077 Table_map 1 1116 table_id: 25 (test.t1) -master-bin.000001 1116 Write_rows 1 1150 table_id: 25 flags: STMT_END_F -master-bin.000001 1150 Table_map 1 1189 table_id: 25 (test.t1) -master-bin.000001 1189 Write_rows 1 1223 table_id: 25 flags: STMT_END_F -master-bin.000001 1223 Table_map 1 1262 table_id: 25 (test.t1) -master-bin.000001 1262 Write_rows 1 1296 table_id: 25 flags: STMT_END_F -master-bin.000001 1296 Table_map 1 1335 table_id: 25 (test.t1) -master-bin.000001 1335 Write_rows 1 1369 table_id: 25 flags: STMT_END_F -master-bin.000001 1369 Table_map 1 1408 table_id: 25 (test.t1) -master-bin.000001 1408 Write_rows 1 1442 table_id: 25 flags: STMT_END_F -master-bin.000001 1442 Table_map 1 1481 table_id: 25 (test.t1) -master-bin.000001 1481 Write_rows 1 1515 table_id: 25 flags: STMT_END_F -master-bin.000001 1515 Table_map 1 1554 table_id: 25 (test.t1) -master-bin.000001 1554 Write_rows 1 1588 table_id: 25 flags: STMT_END_F -master-bin.000001 1588 Table_map 1 1627 table_id: 25 (test.t1) -master-bin.000001 1627 Write_rows 1 1661 table_id: 25 flags: STMT_END_F -master-bin.000001 1661 Table_map 1 1700 table_id: 25 (test.t1) -master-bin.000001 1700 Write_rows 1 1734 table_id: 25 flags: STMT_END_F -master-bin.000001 1734 Table_map 1 1773 table_id: 25 (test.t1) -master-bin.000001 1773 Write_rows 1 1807 table_id: 25 flags: STMT_END_F -master-bin.000001 1807 Table_map 1 1846 table_id: 25 (test.t1) -master-bin.000001 1846 Write_rows 1 1880 table_id: 25 flags: STMT_END_F -master-bin.000001 1880 Table_map 1 1919 table_id: 25 (test.t1) -master-bin.000001 1919 Write_rows 1 1953 table_id: 25 flags: STMT_END_F -master-bin.000001 1953 Table_map 1 1992 table_id: 25 (test.t1) -master-bin.000001 1992 Write_rows 1 2026 table_id: 25 flags: STMT_END_F -master-bin.000001 2026 Table_map 1 2065 table_id: 25 (test.t1) -master-bin.000001 2065 Write_rows 1 2099 table_id: 25 flags: STMT_END_F -master-bin.000001 2099 Table_map 1 2138 table_id: 25 (test.t1) -master-bin.000001 2138 Write_rows 1 2172 table_id: 25 flags: STMT_END_F -master-bin.000001 2172 Table_map 1 2211 table_id: 25 (test.t1) -master-bin.000001 2211 Write_rows 1 2245 table_id: 25 flags: STMT_END_F -master-bin.000001 2245 Table_map 1 2284 table_id: 25 (test.t1) -master-bin.000001 2284 Write_rows 1 2318 table_id: 25 flags: STMT_END_F -master-bin.000001 2318 Table_map 1 2357 table_id: 25 (test.t1) -master-bin.000001 2357 Write_rows 1 2391 table_id: 25 flags: STMT_END_F -master-bin.000001 2391 Table_map 1 2430 table_id: 25 (test.t1) -master-bin.000001 2430 Write_rows 1 2464 table_id: 25 flags: STMT_END_F -master-bin.000001 2464 Table_map 1 2503 table_id: 25 (test.t1) -master-bin.000001 2503 Write_rows 1 2537 table_id: 25 flags: STMT_END_F -master-bin.000001 2537 Table_map 1 2576 table_id: 25 (test.t1) -master-bin.000001 2576 Write_rows 1 2610 table_id: 25 flags: STMT_END_F -master-bin.000001 2610 Table_map 1 2649 table_id: 25 (test.t1) -master-bin.000001 2649 Write_rows 1 2683 table_id: 25 flags: STMT_END_F -master-bin.000001 2683 Table_map 1 2722 table_id: 25 (test.t1) -master-bin.000001 2722 Write_rows 1 2756 table_id: 25 flags: STMT_END_F -master-bin.000001 2756 Table_map 1 2795 table_id: 25 (test.t1) -master-bin.000001 2795 Write_rows 1 2829 table_id: 25 flags: STMT_END_F -master-bin.000001 2829 Table_map 1 2868 table_id: 25 (test.t1) -master-bin.000001 2868 Write_rows 1 2902 table_id: 25 flags: STMT_END_F -master-bin.000001 2902 Table_map 1 2941 table_id: 25 (test.t1) -master-bin.000001 2941 Write_rows 1 2975 table_id: 25 flags: STMT_END_F -master-bin.000001 2975 Table_map 1 3014 table_id: 25 (test.t1) -master-bin.000001 3014 Write_rows 1 3048 table_id: 25 flags: STMT_END_F -master-bin.000001 3048 Table_map 1 3087 table_id: 25 (test.t1) -master-bin.000001 3087 Write_rows 1 3121 table_id: 25 flags: STMT_END_F -master-bin.000001 3121 Table_map 1 3160 table_id: 25 (test.t1) -master-bin.000001 3160 Write_rows 1 3194 table_id: 25 flags: STMT_END_F -master-bin.000001 3194 Table_map 1 3233 table_id: 25 (test.t1) -master-bin.000001 3233 Write_rows 1 3267 table_id: 25 flags: STMT_END_F -master-bin.000001 3267 Table_map 1 3306 table_id: 25 (test.t1) -master-bin.000001 3306 Write_rows 1 3340 table_id: 25 flags: STMT_END_F -master-bin.000001 3340 Table_map 1 3379 table_id: 25 (test.t1) -master-bin.000001 3379 Write_rows 1 3413 table_id: 25 flags: STMT_END_F -master-bin.000001 3413 Table_map 1 3452 table_id: 25 (test.t1) -master-bin.000001 3452 Write_rows 1 3486 table_id: 25 flags: STMT_END_F -master-bin.000001 3486 Table_map 1 3525 table_id: 25 (test.t1) -master-bin.000001 3525 Write_rows 1 3559 table_id: 25 flags: STMT_END_F -master-bin.000001 3559 Table_map 1 3598 table_id: 25 (test.t1) -master-bin.000001 3598 Write_rows 1 3632 table_id: 25 flags: STMT_END_F -master-bin.000001 3632 Table_map 1 3671 table_id: 25 (test.t1) -master-bin.000001 3671 Write_rows 1 3705 table_id: 25 flags: STMT_END_F -master-bin.000001 3705 Table_map 1 3744 table_id: 25 (test.t1) -master-bin.000001 3744 Write_rows 1 3778 table_id: 25 flags: STMT_END_F -master-bin.000001 3778 Table_map 1 3817 table_id: 25 (test.t1) -master-bin.000001 3817 Write_rows 1 3851 table_id: 25 flags: STMT_END_F -master-bin.000001 3851 Table_map 1 3890 table_id: 25 (test.t1) -master-bin.000001 3890 Write_rows 1 3924 table_id: 25 flags: STMT_END_F -master-bin.000001 3924 Table_map 1 3963 table_id: 25 (test.t1) -master-bin.000001 3963 Write_rows 1 3997 table_id: 25 flags: STMT_END_F -master-bin.000001 3997 Table_map 1 4036 table_id: 25 (test.t1) -master-bin.000001 4036 Write_rows 1 4070 table_id: 25 flags: STMT_END_F -master-bin.000001 4070 Table_map 1 4109 table_id: 25 (test.t1) -master-bin.000001 4109 Write_rows 1 4143 table_id: 25 flags: STMT_END_F -master-bin.000001 4143 Table_map 1 4182 table_id: 25 (test.t1) -master-bin.000001 4182 Write_rows 1 4216 table_id: 25 flags: STMT_END_F -master-bin.000001 4216 Table_map 1 4255 table_id: 25 (test.t1) -master-bin.000001 4255 Write_rows 1 4289 table_id: 25 flags: STMT_END_F -master-bin.000001 4289 Table_map 1 4328 table_id: 25 (test.t1) -master-bin.000001 4328 Write_rows 1 4362 table_id: 25 flags: STMT_END_F -master-bin.000001 4362 Table_map 1 4401 table_id: 25 (test.t1) -master-bin.000001 4401 Write_rows 1 4435 table_id: 25 flags: STMT_END_F -master-bin.000001 4435 Table_map 1 4474 table_id: 25 (test.t1) -master-bin.000001 4474 Write_rows 1 4508 table_id: 25 flags: STMT_END_F -master-bin.000001 4508 Table_map 1 4547 table_id: 25 (test.t1) -master-bin.000001 4547 Write_rows 1 4581 table_id: 25 flags: STMT_END_F -master-bin.000001 4581 Table_map 1 4620 table_id: 25 (test.t1) -master-bin.000001 4620 Write_rows 1 4654 table_id: 25 flags: STMT_END_F -master-bin.000001 4654 Table_map 1 4693 table_id: 25 (test.t1) -master-bin.000001 4693 Write_rows 1 4727 table_id: 25 flags: STMT_END_F -master-bin.000001 4727 Table_map 1 4766 table_id: 25 (test.t1) -master-bin.000001 4766 Write_rows 1 4800 table_id: 25 flags: STMT_END_F -master-bin.000001 4800 Table_map 1 4839 table_id: 25 (test.t1) -master-bin.000001 4839 Write_rows 1 4873 table_id: 25 flags: STMT_END_F -master-bin.000001 4873 Table_map 1 4912 table_id: 25 (test.t1) -master-bin.000001 4912 Write_rows 1 4946 table_id: 25 flags: STMT_END_F -master-bin.000001 4946 Table_map 1 4985 table_id: 25 (test.t1) -master-bin.000001 4985 Write_rows 1 5019 table_id: 25 flags: STMT_END_F -master-bin.000001 5019 Table_map 1 5058 table_id: 25 (test.t1) -master-bin.000001 5058 Write_rows 1 5092 table_id: 25 flags: STMT_END_F -master-bin.000001 5092 Table_map 1 5131 table_id: 25 (test.t1) -master-bin.000001 5131 Write_rows 1 5165 table_id: 25 flags: STMT_END_F -master-bin.000001 5165 Table_map 1 5204 table_id: 25 (test.t1) -master-bin.000001 5204 Write_rows 1 5238 table_id: 25 flags: STMT_END_F -master-bin.000001 5238 Table_map 1 5277 table_id: 25 (test.t1) -master-bin.000001 5277 Write_rows 1 5311 table_id: 25 flags: STMT_END_F -master-bin.000001 5311 Table_map 1 5350 table_id: 25 (test.t1) -master-bin.000001 5350 Write_rows 1 5384 table_id: 25 flags: STMT_END_F -master-bin.000001 5384 Table_map 1 5423 table_id: 25 (test.t1) -master-bin.000001 5423 Write_rows 1 5457 table_id: 25 flags: STMT_END_F -master-bin.000001 5457 Table_map 1 5496 table_id: 25 (test.t1) -master-bin.000001 5496 Write_rows 1 5530 table_id: 25 flags: STMT_END_F -master-bin.000001 5530 Table_map 1 5569 table_id: 25 (test.t1) -master-bin.000001 5569 Write_rows 1 5603 table_id: 25 flags: STMT_END_F -master-bin.000001 5603 Table_map 1 5642 table_id: 25 (test.t1) -master-bin.000001 5642 Write_rows 1 5676 table_id: 25 flags: STMT_END_F -master-bin.000001 5676 Table_map 1 5715 table_id: 25 (test.t1) -master-bin.000001 5715 Write_rows 1 5749 table_id: 25 flags: STMT_END_F -master-bin.000001 5749 Table_map 1 5788 table_id: 25 (test.t1) -master-bin.000001 5788 Write_rows 1 5822 table_id: 25 flags: STMT_END_F -master-bin.000001 5822 Table_map 1 5861 table_id: 25 (test.t1) -master-bin.000001 5861 Write_rows 1 5895 table_id: 25 flags: STMT_END_F -master-bin.000001 5895 Table_map 1 5934 table_id: 25 (test.t1) -master-bin.000001 5934 Write_rows 1 5968 table_id: 25 flags: STMT_END_F -master-bin.000001 5968 Table_map 1 6007 table_id: 25 (test.t1) -master-bin.000001 6007 Write_rows 1 6041 table_id: 25 flags: STMT_END_F -master-bin.000001 6041 Table_map 1 6080 table_id: 25 (test.t1) -master-bin.000001 6080 Write_rows 1 6114 table_id: 25 flags: STMT_END_F -master-bin.000001 6114 Table_map 1 6153 table_id: 25 (test.t1) -master-bin.000001 6153 Write_rows 1 6187 table_id: 25 flags: STMT_END_F -master-bin.000001 6187 Table_map 1 6226 table_id: 25 (test.t1) -master-bin.000001 6226 Write_rows 1 6260 table_id: 25 flags: STMT_END_F -master-bin.000001 6260 Table_map 1 6299 table_id: 25 (test.t1) -master-bin.000001 6299 Write_rows 1 6333 table_id: 25 flags: STMT_END_F -master-bin.000001 6333 Table_map 1 6372 table_id: 25 (test.t1) -master-bin.000001 6372 Write_rows 1 6406 table_id: 25 flags: STMT_END_F -master-bin.000001 6406 Table_map 1 6445 table_id: 25 (test.t1) -master-bin.000001 6445 Write_rows 1 6479 table_id: 25 flags: STMT_END_F -master-bin.000001 6479 Table_map 1 6518 table_id: 25 (test.t1) -master-bin.000001 6518 Write_rows 1 6552 table_id: 25 flags: STMT_END_F -master-bin.000001 6552 Table_map 1 6591 table_id: 25 (test.t1) -master-bin.000001 6591 Write_rows 1 6625 table_id: 25 flags: STMT_END_F -master-bin.000001 6625 Table_map 1 6664 table_id: 25 (test.t1) -master-bin.000001 6664 Write_rows 1 6698 table_id: 25 flags: STMT_END_F -master-bin.000001 6698 Table_map 1 6737 table_id: 25 (test.t1) -master-bin.000001 6737 Write_rows 1 6771 table_id: 25 flags: STMT_END_F -master-bin.000001 6771 Table_map 1 6810 table_id: 25 (test.t1) -master-bin.000001 6810 Write_rows 1 6844 table_id: 25 flags: STMT_END_F -master-bin.000001 6844 Table_map 1 6883 table_id: 25 (test.t1) -master-bin.000001 6883 Write_rows 1 6917 table_id: 25 flags: STMT_END_F -master-bin.000001 6917 Table_map 1 6956 table_id: 25 (test.t1) -master-bin.000001 6956 Write_rows 1 6990 table_id: 25 flags: STMT_END_F -master-bin.000001 6990 Table_map 1 7029 table_id: 25 (test.t1) -master-bin.000001 7029 Write_rows 1 7063 table_id: 25 flags: STMT_END_F -master-bin.000001 7063 Table_map 1 7102 table_id: 25 (test.t1) -master-bin.000001 7102 Write_rows 1 7136 table_id: 25 flags: STMT_END_F -master-bin.000001 7136 Table_map 1 7175 table_id: 25 (test.t1) -master-bin.000001 7175 Write_rows 1 7209 table_id: 25 flags: STMT_END_F -master-bin.000001 7209 Table_map 1 7248 table_id: 25 (test.t1) -master-bin.000001 7248 Write_rows 1 7282 table_id: 25 flags: STMT_END_F -master-bin.000001 7282 Table_map 1 7321 table_id: 25 (test.t1) -master-bin.000001 7321 Write_rows 1 7355 table_id: 25 flags: STMT_END_F -master-bin.000001 7355 Table_map 1 7394 table_id: 25 (test.t1) -master-bin.000001 7394 Write_rows 1 7428 table_id: 25 flags: STMT_END_F -master-bin.000001 7428 Table_map 1 7467 table_id: 25 (test.t1) -master-bin.000001 7467 Write_rows 1 7501 table_id: 25 flags: STMT_END_F -master-bin.000001 7501 Table_map 1 7540 table_id: 25 (test.t1) -master-bin.000001 7540 Write_rows 1 7574 table_id: 25 flags: STMT_END_F -master-bin.000001 7574 Table_map 1 7613 table_id: 25 (test.t1) -master-bin.000001 7613 Write_rows 1 7647 table_id: 25 flags: STMT_END_F -master-bin.000001 7647 Table_map 1 7686 table_id: 25 (test.t1) -master-bin.000001 7686 Write_rows 1 7720 table_id: 25 flags: STMT_END_F -master-bin.000001 7720 Table_map 1 7759 table_id: 25 (test.t1) -master-bin.000001 7759 Write_rows 1 7793 table_id: 25 flags: STMT_END_F -master-bin.000001 7793 Table_map 1 7832 table_id: 25 (test.t1) -master-bin.000001 7832 Write_rows 1 7866 table_id: 25 flags: STMT_END_F -master-bin.000001 7866 Table_map 1 7905 table_id: 25 (test.t1) -master-bin.000001 7905 Write_rows 1 7939 table_id: 25 flags: STMT_END_F -master-bin.000001 7939 Table_map 1 7978 table_id: 25 (test.t1) -master-bin.000001 7978 Write_rows 1 8012 table_id: 25 flags: STMT_END_F -master-bin.000001 8012 Table_map 1 8051 table_id: 25 (test.t1) -master-bin.000001 8051 Write_rows 1 8085 table_id: 25 flags: STMT_END_F -master-bin.000001 8085 Table_map 1 8124 table_id: 25 (test.t1) -master-bin.000001 8124 Write_rows 1 8158 table_id: 25 flags: STMT_END_F -master-bin.000001 8158 Table_map 1 8197 table_id: 25 (test.t1) -master-bin.000001 8197 Write_rows 1 8231 table_id: 25 flags: STMT_END_F -master-bin.000001 8231 Table_map 1 8270 table_id: 25 (test.t1) -master-bin.000001 8270 Write_rows 1 8304 table_id: 25 flags: STMT_END_F -master-bin.000001 8304 Table_map 1 8343 table_id: 25 (test.t1) -master-bin.000001 8343 Write_rows 1 8377 table_id: 25 flags: STMT_END_F -master-bin.000001 8377 Table_map 1 8416 table_id: 25 (test.t1) -master-bin.000001 8416 Write_rows 1 8450 table_id: 25 flags: STMT_END_F -master-bin.000001 8450 Table_map 1 8489 table_id: 25 (test.t1) -master-bin.000001 8489 Write_rows 1 8523 table_id: 25 flags: STMT_END_F -master-bin.000001 8523 Table_map 1 8562 table_id: 25 (test.t1) -master-bin.000001 8562 Write_rows 1 8596 table_id: 25 flags: STMT_END_F -master-bin.000001 8596 Table_map 1 8635 table_id: 25 (test.t1) -master-bin.000001 8635 Write_rows 1 8669 table_id: 25 flags: STMT_END_F -master-bin.000001 8669 Table_map 1 8708 table_id: 25 (test.t1) -master-bin.000001 8708 Write_rows 1 8742 table_id: 25 flags: STMT_END_F -master-bin.000001 8742 Table_map 1 8781 table_id: 25 (test.t1) -master-bin.000001 8781 Write_rows 1 8815 table_id: 25 flags: STMT_END_F -master-bin.000001 8815 Table_map 1 8854 table_id: 25 (test.t1) -master-bin.000001 8854 Write_rows 1 8888 table_id: 25 flags: STMT_END_F -master-bin.000001 8888 Table_map 1 8927 table_id: 25 (test.t1) -master-bin.000001 8927 Write_rows 1 8961 table_id: 25 flags: STMT_END_F -master-bin.000001 8961 Table_map 1 9000 table_id: 25 (test.t1) -master-bin.000001 9000 Write_rows 1 9034 table_id: 25 flags: STMT_END_F -master-bin.000001 9034 Table_map 1 9073 table_id: 25 (test.t1) -master-bin.000001 9073 Write_rows 1 9107 table_id: 25 flags: STMT_END_F -master-bin.000001 9107 Table_map 1 9146 table_id: 25 (test.t1) -master-bin.000001 9146 Write_rows 1 9180 table_id: 25 flags: STMT_END_F -master-bin.000001 9180 Table_map 1 9219 table_id: 25 (test.t1) -master-bin.000001 9219 Write_rows 1 9253 table_id: 25 flags: STMT_END_F -master-bin.000001 9253 Table_map 1 9292 table_id: 25 (test.t1) -master-bin.000001 9292 Write_rows 1 9326 table_id: 25 flags: STMT_END_F -master-bin.000001 9326 Table_map 1 9365 table_id: 25 (test.t1) -master-bin.000001 9365 Write_rows 1 9399 table_id: 25 flags: STMT_END_F -master-bin.000001 9399 Table_map 1 9438 table_id: 25 (test.t1) -master-bin.000001 9438 Write_rows 1 9472 table_id: 25 flags: STMT_END_F -master-bin.000001 9472 Table_map 1 9511 table_id: 25 (test.t1) -master-bin.000001 9511 Write_rows 1 9545 table_id: 25 flags: STMT_END_F -master-bin.000001 9545 Table_map 1 9584 table_id: 25 (test.t1) -master-bin.000001 9584 Write_rows 1 9618 table_id: 25 flags: STMT_END_F -master-bin.000001 9618 Table_map 1 9657 table_id: 25 (test.t1) -master-bin.000001 9657 Write_rows 1 9691 table_id: 25 flags: STMT_END_F -master-bin.000001 9691 Table_map 1 9730 table_id: 25 (test.t1) -master-bin.000001 9730 Write_rows 1 9764 table_id: 25 flags: STMT_END_F -master-bin.000001 9764 Table_map 1 9803 table_id: 25 (test.t1) -master-bin.000001 9803 Write_rows 1 9837 table_id: 25 flags: STMT_END_F -master-bin.000001 9837 Table_map 1 9876 table_id: 25 (test.t1) -master-bin.000001 9876 Write_rows 1 9910 table_id: 25 flags: STMT_END_F -master-bin.000001 9910 Table_map 1 9949 table_id: 25 (test.t1) -master-bin.000001 9949 Write_rows 1 9983 table_id: 25 flags: STMT_END_F -master-bin.000001 9983 Table_map 1 10022 table_id: 25 (test.t1) -master-bin.000001 10022 Write_rows 1 10056 table_id: 25 flags: STMT_END_F -master-bin.000001 10056 Table_map 1 10095 table_id: 25 (test.t1) -master-bin.000001 10095 Write_rows 1 10129 table_id: 25 flags: STMT_END_F -master-bin.000001 10129 Table_map 1 10168 table_id: 25 (test.t1) -master-bin.000001 10168 Write_rows 1 10202 table_id: 25 flags: STMT_END_F -master-bin.000001 10202 Table_map 1 10241 table_id: 25 (test.t1) -master-bin.000001 10241 Write_rows 1 10275 table_id: 25 flags: STMT_END_F -master-bin.000001 10275 Table_map 1 10314 table_id: 25 (test.t1) -master-bin.000001 10314 Write_rows 1 10348 table_id: 25 flags: STMT_END_F -master-bin.000001 10348 Table_map 1 10387 table_id: 25 (test.t1) -master-bin.000001 10387 Write_rows 1 10421 table_id: 25 flags: STMT_END_F -master-bin.000001 10421 Table_map 1 10460 table_id: 25 (test.t1) -master-bin.000001 10460 Write_rows 1 10494 table_id: 25 flags: STMT_END_F -master-bin.000001 10494 Table_map 1 10533 table_id: 25 (test.t1) -master-bin.000001 10533 Write_rows 1 10567 table_id: 25 flags: STMT_END_F -master-bin.000001 10567 Table_map 1 10606 table_id: 25 (test.t1) -master-bin.000001 10606 Write_rows 1 10640 table_id: 25 flags: STMT_END_F -master-bin.000001 10640 Table_map 1 10679 table_id: 25 (test.t1) -master-bin.000001 10679 Write_rows 1 10713 table_id: 25 flags: STMT_END_F -master-bin.000001 10713 Table_map 1 10752 table_id: 25 (test.t1) -master-bin.000001 10752 Write_rows 1 10786 table_id: 25 flags: STMT_END_F -master-bin.000001 10786 Table_map 1 10825 table_id: 25 (test.t1) -master-bin.000001 10825 Write_rows 1 10859 table_id: 25 flags: STMT_END_F -master-bin.000001 10859 Table_map 1 10898 table_id: 25 (test.t1) -master-bin.000001 10898 Write_rows 1 10932 table_id: 25 flags: STMT_END_F -master-bin.000001 10932 Table_map 1 10971 table_id: 25 (test.t1) -master-bin.000001 10971 Write_rows 1 11005 table_id: 25 flags: STMT_END_F -master-bin.000001 11005 Table_map 1 11044 table_id: 25 (test.t1) -master-bin.000001 11044 Write_rows 1 11078 table_id: 25 flags: STMT_END_F -master-bin.000001 11078 Table_map 1 11117 table_id: 25 (test.t1) -master-bin.000001 11117 Write_rows 1 11151 table_id: 25 flags: STMT_END_F -master-bin.000001 11151 Table_map 1 11190 table_id: 25 (test.t1) -master-bin.000001 11190 Write_rows 1 11224 table_id: 25 flags: STMT_END_F -master-bin.000001 11224 Table_map 1 11263 table_id: 25 (test.t1) -master-bin.000001 11263 Write_rows 1 11297 table_id: 25 flags: STMT_END_F -master-bin.000001 11297 Table_map 1 11336 table_id: 25 (test.t1) -master-bin.000001 11336 Write_rows 1 11370 table_id: 25 flags: STMT_END_F -master-bin.000001 11370 Table_map 1 11409 table_id: 25 (test.t1) -master-bin.000001 11409 Write_rows 1 11443 table_id: 25 flags: STMT_END_F -master-bin.000001 11443 Table_map 1 11482 table_id: 25 (test.t1) -master-bin.000001 11482 Write_rows 1 11516 table_id: 25 flags: STMT_END_F -master-bin.000001 11516 Table_map 1 11555 table_id: 25 (test.t1) -master-bin.000001 11555 Write_rows 1 11589 table_id: 25 flags: STMT_END_F -master-bin.000001 11589 Table_map 1 11628 table_id: 25 (test.t1) -master-bin.000001 11628 Write_rows 1 11662 table_id: 25 flags: STMT_END_F -master-bin.000001 11662 Table_map 1 11701 table_id: 25 (test.t1) -master-bin.000001 11701 Write_rows 1 11735 table_id: 25 flags: STMT_END_F -master-bin.000001 11735 Table_map 1 11774 table_id: 25 (test.t1) -master-bin.000001 11774 Write_rows 1 11808 table_id: 25 flags: STMT_END_F -master-bin.000001 11808 Table_map 1 11847 table_id: 25 (test.t1) -master-bin.000001 11847 Write_rows 1 11881 table_id: 25 flags: STMT_END_F -master-bin.000001 11881 Table_map 1 11920 table_id: 25 (test.t1) -master-bin.000001 11920 Write_rows 1 11954 table_id: 25 flags: STMT_END_F -master-bin.000001 11954 Table_map 1 11993 table_id: 25 (test.t1) -master-bin.000001 11993 Write_rows 1 12027 table_id: 25 flags: STMT_END_F -master-bin.000001 12027 Table_map 1 12066 table_id: 25 (test.t1) -master-bin.000001 12066 Write_rows 1 12100 table_id: 25 flags: STMT_END_F -master-bin.000001 12100 Table_map 1 12139 table_id: 25 (test.t1) -master-bin.000001 12139 Write_rows 1 12173 table_id: 25 flags: STMT_END_F -master-bin.000001 12173 Table_map 1 12212 table_id: 25 (test.t1) -master-bin.000001 12212 Write_rows 1 12246 table_id: 25 flags: STMT_END_F -master-bin.000001 12246 Table_map 1 12285 table_id: 25 (test.t1) -master-bin.000001 12285 Write_rows 1 12319 table_id: 25 flags: STMT_END_F -master-bin.000001 12319 Table_map 1 12358 table_id: 25 (test.t1) -master-bin.000001 12358 Write_rows 1 12392 table_id: 25 flags: STMT_END_F -master-bin.000001 12392 Table_map 1 12431 table_id: 25 (test.t1) -master-bin.000001 12431 Write_rows 1 12465 table_id: 25 flags: STMT_END_F -master-bin.000001 12465 Table_map 1 12504 table_id: 25 (test.t1) -master-bin.000001 12504 Write_rows 1 12538 table_id: 25 flags: STMT_END_F -master-bin.000001 12538 Table_map 1 12577 table_id: 25 (test.t1) -master-bin.000001 12577 Write_rows 1 12611 table_id: 25 flags: STMT_END_F -master-bin.000001 12611 Table_map 1 12650 table_id: 25 (test.t1) -master-bin.000001 12650 Write_rows 1 12684 table_id: 25 flags: STMT_END_F -master-bin.000001 12684 Table_map 1 12723 table_id: 25 (test.t1) -master-bin.000001 12723 Write_rows 1 12757 table_id: 25 flags: STMT_END_F -master-bin.000001 12757 Table_map 1 12796 table_id: 25 (test.t1) -master-bin.000001 12796 Write_rows 1 12830 table_id: 25 flags: STMT_END_F -master-bin.000001 12830 Table_map 1 12869 table_id: 25 (test.t1) -master-bin.000001 12869 Write_rows 1 12903 table_id: 25 flags: STMT_END_F -master-bin.000001 12903 Table_map 1 12942 table_id: 25 (test.t1) -master-bin.000001 12942 Write_rows 1 12976 table_id: 25 flags: STMT_END_F -master-bin.000001 12976 Table_map 1 13015 table_id: 25 (test.t1) -master-bin.000001 13015 Write_rows 1 13049 table_id: 25 flags: STMT_END_F -master-bin.000001 13049 Table_map 1 13088 table_id: 25 (test.t1) -master-bin.000001 13088 Write_rows 1 13122 table_id: 25 flags: STMT_END_F -master-bin.000001 13122 Table_map 1 13161 table_id: 25 (test.t1) -master-bin.000001 13161 Write_rows 1 13195 table_id: 25 flags: STMT_END_F -master-bin.000001 13195 Table_map 1 13234 table_id: 25 (test.t1) -master-bin.000001 13234 Write_rows 1 13268 table_id: 25 flags: STMT_END_F -master-bin.000001 13268 Table_map 1 13307 table_id: 25 (test.t1) -master-bin.000001 13307 Write_rows 1 13341 table_id: 25 flags: STMT_END_F -master-bin.000001 13341 Table_map 1 13380 table_id: 25 (test.t1) -master-bin.000001 13380 Write_rows 1 13414 table_id: 25 flags: STMT_END_F -master-bin.000001 13414 Table_map 1 13453 table_id: 25 (test.t1) -master-bin.000001 13453 Write_rows 1 13487 table_id: 25 flags: STMT_END_F -master-bin.000001 13487 Table_map 1 13526 table_id: 25 (test.t1) -master-bin.000001 13526 Write_rows 1 13560 table_id: 25 flags: STMT_END_F -master-bin.000001 13560 Table_map 1 13599 table_id: 25 (test.t1) -master-bin.000001 13599 Write_rows 1 13633 table_id: 25 flags: STMT_END_F -master-bin.000001 13633 Table_map 1 13672 table_id: 25 (test.t1) -master-bin.000001 13672 Write_rows 1 13706 table_id: 25 flags: STMT_END_F -master-bin.000001 13706 Table_map 1 13745 table_id: 25 (test.t1) -master-bin.000001 13745 Write_rows 1 13779 table_id: 25 flags: STMT_END_F -master-bin.000001 13779 Table_map 1 13818 table_id: 25 (test.t1) -master-bin.000001 13818 Write_rows 1 13852 table_id: 25 flags: STMT_END_F -master-bin.000001 13852 Table_map 1 13891 table_id: 25 (test.t1) -master-bin.000001 13891 Write_rows 1 13925 table_id: 25 flags: STMT_END_F -master-bin.000001 13925 Table_map 1 13964 table_id: 25 (test.t1) -master-bin.000001 13964 Write_rows 1 13998 table_id: 25 flags: STMT_END_F -master-bin.000001 13998 Table_map 1 14037 table_id: 25 (test.t1) -master-bin.000001 14037 Write_rows 1 14071 table_id: 25 flags: STMT_END_F -master-bin.000001 14071 Table_map 1 14110 table_id: 25 (test.t1) -master-bin.000001 14110 Write_rows 1 14144 table_id: 25 flags: STMT_END_F -master-bin.000001 14144 Table_map 1 14183 table_id: 25 (test.t1) -master-bin.000001 14183 Write_rows 1 14217 table_id: 25 flags: STMT_END_F -master-bin.000001 14217 Table_map 1 14256 table_id: 25 (test.t1) -master-bin.000001 14256 Write_rows 1 14290 table_id: 25 flags: STMT_END_F -master-bin.000001 14290 Table_map 1 14329 table_id: 25 (test.t1) -master-bin.000001 14329 Write_rows 1 14363 table_id: 25 flags: STMT_END_F -master-bin.000001 14363 Table_map 1 14402 table_id: 25 (test.t1) -master-bin.000001 14402 Write_rows 1 14436 table_id: 25 flags: STMT_END_F -master-bin.000001 14436 Table_map 1 14475 table_id: 25 (test.t1) -master-bin.000001 14475 Write_rows 1 14509 table_id: 25 flags: STMT_END_F -master-bin.000001 14509 Table_map 1 14548 table_id: 25 (test.t1) -master-bin.000001 14548 Write_rows 1 14582 table_id: 25 flags: STMT_END_F -master-bin.000001 14582 Table_map 1 14621 table_id: 25 (test.t1) -master-bin.000001 14621 Write_rows 1 14655 table_id: 25 flags: STMT_END_F -master-bin.000001 14655 Table_map 1 14694 table_id: 25 (test.t1) -master-bin.000001 14694 Write_rows 1 14728 table_id: 25 flags: STMT_END_F -master-bin.000001 14728 Table_map 1 14767 table_id: 25 (test.t1) -master-bin.000001 14767 Write_rows 1 14801 table_id: 25 flags: STMT_END_F -master-bin.000001 14801 Table_map 1 14840 table_id: 25 (test.t1) -master-bin.000001 14840 Write_rows 1 14874 table_id: 25 flags: STMT_END_F -master-bin.000001 14874 Table_map 1 14913 table_id: 25 (test.t1) -master-bin.000001 14913 Write_rows 1 14947 table_id: 25 flags: STMT_END_F -master-bin.000001 14947 Table_map 1 14986 table_id: 25 (test.t1) -master-bin.000001 14986 Write_rows 1 15020 table_id: 25 flags: STMT_END_F -master-bin.000001 15020 Table_map 1 15059 table_id: 25 (test.t1) -master-bin.000001 15059 Write_rows 1 15093 table_id: 25 flags: STMT_END_F -master-bin.000001 15093 Table_map 1 15132 table_id: 25 (test.t1) -master-bin.000001 15132 Write_rows 1 15166 table_id: 25 flags: STMT_END_F -master-bin.000001 15166 Table_map 1 15205 table_id: 25 (test.t1) -master-bin.000001 15205 Write_rows 1 15239 table_id: 25 flags: STMT_END_F -master-bin.000001 15239 Table_map 1 15278 table_id: 25 (test.t1) -master-bin.000001 15278 Write_rows 1 15312 table_id: 25 flags: STMT_END_F -master-bin.000001 15312 Table_map 1 15351 table_id: 25 (test.t1) -master-bin.000001 15351 Write_rows 1 15385 table_id: 25 flags: STMT_END_F -master-bin.000001 15385 Table_map 1 15424 table_id: 25 (test.t1) -master-bin.000001 15424 Write_rows 1 15458 table_id: 25 flags: STMT_END_F -master-bin.000001 15458 Table_map 1 15497 table_id: 25 (test.t1) -master-bin.000001 15497 Write_rows 1 15531 table_id: 25 flags: STMT_END_F -master-bin.000001 15531 Table_map 1 15570 table_id: 25 (test.t1) -master-bin.000001 15570 Write_rows 1 15604 table_id: 25 flags: STMT_END_F -master-bin.000001 15604 Table_map 1 15643 table_id: 25 (test.t1) -master-bin.000001 15643 Write_rows 1 15677 table_id: 25 flags: STMT_END_F -master-bin.000001 15677 Table_map 1 15716 table_id: 25 (test.t1) -master-bin.000001 15716 Write_rows 1 15750 table_id: 25 flags: STMT_END_F -master-bin.000001 15750 Table_map 1 15789 table_id: 25 (test.t1) -master-bin.000001 15789 Write_rows 1 15823 table_id: 25 flags: STMT_END_F -master-bin.000001 15823 Table_map 1 15862 table_id: 25 (test.t1) -master-bin.000001 15862 Write_rows 1 15896 table_id: 25 flags: STMT_END_F -master-bin.000001 15896 Table_map 1 15935 table_id: 25 (test.t1) -master-bin.000001 15935 Write_rows 1 15969 table_id: 25 flags: STMT_END_F -master-bin.000001 15969 Table_map 1 16008 table_id: 25 (test.t1) -master-bin.000001 16008 Write_rows 1 16042 table_id: 25 flags: STMT_END_F -master-bin.000001 16042 Table_map 1 16081 table_id: 25 (test.t1) -master-bin.000001 16081 Write_rows 1 16115 table_id: 25 flags: STMT_END_F -master-bin.000001 16115 Table_map 1 16154 table_id: 25 (test.t1) -master-bin.000001 16154 Write_rows 1 16188 table_id: 25 flags: STMT_END_F -master-bin.000001 16188 Table_map 1 16227 table_id: 25 (test.t1) -master-bin.000001 16227 Write_rows 1 16261 table_id: 25 flags: STMT_END_F -master-bin.000001 16261 Table_map 1 16300 table_id: 25 (test.t1) -master-bin.000001 16300 Write_rows 1 16334 table_id: 25 flags: STMT_END_F -master-bin.000001 16334 Table_map 1 16373 table_id: 25 (test.t1) -master-bin.000001 16373 Write_rows 1 16407 table_id: 25 flags: STMT_END_F -master-bin.000001 16407 Table_map 1 16446 table_id: 25 (test.t1) -master-bin.000001 16446 Write_rows 1 16480 table_id: 25 flags: STMT_END_F -master-bin.000001 16480 Table_map 1 16519 table_id: 25 (test.t1) -master-bin.000001 16519 Write_rows 1 16553 table_id: 25 flags: STMT_END_F -master-bin.000001 16553 Table_map 1 16592 table_id: 25 (test.t1) -master-bin.000001 16592 Write_rows 1 16626 table_id: 25 flags: STMT_END_F -master-bin.000001 16626 Table_map 1 16665 table_id: 25 (test.t1) -master-bin.000001 16665 Write_rows 1 16699 table_id: 25 flags: STMT_END_F -master-bin.000001 16699 Table_map 1 16738 table_id: 25 (test.t1) -master-bin.000001 16738 Write_rows 1 16772 table_id: 25 flags: STMT_END_F -master-bin.000001 16772 Table_map 1 16811 table_id: 25 (test.t1) -master-bin.000001 16811 Write_rows 1 16845 table_id: 25 flags: STMT_END_F -master-bin.000001 16845 Table_map 1 16884 table_id: 25 (test.t1) -master-bin.000001 16884 Write_rows 1 16918 table_id: 25 flags: STMT_END_F -master-bin.000001 16918 Table_map 1 16957 table_id: 25 (test.t1) -master-bin.000001 16957 Write_rows 1 16991 table_id: 25 flags: STMT_END_F -master-bin.000001 16991 Table_map 1 17030 table_id: 25 (test.t1) -master-bin.000001 17030 Write_rows 1 17064 table_id: 25 flags: STMT_END_F -master-bin.000001 17064 Table_map 1 17103 table_id: 25 (test.t1) -master-bin.000001 17103 Write_rows 1 17137 table_id: 25 flags: STMT_END_F -master-bin.000001 17137 Table_map 1 17176 table_id: 25 (test.t1) -master-bin.000001 17176 Write_rows 1 17210 table_id: 25 flags: STMT_END_F -master-bin.000001 17210 Table_map 1 17249 table_id: 25 (test.t1) -master-bin.000001 17249 Write_rows 1 17283 table_id: 25 flags: STMT_END_F -master-bin.000001 17283 Table_map 1 17322 table_id: 25 (test.t1) -master-bin.000001 17322 Write_rows 1 17356 table_id: 25 flags: STMT_END_F -master-bin.000001 17356 Table_map 1 17395 table_id: 25 (test.t1) -master-bin.000001 17395 Write_rows 1 17429 table_id: 25 flags: STMT_END_F -master-bin.000001 17429 Table_map 1 17468 table_id: 25 (test.t1) -master-bin.000001 17468 Write_rows 1 17502 table_id: 25 flags: STMT_END_F -master-bin.000001 17502 Table_map 1 17541 table_id: 25 (test.t1) -master-bin.000001 17541 Write_rows 1 17575 table_id: 25 flags: STMT_END_F -master-bin.000001 17575 Table_map 1 17614 table_id: 25 (test.t1) -master-bin.000001 17614 Write_rows 1 17648 table_id: 25 flags: STMT_END_F -master-bin.000001 17648 Table_map 1 17687 table_id: 25 (test.t1) -master-bin.000001 17687 Write_rows 1 17721 table_id: 25 flags: STMT_END_F -master-bin.000001 17721 Table_map 1 17760 table_id: 25 (test.t1) -master-bin.000001 17760 Write_rows 1 17794 table_id: 25 flags: STMT_END_F -master-bin.000001 17794 Table_map 1 17833 table_id: 25 (test.t1) -master-bin.000001 17833 Write_rows 1 17867 table_id: 25 flags: STMT_END_F -master-bin.000001 17867 Table_map 1 17906 table_id: 25 (test.t1) -master-bin.000001 17906 Write_rows 1 17940 table_id: 25 flags: STMT_END_F -master-bin.000001 17940 Table_map 1 17979 table_id: 25 (test.t1) -master-bin.000001 17979 Write_rows 1 18013 table_id: 25 flags: STMT_END_F -master-bin.000001 18013 Table_map 1 18052 table_id: 25 (test.t1) -master-bin.000001 18052 Write_rows 1 18086 table_id: 25 flags: STMT_END_F -master-bin.000001 18086 Table_map 1 18125 table_id: 25 (test.t1) -master-bin.000001 18125 Write_rows 1 18159 table_id: 25 flags: STMT_END_F -master-bin.000001 18159 Table_map 1 18198 table_id: 25 (test.t1) -master-bin.000001 18198 Write_rows 1 18232 table_id: 25 flags: STMT_END_F -master-bin.000001 18232 Table_map 1 18271 table_id: 25 (test.t1) -master-bin.000001 18271 Write_rows 1 18305 table_id: 25 flags: STMT_END_F -master-bin.000001 18305 Table_map 1 18344 table_id: 25 (test.t1) -master-bin.000001 18344 Write_rows 1 18378 table_id: 25 flags: STMT_END_F -master-bin.000001 18378 Table_map 1 18417 table_id: 25 (test.t1) -master-bin.000001 18417 Write_rows 1 18451 table_id: 25 flags: STMT_END_F -master-bin.000001 18451 Table_map 1 18490 table_id: 25 (test.t1) -master-bin.000001 18490 Write_rows 1 18524 table_id: 25 flags: STMT_END_F -master-bin.000001 18524 Table_map 1 18563 table_id: 25 (test.t1) -master-bin.000001 18563 Write_rows 1 18597 table_id: 25 flags: STMT_END_F -master-bin.000001 18597 Table_map 1 18636 table_id: 25 (test.t1) -master-bin.000001 18636 Write_rows 1 18670 table_id: 25 flags: STMT_END_F -master-bin.000001 18670 Table_map 1 18709 table_id: 25 (test.t1) -master-bin.000001 18709 Write_rows 1 18743 table_id: 25 flags: STMT_END_F -master-bin.000001 18743 Table_map 1 18782 table_id: 25 (test.t1) -master-bin.000001 18782 Write_rows 1 18816 table_id: 25 flags: STMT_END_F -master-bin.000001 18816 Table_map 1 18855 table_id: 25 (test.t1) -master-bin.000001 18855 Write_rows 1 18889 table_id: 25 flags: STMT_END_F -master-bin.000001 18889 Table_map 1 18928 table_id: 25 (test.t1) -master-bin.000001 18928 Write_rows 1 18962 table_id: 25 flags: STMT_END_F -master-bin.000001 18962 Table_map 1 19001 table_id: 25 (test.t1) -master-bin.000001 19001 Write_rows 1 19035 table_id: 25 flags: STMT_END_F -master-bin.000001 19035 Table_map 1 19074 table_id: 25 (test.t1) -master-bin.000001 19074 Write_rows 1 19108 table_id: 25 flags: STMT_END_F -master-bin.000001 19108 Table_map 1 19147 table_id: 25 (test.t1) -master-bin.000001 19147 Write_rows 1 19181 table_id: 25 flags: STMT_END_F -master-bin.000001 19181 Table_map 1 19220 table_id: 25 (test.t1) -master-bin.000001 19220 Write_rows 1 19254 table_id: 25 flags: STMT_END_F -master-bin.000001 19254 Table_map 1 19293 table_id: 25 (test.t1) -master-bin.000001 19293 Write_rows 1 19327 table_id: 25 flags: STMT_END_F -master-bin.000001 19327 Table_map 1 19366 table_id: 25 (test.t1) -master-bin.000001 19366 Write_rows 1 19400 table_id: 25 flags: STMT_END_F -master-bin.000001 19400 Table_map 1 19439 table_id: 25 (test.t1) -master-bin.000001 19439 Write_rows 1 19473 table_id: 25 flags: STMT_END_F -master-bin.000001 19473 Table_map 1 19512 table_id: 25 (test.t1) -master-bin.000001 19512 Write_rows 1 19546 table_id: 25 flags: STMT_END_F -master-bin.000001 19546 Table_map 1 19585 table_id: 25 (test.t1) -master-bin.000001 19585 Write_rows 1 19619 table_id: 25 flags: STMT_END_F -master-bin.000001 19619 Table_map 1 19658 table_id: 25 (test.t1) -master-bin.000001 19658 Write_rows 1 19692 table_id: 25 flags: STMT_END_F -master-bin.000001 19692 Table_map 1 19731 table_id: 25 (test.t1) -master-bin.000001 19731 Write_rows 1 19765 table_id: 25 flags: STMT_END_F -master-bin.000001 19765 Table_map 1 19804 table_id: 25 (test.t1) -master-bin.000001 19804 Write_rows 1 19838 table_id: 25 flags: STMT_END_F -master-bin.000001 19838 Table_map 1 19877 table_id: 25 (test.t1) -master-bin.000001 19877 Write_rows 1 19911 table_id: 25 flags: STMT_END_F -master-bin.000001 19911 Table_map 1 19950 table_id: 25 (test.t1) -master-bin.000001 19950 Write_rows 1 19984 table_id: 25 flags: STMT_END_F -master-bin.000001 19984 Table_map 1 20023 table_id: 25 (test.t1) -master-bin.000001 20023 Write_rows 1 20057 table_id: 25 flags: STMT_END_F -master-bin.000001 20057 Table_map 1 20096 table_id: 25 (test.t1) -master-bin.000001 20096 Write_rows 1 20130 table_id: 25 flags: STMT_END_F -master-bin.000001 20130 Table_map 1 20169 table_id: 25 (test.t1) -master-bin.000001 20169 Write_rows 1 20203 table_id: 25 flags: STMT_END_F -master-bin.000001 20203 Table_map 1 20242 table_id: 25 (test.t1) -master-bin.000001 20242 Write_rows 1 20276 table_id: 25 flags: STMT_END_F -master-bin.000001 20276 Table_map 1 20315 table_id: 25 (test.t1) -master-bin.000001 20315 Write_rows 1 20349 table_id: 25 flags: STMT_END_F -master-bin.000001 20349 Table_map 1 20388 table_id: 25 (test.t1) -master-bin.000001 20388 Write_rows 1 20422 table_id: 25 flags: STMT_END_F -master-bin.000001 20422 Table_map 1 20461 table_id: 25 (test.t1) -master-bin.000001 20461 Write_rows 1 20495 table_id: 25 flags: STMT_END_F -master-bin.000001 20495 Table_map 1 20534 table_id: 25 (test.t1) -master-bin.000001 20534 Write_rows 1 20568 table_id: 25 flags: STMT_END_F -master-bin.000001 20568 Table_map 1 20607 table_id: 25 (test.t1) -master-bin.000001 20607 Write_rows 1 20641 table_id: 25 flags: STMT_END_F -master-bin.000001 20641 Table_map 1 20680 table_id: 25 (test.t1) -master-bin.000001 20680 Write_rows 1 20714 table_id: 25 flags: STMT_END_F -master-bin.000001 20714 Table_map 1 20753 table_id: 25 (test.t1) -master-bin.000001 20753 Write_rows 1 20787 table_id: 25 flags: STMT_END_F -master-bin.000001 20787 Table_map 1 20826 table_id: 25 (test.t1) -master-bin.000001 20826 Write_rows 1 20860 table_id: 25 flags: STMT_END_F -master-bin.000001 20860 Table_map 1 20899 table_id: 25 (test.t1) -master-bin.000001 20899 Write_rows 1 20933 table_id: 25 flags: STMT_END_F -master-bin.000001 20933 Table_map 1 20972 table_id: 25 (test.t1) -master-bin.000001 20972 Write_rows 1 21006 table_id: 25 flags: STMT_END_F -master-bin.000001 21006 Table_map 1 21045 table_id: 25 (test.t1) -master-bin.000001 21045 Write_rows 1 21079 table_id: 25 flags: STMT_END_F -master-bin.000001 21079 Table_map 1 21118 table_id: 25 (test.t1) -master-bin.000001 21118 Write_rows 1 21152 table_id: 25 flags: STMT_END_F -master-bin.000001 21152 Table_map 1 21191 table_id: 25 (test.t1) -master-bin.000001 21191 Write_rows 1 21225 table_id: 25 flags: STMT_END_F -master-bin.000001 21225 Table_map 1 21264 table_id: 25 (test.t1) -master-bin.000001 21264 Write_rows 1 21298 table_id: 25 flags: STMT_END_F -master-bin.000001 21298 Table_map 1 21337 table_id: 25 (test.t1) -master-bin.000001 21337 Write_rows 1 21371 table_id: 25 flags: STMT_END_F -master-bin.000001 21371 Table_map 1 21410 table_id: 25 (test.t1) -master-bin.000001 21410 Write_rows 1 21444 table_id: 25 flags: STMT_END_F -master-bin.000001 21444 Table_map 1 21483 table_id: 25 (test.t1) -master-bin.000001 21483 Write_rows 1 21517 table_id: 25 flags: STMT_END_F -master-bin.000001 21517 Table_map 1 21556 table_id: 25 (test.t1) -master-bin.000001 21556 Write_rows 1 21590 table_id: 25 flags: STMT_END_F -master-bin.000001 21590 Table_map 1 21629 table_id: 25 (test.t1) -master-bin.000001 21629 Write_rows 1 21663 table_id: 25 flags: STMT_END_F -master-bin.000001 21663 Table_map 1 21702 table_id: 25 (test.t1) -master-bin.000001 21702 Write_rows 1 21736 table_id: 25 flags: STMT_END_F -master-bin.000001 21736 Table_map 1 21775 table_id: 25 (test.t1) -master-bin.000001 21775 Write_rows 1 21809 table_id: 25 flags: STMT_END_F -master-bin.000001 21809 Table_map 1 21848 table_id: 25 (test.t1) -master-bin.000001 21848 Write_rows 1 21882 table_id: 25 flags: STMT_END_F -master-bin.000001 21882 Table_map 1 21921 table_id: 25 (test.t1) -master-bin.000001 21921 Write_rows 1 21955 table_id: 25 flags: STMT_END_F -master-bin.000001 21955 Table_map 1 21994 table_id: 25 (test.t1) -master-bin.000001 21994 Write_rows 1 22028 table_id: 25 flags: STMT_END_F -master-bin.000001 22028 Table_map 1 22067 table_id: 25 (test.t1) -master-bin.000001 22067 Write_rows 1 22101 table_id: 25 flags: STMT_END_F -master-bin.000001 22101 Table_map 1 22140 table_id: 25 (test.t1) -master-bin.000001 22140 Write_rows 1 22174 table_id: 25 flags: STMT_END_F -master-bin.000001 22174 Table_map 1 22213 table_id: 25 (test.t1) -master-bin.000001 22213 Write_rows 1 22247 table_id: 25 flags: STMT_END_F -master-bin.000001 22247 Table_map 1 22286 table_id: 25 (test.t1) -master-bin.000001 22286 Write_rows 1 22320 table_id: 25 flags: STMT_END_F -master-bin.000001 22320 Table_map 1 22359 table_id: 25 (test.t1) -master-bin.000001 22359 Write_rows 1 22393 table_id: 25 flags: STMT_END_F -master-bin.000001 22393 Table_map 1 22432 table_id: 25 (test.t1) -master-bin.000001 22432 Write_rows 1 22466 table_id: 25 flags: STMT_END_F -master-bin.000001 22466 Table_map 1 22505 table_id: 25 (test.t1) -master-bin.000001 22505 Write_rows 1 22539 table_id: 25 flags: STMT_END_F -master-bin.000001 22539 Table_map 1 22578 table_id: 25 (test.t1) -master-bin.000001 22578 Write_rows 1 22612 table_id: 25 flags: STMT_END_F -master-bin.000001 22612 Table_map 1 22651 table_id: 25 (test.t1) -master-bin.000001 22651 Write_rows 1 22685 table_id: 25 flags: STMT_END_F -master-bin.000001 22685 Table_map 1 22724 table_id: 25 (test.t1) -master-bin.000001 22724 Write_rows 1 22758 table_id: 25 flags: STMT_END_F -master-bin.000001 22758 Table_map 1 22797 table_id: 25 (test.t1) -master-bin.000001 22797 Write_rows 1 22831 table_id: 25 flags: STMT_END_F -master-bin.000001 22831 Table_map 1 22870 table_id: 25 (test.t1) -master-bin.000001 22870 Write_rows 1 22904 table_id: 25 flags: STMT_END_F -master-bin.000001 22904 Table_map 1 22943 table_id: 25 (test.t1) -master-bin.000001 22943 Write_rows 1 22977 table_id: 25 flags: STMT_END_F -master-bin.000001 22977 Table_map 1 23016 table_id: 25 (test.t1) -master-bin.000001 23016 Write_rows 1 23050 table_id: 25 flags: STMT_END_F -master-bin.000001 23050 Table_map 1 23089 table_id: 25 (test.t1) -master-bin.000001 23089 Write_rows 1 23123 table_id: 25 flags: STMT_END_F -master-bin.000001 23123 Table_map 1 23162 table_id: 25 (test.t1) -master-bin.000001 23162 Write_rows 1 23196 table_id: 25 flags: STMT_END_F -master-bin.000001 23196 Table_map 1 23235 table_id: 25 (test.t1) -master-bin.000001 23235 Write_rows 1 23269 table_id: 25 flags: STMT_END_F -master-bin.000001 23269 Table_map 1 23308 table_id: 25 (test.t1) -master-bin.000001 23308 Write_rows 1 23342 table_id: 25 flags: STMT_END_F -master-bin.000001 23342 Table_map 1 23381 table_id: 25 (test.t1) -master-bin.000001 23381 Write_rows 1 23415 table_id: 25 flags: STMT_END_F -master-bin.000001 23415 Table_map 1 23454 table_id: 25 (test.t1) -master-bin.000001 23454 Write_rows 1 23488 table_id: 25 flags: STMT_END_F -master-bin.000001 23488 Table_map 1 23527 table_id: 25 (test.t1) -master-bin.000001 23527 Write_rows 1 23561 table_id: 25 flags: STMT_END_F -master-bin.000001 23561 Table_map 1 23600 table_id: 25 (test.t1) -master-bin.000001 23600 Write_rows 1 23634 table_id: 25 flags: STMT_END_F -master-bin.000001 23634 Table_map 1 23673 table_id: 25 (test.t1) -master-bin.000001 23673 Write_rows 1 23707 table_id: 25 flags: STMT_END_F -master-bin.000001 23707 Table_map 1 23746 table_id: 25 (test.t1) -master-bin.000001 23746 Write_rows 1 23780 table_id: 25 flags: STMT_END_F -master-bin.000001 23780 Table_map 1 23819 table_id: 25 (test.t1) -master-bin.000001 23819 Write_rows 1 23853 table_id: 25 flags: STMT_END_F -master-bin.000001 23853 Table_map 1 23892 table_id: 25 (test.t1) -master-bin.000001 23892 Write_rows 1 23926 table_id: 25 flags: STMT_END_F -master-bin.000001 23926 Table_map 1 23965 table_id: 25 (test.t1) -master-bin.000001 23965 Write_rows 1 23999 table_id: 25 flags: STMT_END_F -master-bin.000001 23999 Table_map 1 24038 table_id: 25 (test.t1) -master-bin.000001 24038 Write_rows 1 24072 table_id: 25 flags: STMT_END_F -master-bin.000001 24072 Table_map 1 24111 table_id: 25 (test.t1) -master-bin.000001 24111 Write_rows 1 24145 table_id: 25 flags: STMT_END_F -master-bin.000001 24145 Table_map 1 24184 table_id: 25 (test.t1) -master-bin.000001 24184 Write_rows 1 24218 table_id: 25 flags: STMT_END_F -master-bin.000001 24218 Table_map 1 24257 table_id: 25 (test.t1) -master-bin.000001 24257 Write_rows 1 24291 table_id: 25 flags: STMT_END_F -master-bin.000001 24291 Table_map 1 24330 table_id: 25 (test.t1) -master-bin.000001 24330 Write_rows 1 24364 table_id: 25 flags: STMT_END_F -master-bin.000001 24364 Table_map 1 24403 table_id: 25 (test.t1) -master-bin.000001 24403 Write_rows 1 24437 table_id: 25 flags: STMT_END_F -master-bin.000001 24437 Table_map 1 24476 table_id: 25 (test.t1) -master-bin.000001 24476 Write_rows 1 24510 table_id: 25 flags: STMT_END_F -master-bin.000001 24510 Table_map 1 24549 table_id: 25 (test.t1) -master-bin.000001 24549 Write_rows 1 24583 table_id: 25 flags: STMT_END_F -master-bin.000001 24583 Table_map 1 24622 table_id: 25 (test.t1) -master-bin.000001 24622 Write_rows 1 24656 table_id: 25 flags: STMT_END_F -master-bin.000001 24656 Table_map 1 24695 table_id: 25 (test.t1) -master-bin.000001 24695 Write_rows 1 24729 table_id: 25 flags: STMT_END_F -master-bin.000001 24729 Table_map 1 24768 table_id: 25 (test.t1) -master-bin.000001 24768 Write_rows 1 24802 table_id: 25 flags: STMT_END_F -master-bin.000001 24802 Table_map 1 24841 table_id: 25 (test.t1) -master-bin.000001 24841 Write_rows 1 24875 table_id: 25 flags: STMT_END_F -master-bin.000001 24875 Table_map 1 24914 table_id: 25 (test.t1) -master-bin.000001 24914 Write_rows 1 24948 table_id: 25 flags: STMT_END_F -master-bin.000001 24948 Table_map 1 24987 table_id: 25 (test.t1) -master-bin.000001 24987 Write_rows 1 25021 table_id: 25 flags: STMT_END_F -master-bin.000001 25021 Table_map 1 25060 table_id: 25 (test.t1) -master-bin.000001 25060 Write_rows 1 25094 table_id: 25 flags: STMT_END_F -master-bin.000001 25094 Table_map 1 25133 table_id: 25 (test.t1) -master-bin.000001 25133 Write_rows 1 25167 table_id: 25 flags: STMT_END_F -master-bin.000001 25167 Table_map 1 25206 table_id: 25 (test.t1) -master-bin.000001 25206 Write_rows 1 25240 table_id: 25 flags: STMT_END_F -master-bin.000001 25240 Table_map 1 25279 table_id: 25 (test.t1) -master-bin.000001 25279 Write_rows 1 25313 table_id: 25 flags: STMT_END_F -master-bin.000001 25313 Table_map 1 25352 table_id: 25 (test.t1) -master-bin.000001 25352 Write_rows 1 25386 table_id: 25 flags: STMT_END_F -master-bin.000001 25386 Table_map 1 25425 table_id: 25 (test.t1) -master-bin.000001 25425 Write_rows 1 25459 table_id: 25 flags: STMT_END_F -master-bin.000001 25459 Table_map 1 25498 table_id: 25 (test.t1) -master-bin.000001 25498 Write_rows 1 25532 table_id: 25 flags: STMT_END_F -master-bin.000001 25532 Table_map 1 25571 table_id: 25 (test.t1) -master-bin.000001 25571 Write_rows 1 25605 table_id: 25 flags: STMT_END_F -master-bin.000001 25605 Table_map 1 25644 table_id: 25 (test.t1) -master-bin.000001 25644 Write_rows 1 25678 table_id: 25 flags: STMT_END_F -master-bin.000001 25678 Table_map 1 25717 table_id: 25 (test.t1) -master-bin.000001 25717 Write_rows 1 25751 table_id: 25 flags: STMT_END_F -master-bin.000001 25751 Table_map 1 25790 table_id: 25 (test.t1) -master-bin.000001 25790 Write_rows 1 25824 table_id: 25 flags: STMT_END_F -master-bin.000001 25824 Table_map 1 25863 table_id: 25 (test.t1) -master-bin.000001 25863 Write_rows 1 25897 table_id: 25 flags: STMT_END_F -master-bin.000001 25897 Table_map 1 25936 table_id: 25 (test.t1) -master-bin.000001 25936 Write_rows 1 25970 table_id: 25 flags: STMT_END_F -master-bin.000001 25970 Table_map 1 26009 table_id: 25 (test.t1) -master-bin.000001 26009 Write_rows 1 26043 table_id: 25 flags: STMT_END_F -master-bin.000001 26043 Table_map 1 26082 table_id: 25 (test.t1) -master-bin.000001 26082 Write_rows 1 26116 table_id: 25 flags: STMT_END_F -master-bin.000001 26116 Table_map 1 26155 table_id: 25 (test.t1) -master-bin.000001 26155 Write_rows 1 26189 table_id: 25 flags: STMT_END_F -master-bin.000001 26189 Table_map 1 26228 table_id: 25 (test.t1) -master-bin.000001 26228 Write_rows 1 26262 table_id: 25 flags: STMT_END_F -master-bin.000001 26262 Table_map 1 26301 table_id: 25 (test.t1) -master-bin.000001 26301 Write_rows 1 26335 table_id: 25 flags: STMT_END_F -master-bin.000001 26335 Table_map 1 26374 table_id: 25 (test.t1) -master-bin.000001 26374 Write_rows 1 26408 table_id: 25 flags: STMT_END_F -master-bin.000001 26408 Table_map 1 26447 table_id: 25 (test.t1) -master-bin.000001 26447 Write_rows 1 26481 table_id: 25 flags: STMT_END_F -master-bin.000001 26481 Table_map 1 26520 table_id: 25 (test.t1) -master-bin.000001 26520 Write_rows 1 26554 table_id: 25 flags: STMT_END_F -master-bin.000001 26554 Table_map 1 26593 table_id: 25 (test.t1) -master-bin.000001 26593 Write_rows 1 26627 table_id: 25 flags: STMT_END_F -master-bin.000001 26627 Table_map 1 26666 table_id: 25 (test.t1) -master-bin.000001 26666 Write_rows 1 26700 table_id: 25 flags: STMT_END_F -master-bin.000001 26700 Table_map 1 26739 table_id: 25 (test.t1) -master-bin.000001 26739 Write_rows 1 26773 table_id: 25 flags: STMT_END_F -master-bin.000001 26773 Table_map 1 26812 table_id: 25 (test.t1) -master-bin.000001 26812 Write_rows 1 26846 table_id: 25 flags: STMT_END_F -master-bin.000001 26846 Table_map 1 26885 table_id: 25 (test.t1) -master-bin.000001 26885 Write_rows 1 26919 table_id: 25 flags: STMT_END_F -master-bin.000001 26919 Table_map 1 26958 table_id: 25 (test.t1) -master-bin.000001 26958 Write_rows 1 26992 table_id: 25 flags: STMT_END_F -master-bin.000001 26992 Table_map 1 27031 table_id: 25 (test.t1) -master-bin.000001 27031 Write_rows 1 27065 table_id: 25 flags: STMT_END_F -master-bin.000001 27065 Table_map 1 27104 table_id: 25 (test.t1) -master-bin.000001 27104 Write_rows 1 27138 table_id: 25 flags: STMT_END_F -master-bin.000001 27138 Table_map 1 27177 table_id: 25 (test.t1) -master-bin.000001 27177 Write_rows 1 27211 table_id: 25 flags: STMT_END_F -master-bin.000001 27211 Table_map 1 27250 table_id: 25 (test.t1) -master-bin.000001 27250 Write_rows 1 27284 table_id: 25 flags: STMT_END_F -master-bin.000001 27284 Table_map 1 27323 table_id: 25 (test.t1) -master-bin.000001 27323 Write_rows 1 27357 table_id: 25 flags: STMT_END_F -master-bin.000001 27357 Table_map 1 27396 table_id: 25 (test.t1) -master-bin.000001 27396 Write_rows 1 27430 table_id: 25 flags: STMT_END_F -master-bin.000001 27430 Table_map 1 27469 table_id: 25 (test.t1) -master-bin.000001 27469 Write_rows 1 27503 table_id: 25 flags: STMT_END_F -master-bin.000001 27503 Table_map 1 27542 table_id: 25 (test.t1) -master-bin.000001 27542 Write_rows 1 27576 table_id: 25 flags: STMT_END_F -master-bin.000001 27576 Table_map 1 27615 table_id: 25 (test.t1) -master-bin.000001 27615 Write_rows 1 27649 table_id: 25 flags: STMT_END_F -master-bin.000001 27649 Table_map 1 27688 table_id: 25 (test.t1) -master-bin.000001 27688 Write_rows 1 27722 table_id: 25 flags: STMT_END_F -master-bin.000001 27722 Table_map 1 27761 table_id: 25 (test.t1) -master-bin.000001 27761 Write_rows 1 27795 table_id: 25 flags: STMT_END_F -master-bin.000001 27795 Table_map 1 27834 table_id: 25 (test.t1) -master-bin.000001 27834 Write_rows 1 27868 table_id: 25 flags: STMT_END_F -master-bin.000001 27868 Table_map 1 27907 table_id: 25 (test.t1) -master-bin.000001 27907 Write_rows 1 27941 table_id: 25 flags: STMT_END_F -master-bin.000001 27941 Table_map 1 27980 table_id: 25 (test.t1) -master-bin.000001 27980 Write_rows 1 28014 table_id: 25 flags: STMT_END_F -master-bin.000001 28014 Table_map 1 28053 table_id: 25 (test.t1) -master-bin.000001 28053 Write_rows 1 28087 table_id: 25 flags: STMT_END_F -master-bin.000001 28087 Table_map 1 28126 table_id: 25 (test.t1) -master-bin.000001 28126 Write_rows 1 28160 table_id: 25 flags: STMT_END_F -master-bin.000001 28160 Table_map 1 28199 table_id: 25 (test.t1) -master-bin.000001 28199 Write_rows 1 28233 table_id: 25 flags: STMT_END_F -master-bin.000001 28233 Table_map 1 28272 table_id: 25 (test.t1) -master-bin.000001 28272 Write_rows 1 28306 table_id: 25 flags: STMT_END_F -master-bin.000001 28306 Table_map 1 28345 table_id: 25 (test.t1) -master-bin.000001 28345 Write_rows 1 28379 table_id: 25 flags: STMT_END_F -master-bin.000001 28379 Table_map 1 28418 table_id: 25 (test.t1) -master-bin.000001 28418 Write_rows 1 28452 table_id: 25 flags: STMT_END_F -master-bin.000001 28452 Table_map 1 28491 table_id: 25 (test.t1) -master-bin.000001 28491 Write_rows 1 28525 table_id: 25 flags: STMT_END_F -master-bin.000001 28525 Table_map 1 28564 table_id: 25 (test.t1) -master-bin.000001 28564 Write_rows 1 28598 table_id: 25 flags: STMT_END_F -master-bin.000001 28598 Table_map 1 28637 table_id: 25 (test.t1) -master-bin.000001 28637 Write_rows 1 28671 table_id: 25 flags: STMT_END_F -master-bin.000001 28671 Table_map 1 28710 table_id: 25 (test.t1) -master-bin.000001 28710 Write_rows 1 28744 table_id: 25 flags: STMT_END_F -master-bin.000001 28744 Table_map 1 28783 table_id: 25 (test.t1) -master-bin.000001 28783 Write_rows 1 28817 table_id: 25 flags: STMT_END_F -master-bin.000001 28817 Table_map 1 28856 table_id: 25 (test.t1) -master-bin.000001 28856 Write_rows 1 28890 table_id: 25 flags: STMT_END_F -master-bin.000001 28890 Table_map 1 28929 table_id: 25 (test.t1) -master-bin.000001 28929 Write_rows 1 28963 table_id: 25 flags: STMT_END_F -master-bin.000001 28963 Table_map 1 29002 table_id: 25 (test.t1) -master-bin.000001 29002 Write_rows 1 29036 table_id: 25 flags: STMT_END_F -master-bin.000001 29036 Table_map 1 29075 table_id: 25 (test.t1) -master-bin.000001 29075 Write_rows 1 29109 table_id: 25 flags: STMT_END_F -master-bin.000001 29109 Table_map 1 29148 table_id: 25 (test.t1) -master-bin.000001 29148 Write_rows 1 29182 table_id: 25 flags: STMT_END_F -master-bin.000001 29182 Table_map 1 29221 table_id: 25 (test.t1) -master-bin.000001 29221 Write_rows 1 29255 table_id: 25 flags: STMT_END_F -master-bin.000001 29255 Table_map 1 29294 table_id: 25 (test.t1) -master-bin.000001 29294 Write_rows 1 29328 table_id: 25 flags: STMT_END_F -master-bin.000001 29328 Table_map 1 29367 table_id: 25 (test.t1) -master-bin.000001 29367 Write_rows 1 29401 table_id: 25 flags: STMT_END_F -master-bin.000001 29401 Table_map 1 29440 table_id: 25 (test.t1) -master-bin.000001 29440 Write_rows 1 29474 table_id: 25 flags: STMT_END_F -master-bin.000001 29474 Xid 1 29501 COMMIT /* xid=189 */ +master-bin.000001 274 Table_map 1 313 table_id: # (test.t1) +master-bin.000001 313 Write_rows 1 347 table_id: # flags: STMT_END_F +master-bin.000001 347 Table_map 1 386 table_id: # (test.t1) +master-bin.000001 386 Write_rows 1 420 table_id: # flags: STMT_END_F +master-bin.000001 420 Table_map 1 459 table_id: # (test.t1) +master-bin.000001 459 Write_rows 1 493 table_id: # flags: STMT_END_F +master-bin.000001 493 Table_map 1 532 table_id: # (test.t1) +master-bin.000001 532 Write_rows 1 566 table_id: # flags: STMT_END_F +master-bin.000001 566 Table_map 1 605 table_id: # (test.t1) +master-bin.000001 605 Write_rows 1 639 table_id: # flags: STMT_END_F +master-bin.000001 639 Table_map 1 678 table_id: # (test.t1) +master-bin.000001 678 Write_rows 1 712 table_id: # flags: STMT_END_F +master-bin.000001 712 Table_map 1 751 table_id: # (test.t1) +master-bin.000001 751 Write_rows 1 785 table_id: # flags: STMT_END_F +master-bin.000001 785 Table_map 1 824 table_id: # (test.t1) +master-bin.000001 824 Write_rows 1 858 table_id: # flags: STMT_END_F +master-bin.000001 858 Table_map 1 897 table_id: # (test.t1) +master-bin.000001 897 Write_rows 1 931 table_id: # flags: STMT_END_F +master-bin.000001 931 Table_map 1 970 table_id: # (test.t1) +master-bin.000001 970 Write_rows 1 1004 table_id: # flags: STMT_END_F +master-bin.000001 1004 Table_map 1 1043 table_id: # (test.t1) +master-bin.000001 1043 Write_rows 1 1077 table_id: # flags: STMT_END_F +master-bin.000001 1077 Table_map 1 1116 table_id: # (test.t1) +master-bin.000001 1116 Write_rows 1 1150 table_id: # flags: STMT_END_F +master-bin.000001 1150 Table_map 1 1189 table_id: # (test.t1) +master-bin.000001 1189 Write_rows 1 1223 table_id: # flags: STMT_END_F +master-bin.000001 1223 Table_map 1 1262 table_id: # (test.t1) +master-bin.000001 1262 Write_rows 1 1296 table_id: # flags: STMT_END_F +master-bin.000001 1296 Table_map 1 1335 table_id: # (test.t1) +master-bin.000001 1335 Write_rows 1 1369 table_id: # flags: STMT_END_F +master-bin.000001 1369 Table_map 1 1408 table_id: # (test.t1) +master-bin.000001 1408 Write_rows 1 1442 table_id: # flags: STMT_END_F +master-bin.000001 1442 Table_map 1 1481 table_id: # (test.t1) +master-bin.000001 1481 Write_rows 1 1515 table_id: # flags: STMT_END_F +master-bin.000001 1515 Table_map 1 1554 table_id: # (test.t1) +master-bin.000001 1554 Write_rows 1 1588 table_id: # flags: STMT_END_F +master-bin.000001 1588 Table_map 1 1627 table_id: # (test.t1) +master-bin.000001 1627 Write_rows 1 1661 table_id: # flags: STMT_END_F +master-bin.000001 1661 Table_map 1 1700 table_id: # (test.t1) +master-bin.000001 1700 Write_rows 1 1734 table_id: # flags: STMT_END_F +master-bin.000001 1734 Table_map 1 1773 table_id: # (test.t1) +master-bin.000001 1773 Write_rows 1 1807 table_id: # flags: STMT_END_F +master-bin.000001 1807 Table_map 1 1846 table_id: # (test.t1) +master-bin.000001 1846 Write_rows 1 1880 table_id: # flags: STMT_END_F +master-bin.000001 1880 Table_map 1 1919 table_id: # (test.t1) +master-bin.000001 1919 Write_rows 1 1953 table_id: # flags: STMT_END_F +master-bin.000001 1953 Table_map 1 1992 table_id: # (test.t1) +master-bin.000001 1992 Write_rows 1 2026 table_id: # flags: STMT_END_F +master-bin.000001 2026 Table_map 1 2065 table_id: # (test.t1) +master-bin.000001 2065 Write_rows 1 2099 table_id: # flags: STMT_END_F +master-bin.000001 2099 Table_map 1 2138 table_id: # (test.t1) +master-bin.000001 2138 Write_rows 1 2172 table_id: # flags: STMT_END_F +master-bin.000001 2172 Table_map 1 2211 table_id: # (test.t1) +master-bin.000001 2211 Write_rows 1 2245 table_id: # flags: STMT_END_F +master-bin.000001 2245 Table_map 1 2284 table_id: # (test.t1) +master-bin.000001 2284 Write_rows 1 2318 table_id: # flags: STMT_END_F +master-bin.000001 2318 Table_map 1 2357 table_id: # (test.t1) +master-bin.000001 2357 Write_rows 1 2391 table_id: # flags: STMT_END_F +master-bin.000001 2391 Table_map 1 2430 table_id: # (test.t1) +master-bin.000001 2430 Write_rows 1 2464 table_id: # flags: STMT_END_F +master-bin.000001 2464 Table_map 1 2503 table_id: # (test.t1) +master-bin.000001 2503 Write_rows 1 2537 table_id: # flags: STMT_END_F +master-bin.000001 2537 Table_map 1 2576 table_id: # (test.t1) +master-bin.000001 2576 Write_rows 1 2610 table_id: # flags: STMT_END_F +master-bin.000001 2610 Table_map 1 2649 table_id: # (test.t1) +master-bin.000001 2649 Write_rows 1 2683 table_id: # flags: STMT_END_F +master-bin.000001 2683 Table_map 1 2722 table_id: # (test.t1) +master-bin.000001 2722 Write_rows 1 2756 table_id: # flags: STMT_END_F +master-bin.000001 2756 Table_map 1 2795 table_id: # (test.t1) +master-bin.000001 2795 Write_rows 1 2829 table_id: # flags: STMT_END_F +master-bin.000001 2829 Table_map 1 2868 table_id: # (test.t1) +master-bin.000001 2868 Write_rows 1 2902 table_id: # flags: STMT_END_F +master-bin.000001 2902 Table_map 1 2941 table_id: # (test.t1) +master-bin.000001 2941 Write_rows 1 2975 table_id: # flags: STMT_END_F +master-bin.000001 2975 Table_map 1 3014 table_id: # (test.t1) +master-bin.000001 3014 Write_rows 1 3048 table_id: # flags: STMT_END_F +master-bin.000001 3048 Table_map 1 3087 table_id: # (test.t1) +master-bin.000001 3087 Write_rows 1 3121 table_id: # flags: STMT_END_F +master-bin.000001 3121 Table_map 1 3160 table_id: # (test.t1) +master-bin.000001 3160 Write_rows 1 3194 table_id: # flags: STMT_END_F +master-bin.000001 3194 Table_map 1 3233 table_id: # (test.t1) +master-bin.000001 3233 Write_rows 1 3267 table_id: # flags: STMT_END_F +master-bin.000001 3267 Table_map 1 3306 table_id: # (test.t1) +master-bin.000001 3306 Write_rows 1 3340 table_id: # flags: STMT_END_F +master-bin.000001 3340 Table_map 1 3379 table_id: # (test.t1) +master-bin.000001 3379 Write_rows 1 3413 table_id: # flags: STMT_END_F +master-bin.000001 3413 Table_map 1 3452 table_id: # (test.t1) +master-bin.000001 3452 Write_rows 1 3486 table_id: # flags: STMT_END_F +master-bin.000001 3486 Table_map 1 3525 table_id: # (test.t1) +master-bin.000001 3525 Write_rows 1 3559 table_id: # flags: STMT_END_F +master-bin.000001 3559 Table_map 1 3598 table_id: # (test.t1) +master-bin.000001 3598 Write_rows 1 3632 table_id: # flags: STMT_END_F +master-bin.000001 3632 Table_map 1 3671 table_id: # (test.t1) +master-bin.000001 3671 Write_rows 1 3705 table_id: # flags: STMT_END_F +master-bin.000001 3705 Table_map 1 3744 table_id: # (test.t1) +master-bin.000001 3744 Write_rows 1 3778 table_id: # flags: STMT_END_F +master-bin.000001 3778 Table_map 1 3817 table_id: # (test.t1) +master-bin.000001 3817 Write_rows 1 3851 table_id: # flags: STMT_END_F +master-bin.000001 3851 Table_map 1 3890 table_id: # (test.t1) +master-bin.000001 3890 Write_rows 1 3924 table_id: # flags: STMT_END_F +master-bin.000001 3924 Table_map 1 3963 table_id: # (test.t1) +master-bin.000001 3963 Write_rows 1 3997 table_id: # flags: STMT_END_F +master-bin.000001 3997 Table_map 1 4036 table_id: # (test.t1) +master-bin.000001 4036 Write_rows 1 4070 table_id: # flags: STMT_END_F +master-bin.000001 4070 Table_map 1 4109 table_id: # (test.t1) +master-bin.000001 4109 Write_rows 1 4143 table_id: # flags: STMT_END_F +master-bin.000001 4143 Table_map 1 4182 table_id: # (test.t1) +master-bin.000001 4182 Write_rows 1 4216 table_id: # flags: STMT_END_F +master-bin.000001 4216 Table_map 1 4255 table_id: # (test.t1) +master-bin.000001 4255 Write_rows 1 4289 table_id: # flags: STMT_END_F +master-bin.000001 4289 Table_map 1 4328 table_id: # (test.t1) +master-bin.000001 4328 Write_rows 1 4362 table_id: # flags: STMT_END_F +master-bin.000001 4362 Table_map 1 4401 table_id: # (test.t1) +master-bin.000001 4401 Write_rows 1 4435 table_id: # flags: STMT_END_F +master-bin.000001 4435 Table_map 1 4474 table_id: # (test.t1) +master-bin.000001 4474 Write_rows 1 4508 table_id: # flags: STMT_END_F +master-bin.000001 4508 Table_map 1 4547 table_id: # (test.t1) +master-bin.000001 4547 Write_rows 1 4581 table_id: # flags: STMT_END_F +master-bin.000001 4581 Table_map 1 4620 table_id: # (test.t1) +master-bin.000001 4620 Write_rows 1 4654 table_id: # flags: STMT_END_F +master-bin.000001 4654 Table_map 1 4693 table_id: # (test.t1) +master-bin.000001 4693 Write_rows 1 4727 table_id: # flags: STMT_END_F +master-bin.000001 4727 Table_map 1 4766 table_id: # (test.t1) +master-bin.000001 4766 Write_rows 1 4800 table_id: # flags: STMT_END_F +master-bin.000001 4800 Table_map 1 4839 table_id: # (test.t1) +master-bin.000001 4839 Write_rows 1 4873 table_id: # flags: STMT_END_F +master-bin.000001 4873 Table_map 1 4912 table_id: # (test.t1) +master-bin.000001 4912 Write_rows 1 4946 table_id: # flags: STMT_END_F +master-bin.000001 4946 Table_map 1 4985 table_id: # (test.t1) +master-bin.000001 4985 Write_rows 1 5019 table_id: # flags: STMT_END_F +master-bin.000001 5019 Table_map 1 5058 table_id: # (test.t1) +master-bin.000001 5058 Write_rows 1 5092 table_id: # flags: STMT_END_F +master-bin.000001 5092 Table_map 1 5131 table_id: # (test.t1) +master-bin.000001 5131 Write_rows 1 5165 table_id: # flags: STMT_END_F +master-bin.000001 5165 Table_map 1 5204 table_id: # (test.t1) +master-bin.000001 5204 Write_rows 1 5238 table_id: # flags: STMT_END_F +master-bin.000001 5238 Table_map 1 5277 table_id: # (test.t1) +master-bin.000001 5277 Write_rows 1 5311 table_id: # flags: STMT_END_F +master-bin.000001 5311 Table_map 1 5350 table_id: # (test.t1) +master-bin.000001 5350 Write_rows 1 5384 table_id: # flags: STMT_END_F +master-bin.000001 5384 Table_map 1 5423 table_id: # (test.t1) +master-bin.000001 5423 Write_rows 1 5457 table_id: # flags: STMT_END_F +master-bin.000001 5457 Table_map 1 5496 table_id: # (test.t1) +master-bin.000001 5496 Write_rows 1 5530 table_id: # flags: STMT_END_F +master-bin.000001 5530 Table_map 1 5569 table_id: # (test.t1) +master-bin.000001 5569 Write_rows 1 5603 table_id: # flags: STMT_END_F +master-bin.000001 5603 Table_map 1 5642 table_id: # (test.t1) +master-bin.000001 5642 Write_rows 1 5676 table_id: # flags: STMT_END_F +master-bin.000001 5676 Table_map 1 5715 table_id: # (test.t1) +master-bin.000001 5715 Write_rows 1 5749 table_id: # flags: STMT_END_F +master-bin.000001 5749 Table_map 1 5788 table_id: # (test.t1) +master-bin.000001 5788 Write_rows 1 5822 table_id: # flags: STMT_END_F +master-bin.000001 5822 Table_map 1 5861 table_id: # (test.t1) +master-bin.000001 5861 Write_rows 1 5895 table_id: # flags: STMT_END_F +master-bin.000001 5895 Table_map 1 5934 table_id: # (test.t1) +master-bin.000001 5934 Write_rows 1 5968 table_id: # flags: STMT_END_F +master-bin.000001 5968 Table_map 1 6007 table_id: # (test.t1) +master-bin.000001 6007 Write_rows 1 6041 table_id: # flags: STMT_END_F +master-bin.000001 6041 Table_map 1 6080 table_id: # (test.t1) +master-bin.000001 6080 Write_rows 1 6114 table_id: # flags: STMT_END_F +master-bin.000001 6114 Table_map 1 6153 table_id: # (test.t1) +master-bin.000001 6153 Write_rows 1 6187 table_id: # flags: STMT_END_F +master-bin.000001 6187 Table_map 1 6226 table_id: # (test.t1) +master-bin.000001 6226 Write_rows 1 6260 table_id: # flags: STMT_END_F +master-bin.000001 6260 Table_map 1 6299 table_id: # (test.t1) +master-bin.000001 6299 Write_rows 1 6333 table_id: # flags: STMT_END_F +master-bin.000001 6333 Table_map 1 6372 table_id: # (test.t1) +master-bin.000001 6372 Write_rows 1 6406 table_id: # flags: STMT_END_F +master-bin.000001 6406 Table_map 1 6445 table_id: # (test.t1) +master-bin.000001 6445 Write_rows 1 6479 table_id: # flags: STMT_END_F +master-bin.000001 6479 Table_map 1 6518 table_id: # (test.t1) +master-bin.000001 6518 Write_rows 1 6552 table_id: # flags: STMT_END_F +master-bin.000001 6552 Table_map 1 6591 table_id: # (test.t1) +master-bin.000001 6591 Write_rows 1 6625 table_id: # flags: STMT_END_F +master-bin.000001 6625 Table_map 1 6664 table_id: # (test.t1) +master-bin.000001 6664 Write_rows 1 6698 table_id: # flags: STMT_END_F +master-bin.000001 6698 Table_map 1 6737 table_id: # (test.t1) +master-bin.000001 6737 Write_rows 1 6771 table_id: # flags: STMT_END_F +master-bin.000001 6771 Table_map 1 6810 table_id: # (test.t1) +master-bin.000001 6810 Write_rows 1 6844 table_id: # flags: STMT_END_F +master-bin.000001 6844 Table_map 1 6883 table_id: # (test.t1) +master-bin.000001 6883 Write_rows 1 6917 table_id: # flags: STMT_END_F +master-bin.000001 6917 Table_map 1 6956 table_id: # (test.t1) +master-bin.000001 6956 Write_rows 1 6990 table_id: # flags: STMT_END_F +master-bin.000001 6990 Table_map 1 7029 table_id: # (test.t1) +master-bin.000001 7029 Write_rows 1 7063 table_id: # flags: STMT_END_F +master-bin.000001 7063 Table_map 1 7102 table_id: # (test.t1) +master-bin.000001 7102 Write_rows 1 7136 table_id: # flags: STMT_END_F +master-bin.000001 7136 Table_map 1 7175 table_id: # (test.t1) +master-bin.000001 7175 Write_rows 1 7209 table_id: # flags: STMT_END_F +master-bin.000001 7209 Table_map 1 7248 table_id: # (test.t1) +master-bin.000001 7248 Write_rows 1 7282 table_id: # flags: STMT_END_F +master-bin.000001 7282 Table_map 1 7321 table_id: # (test.t1) +master-bin.000001 7321 Write_rows 1 7355 table_id: # flags: STMT_END_F +master-bin.000001 7355 Table_map 1 7394 table_id: # (test.t1) +master-bin.000001 7394 Write_rows 1 7428 table_id: # flags: STMT_END_F +master-bin.000001 7428 Table_map 1 7467 table_id: # (test.t1) +master-bin.000001 7467 Write_rows 1 7501 table_id: # flags: STMT_END_F +master-bin.000001 7501 Table_map 1 7540 table_id: # (test.t1) +master-bin.000001 7540 Write_rows 1 7574 table_id: # flags: STMT_END_F +master-bin.000001 7574 Table_map 1 7613 table_id: # (test.t1) +master-bin.000001 7613 Write_rows 1 7647 table_id: # flags: STMT_END_F +master-bin.000001 7647 Table_map 1 7686 table_id: # (test.t1) +master-bin.000001 7686 Write_rows 1 7720 table_id: # flags: STMT_END_F +master-bin.000001 7720 Table_map 1 7759 table_id: # (test.t1) +master-bin.000001 7759 Write_rows 1 7793 table_id: # flags: STMT_END_F +master-bin.000001 7793 Table_map 1 7832 table_id: # (test.t1) +master-bin.000001 7832 Write_rows 1 7866 table_id: # flags: STMT_END_F +master-bin.000001 7866 Table_map 1 7905 table_id: # (test.t1) +master-bin.000001 7905 Write_rows 1 7939 table_id: # flags: STMT_END_F +master-bin.000001 7939 Table_map 1 7978 table_id: # (test.t1) +master-bin.000001 7978 Write_rows 1 8012 table_id: # flags: STMT_END_F +master-bin.000001 8012 Table_map 1 8051 table_id: # (test.t1) +master-bin.000001 8051 Write_rows 1 8085 table_id: # flags: STMT_END_F +master-bin.000001 8085 Table_map 1 8124 table_id: # (test.t1) +master-bin.000001 8124 Write_rows 1 8158 table_id: # flags: STMT_END_F +master-bin.000001 8158 Table_map 1 8197 table_id: # (test.t1) +master-bin.000001 8197 Write_rows 1 8231 table_id: # flags: STMT_END_F +master-bin.000001 8231 Table_map 1 8270 table_id: # (test.t1) +master-bin.000001 8270 Write_rows 1 8304 table_id: # flags: STMT_END_F +master-bin.000001 8304 Table_map 1 8343 table_id: # (test.t1) +master-bin.000001 8343 Write_rows 1 8377 table_id: # flags: STMT_END_F +master-bin.000001 8377 Table_map 1 8416 table_id: # (test.t1) +master-bin.000001 8416 Write_rows 1 8450 table_id: # flags: STMT_END_F +master-bin.000001 8450 Table_map 1 8489 table_id: # (test.t1) +master-bin.000001 8489 Write_rows 1 8523 table_id: # flags: STMT_END_F +master-bin.000001 8523 Table_map 1 8562 table_id: # (test.t1) +master-bin.000001 8562 Write_rows 1 8596 table_id: # flags: STMT_END_F +master-bin.000001 8596 Table_map 1 8635 table_id: # (test.t1) +master-bin.000001 8635 Write_rows 1 8669 table_id: # flags: STMT_END_F +master-bin.000001 8669 Table_map 1 8708 table_id: # (test.t1) +master-bin.000001 8708 Write_rows 1 8742 table_id: # flags: STMT_END_F +master-bin.000001 8742 Table_map 1 8781 table_id: # (test.t1) +master-bin.000001 8781 Write_rows 1 8815 table_id: # flags: STMT_END_F +master-bin.000001 8815 Table_map 1 8854 table_id: # (test.t1) +master-bin.000001 8854 Write_rows 1 8888 table_id: # flags: STMT_END_F +master-bin.000001 8888 Table_map 1 8927 table_id: # (test.t1) +master-bin.000001 8927 Write_rows 1 8961 table_id: # flags: STMT_END_F +master-bin.000001 8961 Table_map 1 9000 table_id: # (test.t1) +master-bin.000001 9000 Write_rows 1 9034 table_id: # flags: STMT_END_F +master-bin.000001 9034 Table_map 1 9073 table_id: # (test.t1) +master-bin.000001 9073 Write_rows 1 9107 table_id: # flags: STMT_END_F +master-bin.000001 9107 Table_map 1 9146 table_id: # (test.t1) +master-bin.000001 9146 Write_rows 1 9180 table_id: # flags: STMT_END_F +master-bin.000001 9180 Table_map 1 9219 table_id: # (test.t1) +master-bin.000001 9219 Write_rows 1 9253 table_id: # flags: STMT_END_F +master-bin.000001 9253 Table_map 1 9292 table_id: # (test.t1) +master-bin.000001 9292 Write_rows 1 9326 table_id: # flags: STMT_END_F +master-bin.000001 9326 Table_map 1 9365 table_id: # (test.t1) +master-bin.000001 9365 Write_rows 1 9399 table_id: # flags: STMT_END_F +master-bin.000001 9399 Table_map 1 9438 table_id: # (test.t1) +master-bin.000001 9438 Write_rows 1 9472 table_id: # flags: STMT_END_F +master-bin.000001 9472 Table_map 1 9511 table_id: # (test.t1) +master-bin.000001 9511 Write_rows 1 9545 table_id: # flags: STMT_END_F +master-bin.000001 9545 Table_map 1 9584 table_id: # (test.t1) +master-bin.000001 9584 Write_rows 1 9618 table_id: # flags: STMT_END_F +master-bin.000001 9618 Table_map 1 9657 table_id: # (test.t1) +master-bin.000001 9657 Write_rows 1 9691 table_id: # flags: STMT_END_F +master-bin.000001 9691 Table_map 1 9730 table_id: # (test.t1) +master-bin.000001 9730 Write_rows 1 9764 table_id: # flags: STMT_END_F +master-bin.000001 9764 Table_map 1 9803 table_id: # (test.t1) +master-bin.000001 9803 Write_rows 1 9837 table_id: # flags: STMT_END_F +master-bin.000001 9837 Table_map 1 9876 table_id: # (test.t1) +master-bin.000001 9876 Write_rows 1 9910 table_id: # flags: STMT_END_F +master-bin.000001 9910 Table_map 1 9949 table_id: # (test.t1) +master-bin.000001 9949 Write_rows 1 9983 table_id: # flags: STMT_END_F +master-bin.000001 9983 Table_map 1 10022 table_id: # (test.t1) +master-bin.000001 10022 Write_rows 1 10056 table_id: # flags: STMT_END_F +master-bin.000001 10056 Table_map 1 10095 table_id: # (test.t1) +master-bin.000001 10095 Write_rows 1 10129 table_id: # flags: STMT_END_F +master-bin.000001 10129 Table_map 1 10168 table_id: # (test.t1) +master-bin.000001 10168 Write_rows 1 10202 table_id: # flags: STMT_END_F +master-bin.000001 10202 Table_map 1 10241 table_id: # (test.t1) +master-bin.000001 10241 Write_rows 1 10275 table_id: # flags: STMT_END_F +master-bin.000001 10275 Table_map 1 10314 table_id: # (test.t1) +master-bin.000001 10314 Write_rows 1 10348 table_id: # flags: STMT_END_F +master-bin.000001 10348 Table_map 1 10387 table_id: # (test.t1) +master-bin.000001 10387 Write_rows 1 10421 table_id: # flags: STMT_END_F +master-bin.000001 10421 Table_map 1 10460 table_id: # (test.t1) +master-bin.000001 10460 Write_rows 1 10494 table_id: # flags: STMT_END_F +master-bin.000001 10494 Table_map 1 10533 table_id: # (test.t1) +master-bin.000001 10533 Write_rows 1 10567 table_id: # flags: STMT_END_F +master-bin.000001 10567 Table_map 1 10606 table_id: # (test.t1) +master-bin.000001 10606 Write_rows 1 10640 table_id: # flags: STMT_END_F +master-bin.000001 10640 Table_map 1 10679 table_id: # (test.t1) +master-bin.000001 10679 Write_rows 1 10713 table_id: # flags: STMT_END_F +master-bin.000001 10713 Table_map 1 10752 table_id: # (test.t1) +master-bin.000001 10752 Write_rows 1 10786 table_id: # flags: STMT_END_F +master-bin.000001 10786 Table_map 1 10825 table_id: # (test.t1) +master-bin.000001 10825 Write_rows 1 10859 table_id: # flags: STMT_END_F +master-bin.000001 10859 Table_map 1 10898 table_id: # (test.t1) +master-bin.000001 10898 Write_rows 1 10932 table_id: # flags: STMT_END_F +master-bin.000001 10932 Table_map 1 10971 table_id: # (test.t1) +master-bin.000001 10971 Write_rows 1 11005 table_id: # flags: STMT_END_F +master-bin.000001 11005 Table_map 1 11044 table_id: # (test.t1) +master-bin.000001 11044 Write_rows 1 11078 table_id: # flags: STMT_END_F +master-bin.000001 11078 Table_map 1 11117 table_id: # (test.t1) +master-bin.000001 11117 Write_rows 1 11151 table_id: # flags: STMT_END_F +master-bin.000001 11151 Table_map 1 11190 table_id: # (test.t1) +master-bin.000001 11190 Write_rows 1 11224 table_id: # flags: STMT_END_F +master-bin.000001 11224 Table_map 1 11263 table_id: # (test.t1) +master-bin.000001 11263 Write_rows 1 11297 table_id: # flags: STMT_END_F +master-bin.000001 11297 Table_map 1 11336 table_id: # (test.t1) +master-bin.000001 11336 Write_rows 1 11370 table_id: # flags: STMT_END_F +master-bin.000001 11370 Table_map 1 11409 table_id: # (test.t1) +master-bin.000001 11409 Write_rows 1 11443 table_id: # flags: STMT_END_F +master-bin.000001 11443 Table_map 1 11482 table_id: # (test.t1) +master-bin.000001 11482 Write_rows 1 11516 table_id: # flags: STMT_END_F +master-bin.000001 11516 Table_map 1 11555 table_id: # (test.t1) +master-bin.000001 11555 Write_rows 1 11589 table_id: # flags: STMT_END_F +master-bin.000001 11589 Table_map 1 11628 table_id: # (test.t1) +master-bin.000001 11628 Write_rows 1 11662 table_id: # flags: STMT_END_F +master-bin.000001 11662 Table_map 1 11701 table_id: # (test.t1) +master-bin.000001 11701 Write_rows 1 11735 table_id: # flags: STMT_END_F +master-bin.000001 11735 Table_map 1 11774 table_id: # (test.t1) +master-bin.000001 11774 Write_rows 1 11808 table_id: # flags: STMT_END_F +master-bin.000001 11808 Table_map 1 11847 table_id: # (test.t1) +master-bin.000001 11847 Write_rows 1 11881 table_id: # flags: STMT_END_F +master-bin.000001 11881 Table_map 1 11920 table_id: # (test.t1) +master-bin.000001 11920 Write_rows 1 11954 table_id: # flags: STMT_END_F +master-bin.000001 11954 Table_map 1 11993 table_id: # (test.t1) +master-bin.000001 11993 Write_rows 1 12027 table_id: # flags: STMT_END_F +master-bin.000001 12027 Table_map 1 12066 table_id: # (test.t1) +master-bin.000001 12066 Write_rows 1 12100 table_id: # flags: STMT_END_F +master-bin.000001 12100 Table_map 1 12139 table_id: # (test.t1) +master-bin.000001 12139 Write_rows 1 12173 table_id: # flags: STMT_END_F +master-bin.000001 12173 Table_map 1 12212 table_id: # (test.t1) +master-bin.000001 12212 Write_rows 1 12246 table_id: # flags: STMT_END_F +master-bin.000001 12246 Table_map 1 12285 table_id: # (test.t1) +master-bin.000001 12285 Write_rows 1 12319 table_id: # flags: STMT_END_F +master-bin.000001 12319 Table_map 1 12358 table_id: # (test.t1) +master-bin.000001 12358 Write_rows 1 12392 table_id: # flags: STMT_END_F +master-bin.000001 12392 Table_map 1 12431 table_id: # (test.t1) +master-bin.000001 12431 Write_rows 1 12465 table_id: # flags: STMT_END_F +master-bin.000001 12465 Table_map 1 12504 table_id: # (test.t1) +master-bin.000001 12504 Write_rows 1 12538 table_id: # flags: STMT_END_F +master-bin.000001 12538 Table_map 1 12577 table_id: # (test.t1) +master-bin.000001 12577 Write_rows 1 12611 table_id: # flags: STMT_END_F +master-bin.000001 12611 Table_map 1 12650 table_id: # (test.t1) +master-bin.000001 12650 Write_rows 1 12684 table_id: # flags: STMT_END_F +master-bin.000001 12684 Table_map 1 12723 table_id: # (test.t1) +master-bin.000001 12723 Write_rows 1 12757 table_id: # flags: STMT_END_F +master-bin.000001 12757 Table_map 1 12796 table_id: # (test.t1) +master-bin.000001 12796 Write_rows 1 12830 table_id: # flags: STMT_END_F +master-bin.000001 12830 Table_map 1 12869 table_id: # (test.t1) +master-bin.000001 12869 Write_rows 1 12903 table_id: # flags: STMT_END_F +master-bin.000001 12903 Table_map 1 12942 table_id: # (test.t1) +master-bin.000001 12942 Write_rows 1 12976 table_id: # flags: STMT_END_F +master-bin.000001 12976 Table_map 1 13015 table_id: # (test.t1) +master-bin.000001 13015 Write_rows 1 13049 table_id: # flags: STMT_END_F +master-bin.000001 13049 Table_map 1 13088 table_id: # (test.t1) +master-bin.000001 13088 Write_rows 1 13122 table_id: # flags: STMT_END_F +master-bin.000001 13122 Table_map 1 13161 table_id: # (test.t1) +master-bin.000001 13161 Write_rows 1 13195 table_id: # flags: STMT_END_F +master-bin.000001 13195 Table_map 1 13234 table_id: # (test.t1) +master-bin.000001 13234 Write_rows 1 13268 table_id: # flags: STMT_END_F +master-bin.000001 13268 Table_map 1 13307 table_id: # (test.t1) +master-bin.000001 13307 Write_rows 1 13341 table_id: # flags: STMT_END_F +master-bin.000001 13341 Table_map 1 13380 table_id: # (test.t1) +master-bin.000001 13380 Write_rows 1 13414 table_id: # flags: STMT_END_F +master-bin.000001 13414 Table_map 1 13453 table_id: # (test.t1) +master-bin.000001 13453 Write_rows 1 13487 table_id: # flags: STMT_END_F +master-bin.000001 13487 Table_map 1 13526 table_id: # (test.t1) +master-bin.000001 13526 Write_rows 1 13560 table_id: # flags: STMT_END_F +master-bin.000001 13560 Table_map 1 13599 table_id: # (test.t1) +master-bin.000001 13599 Write_rows 1 13633 table_id: # flags: STMT_END_F +master-bin.000001 13633 Table_map 1 13672 table_id: # (test.t1) +master-bin.000001 13672 Write_rows 1 13706 table_id: # flags: STMT_END_F +master-bin.000001 13706 Table_map 1 13745 table_id: # (test.t1) +master-bin.000001 13745 Write_rows 1 13779 table_id: # flags: STMT_END_F +master-bin.000001 13779 Table_map 1 13818 table_id: # (test.t1) +master-bin.000001 13818 Write_rows 1 13852 table_id: # flags: STMT_END_F +master-bin.000001 13852 Table_map 1 13891 table_id: # (test.t1) +master-bin.000001 13891 Write_rows 1 13925 table_id: # flags: STMT_END_F +master-bin.000001 13925 Table_map 1 13964 table_id: # (test.t1) +master-bin.000001 13964 Write_rows 1 13998 table_id: # flags: STMT_END_F +master-bin.000001 13998 Table_map 1 14037 table_id: # (test.t1) +master-bin.000001 14037 Write_rows 1 14071 table_id: # flags: STMT_END_F +master-bin.000001 14071 Table_map 1 14110 table_id: # (test.t1) +master-bin.000001 14110 Write_rows 1 14144 table_id: # flags: STMT_END_F +master-bin.000001 14144 Table_map 1 14183 table_id: # (test.t1) +master-bin.000001 14183 Write_rows 1 14217 table_id: # flags: STMT_END_F +master-bin.000001 14217 Table_map 1 14256 table_id: # (test.t1) +master-bin.000001 14256 Write_rows 1 14290 table_id: # flags: STMT_END_F +master-bin.000001 14290 Table_map 1 14329 table_id: # (test.t1) +master-bin.000001 14329 Write_rows 1 14363 table_id: # flags: STMT_END_F +master-bin.000001 14363 Table_map 1 14402 table_id: # (test.t1) +master-bin.000001 14402 Write_rows 1 14436 table_id: # flags: STMT_END_F +master-bin.000001 14436 Table_map 1 14475 table_id: # (test.t1) +master-bin.000001 14475 Write_rows 1 14509 table_id: # flags: STMT_END_F +master-bin.000001 14509 Table_map 1 14548 table_id: # (test.t1) +master-bin.000001 14548 Write_rows 1 14582 table_id: # flags: STMT_END_F +master-bin.000001 14582 Table_map 1 14621 table_id: # (test.t1) +master-bin.000001 14621 Write_rows 1 14655 table_id: # flags: STMT_END_F +master-bin.000001 14655 Table_map 1 14694 table_id: # (test.t1) +master-bin.000001 14694 Write_rows 1 14728 table_id: # flags: STMT_END_F +master-bin.000001 14728 Table_map 1 14767 table_id: # (test.t1) +master-bin.000001 14767 Write_rows 1 14801 table_id: # flags: STMT_END_F +master-bin.000001 14801 Table_map 1 14840 table_id: # (test.t1) +master-bin.000001 14840 Write_rows 1 14874 table_id: # flags: STMT_END_F +master-bin.000001 14874 Table_map 1 14913 table_id: # (test.t1) +master-bin.000001 14913 Write_rows 1 14947 table_id: # flags: STMT_END_F +master-bin.000001 14947 Table_map 1 14986 table_id: # (test.t1) +master-bin.000001 14986 Write_rows 1 15020 table_id: # flags: STMT_END_F +master-bin.000001 15020 Table_map 1 15059 table_id: # (test.t1) +master-bin.000001 15059 Write_rows 1 15093 table_id: # flags: STMT_END_F +master-bin.000001 15093 Table_map 1 15132 table_id: # (test.t1) +master-bin.000001 15132 Write_rows 1 15166 table_id: # flags: STMT_END_F +master-bin.000001 15166 Table_map 1 15205 table_id: # (test.t1) +master-bin.000001 15205 Write_rows 1 15239 table_id: # flags: STMT_END_F +master-bin.000001 15239 Table_map 1 15278 table_id: # (test.t1) +master-bin.000001 15278 Write_rows 1 15312 table_id: # flags: STMT_END_F +master-bin.000001 15312 Table_map 1 15351 table_id: # (test.t1) +master-bin.000001 15351 Write_rows 1 15385 table_id: # flags: STMT_END_F +master-bin.000001 15385 Table_map 1 15424 table_id: # (test.t1) +master-bin.000001 15424 Write_rows 1 15458 table_id: # flags: STMT_END_F +master-bin.000001 15458 Table_map 1 15497 table_id: # (test.t1) +master-bin.000001 15497 Write_rows 1 15531 table_id: # flags: STMT_END_F +master-bin.000001 15531 Table_map 1 15570 table_id: # (test.t1) +master-bin.000001 15570 Write_rows 1 15604 table_id: # flags: STMT_END_F +master-bin.000001 15604 Table_map 1 15643 table_id: # (test.t1) +master-bin.000001 15643 Write_rows 1 15677 table_id: # flags: STMT_END_F +master-bin.000001 15677 Table_map 1 15716 table_id: # (test.t1) +master-bin.000001 15716 Write_rows 1 15750 table_id: # flags: STMT_END_F +master-bin.000001 15750 Table_map 1 15789 table_id: # (test.t1) +master-bin.000001 15789 Write_rows 1 15823 table_id: # flags: STMT_END_F +master-bin.000001 15823 Table_map 1 15862 table_id: # (test.t1) +master-bin.000001 15862 Write_rows 1 15896 table_id: # flags: STMT_END_F +master-bin.000001 15896 Table_map 1 15935 table_id: # (test.t1) +master-bin.000001 15935 Write_rows 1 15969 table_id: # flags: STMT_END_F +master-bin.000001 15969 Table_map 1 16008 table_id: # (test.t1) +master-bin.000001 16008 Write_rows 1 16042 table_id: # flags: STMT_END_F +master-bin.000001 16042 Table_map 1 16081 table_id: # (test.t1) +master-bin.000001 16081 Write_rows 1 16115 table_id: # flags: STMT_END_F +master-bin.000001 16115 Table_map 1 16154 table_id: # (test.t1) +master-bin.000001 16154 Write_rows 1 16188 table_id: # flags: STMT_END_F +master-bin.000001 16188 Table_map 1 16227 table_id: # (test.t1) +master-bin.000001 16227 Write_rows 1 16261 table_id: # flags: STMT_END_F +master-bin.000001 16261 Table_map 1 16300 table_id: # (test.t1) +master-bin.000001 16300 Write_rows 1 16334 table_id: # flags: STMT_END_F +master-bin.000001 16334 Table_map 1 16373 table_id: # (test.t1) +master-bin.000001 16373 Write_rows 1 16407 table_id: # flags: STMT_END_F +master-bin.000001 16407 Table_map 1 16446 table_id: # (test.t1) +master-bin.000001 16446 Write_rows 1 16480 table_id: # flags: STMT_END_F +master-bin.000001 16480 Table_map 1 16519 table_id: # (test.t1) +master-bin.000001 16519 Write_rows 1 16553 table_id: # flags: STMT_END_F +master-bin.000001 16553 Table_map 1 16592 table_id: # (test.t1) +master-bin.000001 16592 Write_rows 1 16626 table_id: # flags: STMT_END_F +master-bin.000001 16626 Table_map 1 16665 table_id: # (test.t1) +master-bin.000001 16665 Write_rows 1 16699 table_id: # flags: STMT_END_F +master-bin.000001 16699 Table_map 1 16738 table_id: # (test.t1) +master-bin.000001 16738 Write_rows 1 16772 table_id: # flags: STMT_END_F +master-bin.000001 16772 Table_map 1 16811 table_id: # (test.t1) +master-bin.000001 16811 Write_rows 1 16845 table_id: # flags: STMT_END_F +master-bin.000001 16845 Table_map 1 16884 table_id: # (test.t1) +master-bin.000001 16884 Write_rows 1 16918 table_id: # flags: STMT_END_F +master-bin.000001 16918 Table_map 1 16957 table_id: # (test.t1) +master-bin.000001 16957 Write_rows 1 16991 table_id: # flags: STMT_END_F +master-bin.000001 16991 Table_map 1 17030 table_id: # (test.t1) +master-bin.000001 17030 Write_rows 1 17064 table_id: # flags: STMT_END_F +master-bin.000001 17064 Table_map 1 17103 table_id: # (test.t1) +master-bin.000001 17103 Write_rows 1 17137 table_id: # flags: STMT_END_F +master-bin.000001 17137 Table_map 1 17176 table_id: # (test.t1) +master-bin.000001 17176 Write_rows 1 17210 table_id: # flags: STMT_END_F +master-bin.000001 17210 Table_map 1 17249 table_id: # (test.t1) +master-bin.000001 17249 Write_rows 1 17283 table_id: # flags: STMT_END_F +master-bin.000001 17283 Table_map 1 17322 table_id: # (test.t1) +master-bin.000001 17322 Write_rows 1 17356 table_id: # flags: STMT_END_F +master-bin.000001 17356 Table_map 1 17395 table_id: # (test.t1) +master-bin.000001 17395 Write_rows 1 17429 table_id: # flags: STMT_END_F +master-bin.000001 17429 Table_map 1 17468 table_id: # (test.t1) +master-bin.000001 17468 Write_rows 1 17502 table_id: # flags: STMT_END_F +master-bin.000001 17502 Table_map 1 17541 table_id: # (test.t1) +master-bin.000001 17541 Write_rows 1 17575 table_id: # flags: STMT_END_F +master-bin.000001 17575 Table_map 1 17614 table_id: # (test.t1) +master-bin.000001 17614 Write_rows 1 17648 table_id: # flags: STMT_END_F +master-bin.000001 17648 Table_map 1 17687 table_id: # (test.t1) +master-bin.000001 17687 Write_rows 1 17721 table_id: # flags: STMT_END_F +master-bin.000001 17721 Table_map 1 17760 table_id: # (test.t1) +master-bin.000001 17760 Write_rows 1 17794 table_id: # flags: STMT_END_F +master-bin.000001 17794 Table_map 1 17833 table_id: # (test.t1) +master-bin.000001 17833 Write_rows 1 17867 table_id: # flags: STMT_END_F +master-bin.000001 17867 Table_map 1 17906 table_id: # (test.t1) +master-bin.000001 17906 Write_rows 1 17940 table_id: # flags: STMT_END_F +master-bin.000001 17940 Table_map 1 17979 table_id: # (test.t1) +master-bin.000001 17979 Write_rows 1 18013 table_id: # flags: STMT_END_F +master-bin.000001 18013 Table_map 1 18052 table_id: # (test.t1) +master-bin.000001 18052 Write_rows 1 18086 table_id: # flags: STMT_END_F +master-bin.000001 18086 Table_map 1 18125 table_id: # (test.t1) +master-bin.000001 18125 Write_rows 1 18159 table_id: # flags: STMT_END_F +master-bin.000001 18159 Table_map 1 18198 table_id: # (test.t1) +master-bin.000001 18198 Write_rows 1 18232 table_id: # flags: STMT_END_F +master-bin.000001 18232 Table_map 1 18271 table_id: # (test.t1) +master-bin.000001 18271 Write_rows 1 18305 table_id: # flags: STMT_END_F +master-bin.000001 18305 Table_map 1 18344 table_id: # (test.t1) +master-bin.000001 18344 Write_rows 1 18378 table_id: # flags: STMT_END_F +master-bin.000001 18378 Table_map 1 18417 table_id: # (test.t1) +master-bin.000001 18417 Write_rows 1 18451 table_id: # flags: STMT_END_F +master-bin.000001 18451 Table_map 1 18490 table_id: # (test.t1) +master-bin.000001 18490 Write_rows 1 18524 table_id: # flags: STMT_END_F +master-bin.000001 18524 Table_map 1 18563 table_id: # (test.t1) +master-bin.000001 18563 Write_rows 1 18597 table_id: # flags: STMT_END_F +master-bin.000001 18597 Table_map 1 18636 table_id: # (test.t1) +master-bin.000001 18636 Write_rows 1 18670 table_id: # flags: STMT_END_F +master-bin.000001 18670 Table_map 1 18709 table_id: # (test.t1) +master-bin.000001 18709 Write_rows 1 18743 table_id: # flags: STMT_END_F +master-bin.000001 18743 Table_map 1 18782 table_id: # (test.t1) +master-bin.000001 18782 Write_rows 1 18816 table_id: # flags: STMT_END_F +master-bin.000001 18816 Table_map 1 18855 table_id: # (test.t1) +master-bin.000001 18855 Write_rows 1 18889 table_id: # flags: STMT_END_F +master-bin.000001 18889 Table_map 1 18928 table_id: # (test.t1) +master-bin.000001 18928 Write_rows 1 18962 table_id: # flags: STMT_END_F +master-bin.000001 18962 Table_map 1 19001 table_id: # (test.t1) +master-bin.000001 19001 Write_rows 1 19035 table_id: # flags: STMT_END_F +master-bin.000001 19035 Table_map 1 19074 table_id: # (test.t1) +master-bin.000001 19074 Write_rows 1 19108 table_id: # flags: STMT_END_F +master-bin.000001 19108 Table_map 1 19147 table_id: # (test.t1) +master-bin.000001 19147 Write_rows 1 19181 table_id: # flags: STMT_END_F +master-bin.000001 19181 Table_map 1 19220 table_id: # (test.t1) +master-bin.000001 19220 Write_rows 1 19254 table_id: # flags: STMT_END_F +master-bin.000001 19254 Table_map 1 19293 table_id: # (test.t1) +master-bin.000001 19293 Write_rows 1 19327 table_id: # flags: STMT_END_F +master-bin.000001 19327 Table_map 1 19366 table_id: # (test.t1) +master-bin.000001 19366 Write_rows 1 19400 table_id: # flags: STMT_END_F +master-bin.000001 19400 Table_map 1 19439 table_id: # (test.t1) +master-bin.000001 19439 Write_rows 1 19473 table_id: # flags: STMT_END_F +master-bin.000001 19473 Table_map 1 19512 table_id: # (test.t1) +master-bin.000001 19512 Write_rows 1 19546 table_id: # flags: STMT_END_F +master-bin.000001 19546 Table_map 1 19585 table_id: # (test.t1) +master-bin.000001 19585 Write_rows 1 19619 table_id: # flags: STMT_END_F +master-bin.000001 19619 Table_map 1 19658 table_id: # (test.t1) +master-bin.000001 19658 Write_rows 1 19692 table_id: # flags: STMT_END_F +master-bin.000001 19692 Table_map 1 19731 table_id: # (test.t1) +master-bin.000001 19731 Write_rows 1 19765 table_id: # flags: STMT_END_F +master-bin.000001 19765 Table_map 1 19804 table_id: # (test.t1) +master-bin.000001 19804 Write_rows 1 19838 table_id: # flags: STMT_END_F +master-bin.000001 19838 Table_map 1 19877 table_id: # (test.t1) +master-bin.000001 19877 Write_rows 1 19911 table_id: # flags: STMT_END_F +master-bin.000001 19911 Table_map 1 19950 table_id: # (test.t1) +master-bin.000001 19950 Write_rows 1 19984 table_id: # flags: STMT_END_F +master-bin.000001 19984 Table_map 1 20023 table_id: # (test.t1) +master-bin.000001 20023 Write_rows 1 20057 table_id: # flags: STMT_END_F +master-bin.000001 20057 Table_map 1 20096 table_id: # (test.t1) +master-bin.000001 20096 Write_rows 1 20130 table_id: # flags: STMT_END_F +master-bin.000001 20130 Table_map 1 20169 table_id: # (test.t1) +master-bin.000001 20169 Write_rows 1 20203 table_id: # flags: STMT_END_F +master-bin.000001 20203 Table_map 1 20242 table_id: # (test.t1) +master-bin.000001 20242 Write_rows 1 20276 table_id: # flags: STMT_END_F +master-bin.000001 20276 Table_map 1 20315 table_id: # (test.t1) +master-bin.000001 20315 Write_rows 1 20349 table_id: # flags: STMT_END_F +master-bin.000001 20349 Table_map 1 20388 table_id: # (test.t1) +master-bin.000001 20388 Write_rows 1 20422 table_id: # flags: STMT_END_F +master-bin.000001 20422 Table_map 1 20461 table_id: # (test.t1) +master-bin.000001 20461 Write_rows 1 20495 table_id: # flags: STMT_END_F +master-bin.000001 20495 Table_map 1 20534 table_id: # (test.t1) +master-bin.000001 20534 Write_rows 1 20568 table_id: # flags: STMT_END_F +master-bin.000001 20568 Table_map 1 20607 table_id: # (test.t1) +master-bin.000001 20607 Write_rows 1 20641 table_id: # flags: STMT_END_F +master-bin.000001 20641 Table_map 1 20680 table_id: # (test.t1) +master-bin.000001 20680 Write_rows 1 20714 table_id: # flags: STMT_END_F +master-bin.000001 20714 Table_map 1 20753 table_id: # (test.t1) +master-bin.000001 20753 Write_rows 1 20787 table_id: # flags: STMT_END_F +master-bin.000001 20787 Table_map 1 20826 table_id: # (test.t1) +master-bin.000001 20826 Write_rows 1 20860 table_id: # flags: STMT_END_F +master-bin.000001 20860 Table_map 1 20899 table_id: # (test.t1) +master-bin.000001 20899 Write_rows 1 20933 table_id: # flags: STMT_END_F +master-bin.000001 20933 Table_map 1 20972 table_id: # (test.t1) +master-bin.000001 20972 Write_rows 1 21006 table_id: # flags: STMT_END_F +master-bin.000001 21006 Table_map 1 21045 table_id: # (test.t1) +master-bin.000001 21045 Write_rows 1 21079 table_id: # flags: STMT_END_F +master-bin.000001 21079 Table_map 1 21118 table_id: # (test.t1) +master-bin.000001 21118 Write_rows 1 21152 table_id: # flags: STMT_END_F +master-bin.000001 21152 Table_map 1 21191 table_id: # (test.t1) +master-bin.000001 21191 Write_rows 1 21225 table_id: # flags: STMT_END_F +master-bin.000001 21225 Table_map 1 21264 table_id: # (test.t1) +master-bin.000001 21264 Write_rows 1 21298 table_id: # flags: STMT_END_F +master-bin.000001 21298 Table_map 1 21337 table_id: # (test.t1) +master-bin.000001 21337 Write_rows 1 21371 table_id: # flags: STMT_END_F +master-bin.000001 21371 Table_map 1 21410 table_id: # (test.t1) +master-bin.000001 21410 Write_rows 1 21444 table_id: # flags: STMT_END_F +master-bin.000001 21444 Table_map 1 21483 table_id: # (test.t1) +master-bin.000001 21483 Write_rows 1 21517 table_id: # flags: STMT_END_F +master-bin.000001 21517 Table_map 1 21556 table_id: # (test.t1) +master-bin.000001 21556 Write_rows 1 21590 table_id: # flags: STMT_END_F +master-bin.000001 21590 Table_map 1 21629 table_id: # (test.t1) +master-bin.000001 21629 Write_rows 1 21663 table_id: # flags: STMT_END_F +master-bin.000001 21663 Table_map 1 21702 table_id: # (test.t1) +master-bin.000001 21702 Write_rows 1 21736 table_id: # flags: STMT_END_F +master-bin.000001 21736 Table_map 1 21775 table_id: # (test.t1) +master-bin.000001 21775 Write_rows 1 21809 table_id: # flags: STMT_END_F +master-bin.000001 21809 Table_map 1 21848 table_id: # (test.t1) +master-bin.000001 21848 Write_rows 1 21882 table_id: # flags: STMT_END_F +master-bin.000001 21882 Table_map 1 21921 table_id: # (test.t1) +master-bin.000001 21921 Write_rows 1 21955 table_id: # flags: STMT_END_F +master-bin.000001 21955 Table_map 1 21994 table_id: # (test.t1) +master-bin.000001 21994 Write_rows 1 22028 table_id: # flags: STMT_END_F +master-bin.000001 22028 Table_map 1 22067 table_id: # (test.t1) +master-bin.000001 22067 Write_rows 1 22101 table_id: # flags: STMT_END_F +master-bin.000001 22101 Table_map 1 22140 table_id: # (test.t1) +master-bin.000001 22140 Write_rows 1 22174 table_id: # flags: STMT_END_F +master-bin.000001 22174 Table_map 1 22213 table_id: # (test.t1) +master-bin.000001 22213 Write_rows 1 22247 table_id: # flags: STMT_END_F +master-bin.000001 22247 Table_map 1 22286 table_id: # (test.t1) +master-bin.000001 22286 Write_rows 1 22320 table_id: # flags: STMT_END_F +master-bin.000001 22320 Table_map 1 22359 table_id: # (test.t1) +master-bin.000001 22359 Write_rows 1 22393 table_id: # flags: STMT_END_F +master-bin.000001 22393 Table_map 1 22432 table_id: # (test.t1) +master-bin.000001 22432 Write_rows 1 22466 table_id: # flags: STMT_END_F +master-bin.000001 22466 Table_map 1 22505 table_id: # (test.t1) +master-bin.000001 22505 Write_rows 1 22539 table_id: # flags: STMT_END_F +master-bin.000001 22539 Table_map 1 22578 table_id: # (test.t1) +master-bin.000001 22578 Write_rows 1 22612 table_id: # flags: STMT_END_F +master-bin.000001 22612 Table_map 1 22651 table_id: # (test.t1) +master-bin.000001 22651 Write_rows 1 22685 table_id: # flags: STMT_END_F +master-bin.000001 22685 Table_map 1 22724 table_id: # (test.t1) +master-bin.000001 22724 Write_rows 1 22758 table_id: # flags: STMT_END_F +master-bin.000001 22758 Table_map 1 22797 table_id: # (test.t1) +master-bin.000001 22797 Write_rows 1 22831 table_id: # flags: STMT_END_F +master-bin.000001 22831 Table_map 1 22870 table_id: # (test.t1) +master-bin.000001 22870 Write_rows 1 22904 table_id: # flags: STMT_END_F +master-bin.000001 22904 Table_map 1 22943 table_id: # (test.t1) +master-bin.000001 22943 Write_rows 1 22977 table_id: # flags: STMT_END_F +master-bin.000001 22977 Table_map 1 23016 table_id: # (test.t1) +master-bin.000001 23016 Write_rows 1 23050 table_id: # flags: STMT_END_F +master-bin.000001 23050 Table_map 1 23089 table_id: # (test.t1) +master-bin.000001 23089 Write_rows 1 23123 table_id: # flags: STMT_END_F +master-bin.000001 23123 Table_map 1 23162 table_id: # (test.t1) +master-bin.000001 23162 Write_rows 1 23196 table_id: # flags: STMT_END_F +master-bin.000001 23196 Table_map 1 23235 table_id: # (test.t1) +master-bin.000001 23235 Write_rows 1 23269 table_id: # flags: STMT_END_F +master-bin.000001 23269 Table_map 1 23308 table_id: # (test.t1) +master-bin.000001 23308 Write_rows 1 23342 table_id: # flags: STMT_END_F +master-bin.000001 23342 Table_map 1 23381 table_id: # (test.t1) +master-bin.000001 23381 Write_rows 1 23415 table_id: # flags: STMT_END_F +master-bin.000001 23415 Table_map 1 23454 table_id: # (test.t1) +master-bin.000001 23454 Write_rows 1 23488 table_id: # flags: STMT_END_F +master-bin.000001 23488 Table_map 1 23527 table_id: # (test.t1) +master-bin.000001 23527 Write_rows 1 23561 table_id: # flags: STMT_END_F +master-bin.000001 23561 Table_map 1 23600 table_id: # (test.t1) +master-bin.000001 23600 Write_rows 1 23634 table_id: # flags: STMT_END_F +master-bin.000001 23634 Table_map 1 23673 table_id: # (test.t1) +master-bin.000001 23673 Write_rows 1 23707 table_id: # flags: STMT_END_F +master-bin.000001 23707 Table_map 1 23746 table_id: # (test.t1) +master-bin.000001 23746 Write_rows 1 23780 table_id: # flags: STMT_END_F +master-bin.000001 23780 Table_map 1 23819 table_id: # (test.t1) +master-bin.000001 23819 Write_rows 1 23853 table_id: # flags: STMT_END_F +master-bin.000001 23853 Table_map 1 23892 table_id: # (test.t1) +master-bin.000001 23892 Write_rows 1 23926 table_id: # flags: STMT_END_F +master-bin.000001 23926 Table_map 1 23965 table_id: # (test.t1) +master-bin.000001 23965 Write_rows 1 23999 table_id: # flags: STMT_END_F +master-bin.000001 23999 Table_map 1 24038 table_id: # (test.t1) +master-bin.000001 24038 Write_rows 1 24072 table_id: # flags: STMT_END_F +master-bin.000001 24072 Table_map 1 24111 table_id: # (test.t1) +master-bin.000001 24111 Write_rows 1 24145 table_id: # flags: STMT_END_F +master-bin.000001 24145 Table_map 1 24184 table_id: # (test.t1) +master-bin.000001 24184 Write_rows 1 24218 table_id: # flags: STMT_END_F +master-bin.000001 24218 Table_map 1 24257 table_id: # (test.t1) +master-bin.000001 24257 Write_rows 1 24291 table_id: # flags: STMT_END_F +master-bin.000001 24291 Table_map 1 24330 table_id: # (test.t1) +master-bin.000001 24330 Write_rows 1 24364 table_id: # flags: STMT_END_F +master-bin.000001 24364 Table_map 1 24403 table_id: # (test.t1) +master-bin.000001 24403 Write_rows 1 24437 table_id: # flags: STMT_END_F +master-bin.000001 24437 Table_map 1 24476 table_id: # (test.t1) +master-bin.000001 24476 Write_rows 1 24510 table_id: # flags: STMT_END_F +master-bin.000001 24510 Table_map 1 24549 table_id: # (test.t1) +master-bin.000001 24549 Write_rows 1 24583 table_id: # flags: STMT_END_F +master-bin.000001 24583 Table_map 1 24622 table_id: # (test.t1) +master-bin.000001 24622 Write_rows 1 24656 table_id: # flags: STMT_END_F +master-bin.000001 24656 Table_map 1 24695 table_id: # (test.t1) +master-bin.000001 24695 Write_rows 1 24729 table_id: # flags: STMT_END_F +master-bin.000001 24729 Table_map 1 24768 table_id: # (test.t1) +master-bin.000001 24768 Write_rows 1 24802 table_id: # flags: STMT_END_F +master-bin.000001 24802 Table_map 1 24841 table_id: # (test.t1) +master-bin.000001 24841 Write_rows 1 24875 table_id: # flags: STMT_END_F +master-bin.000001 24875 Table_map 1 24914 table_id: # (test.t1) +master-bin.000001 24914 Write_rows 1 24948 table_id: # flags: STMT_END_F +master-bin.000001 24948 Table_map 1 24987 table_id: # (test.t1) +master-bin.000001 24987 Write_rows 1 25021 table_id: # flags: STMT_END_F +master-bin.000001 25021 Table_map 1 25060 table_id: # (test.t1) +master-bin.000001 25060 Write_rows 1 25094 table_id: # flags: STMT_END_F +master-bin.000001 25094 Table_map 1 25133 table_id: # (test.t1) +master-bin.000001 25133 Write_rows 1 25167 table_id: # flags: STMT_END_F +master-bin.000001 25167 Table_map 1 25206 table_id: # (test.t1) +master-bin.000001 25206 Write_rows 1 25240 table_id: # flags: STMT_END_F +master-bin.000001 25240 Table_map 1 25279 table_id: # (test.t1) +master-bin.000001 25279 Write_rows 1 25313 table_id: # flags: STMT_END_F +master-bin.000001 25313 Table_map 1 25352 table_id: # (test.t1) +master-bin.000001 25352 Write_rows 1 25386 table_id: # flags: STMT_END_F +master-bin.000001 25386 Table_map 1 25425 table_id: # (test.t1) +master-bin.000001 25425 Write_rows 1 25459 table_id: # flags: STMT_END_F +master-bin.000001 25459 Table_map 1 25498 table_id: # (test.t1) +master-bin.000001 25498 Write_rows 1 25532 table_id: # flags: STMT_END_F +master-bin.000001 25532 Table_map 1 25571 table_id: # (test.t1) +master-bin.000001 25571 Write_rows 1 25605 table_id: # flags: STMT_END_F +master-bin.000001 25605 Table_map 1 25644 table_id: # (test.t1) +master-bin.000001 25644 Write_rows 1 25678 table_id: # flags: STMT_END_F +master-bin.000001 25678 Table_map 1 25717 table_id: # (test.t1) +master-bin.000001 25717 Write_rows 1 25751 table_id: # flags: STMT_END_F +master-bin.000001 25751 Table_map 1 25790 table_id: # (test.t1) +master-bin.000001 25790 Write_rows 1 25824 table_id: # flags: STMT_END_F +master-bin.000001 25824 Table_map 1 25863 table_id: # (test.t1) +master-bin.000001 25863 Write_rows 1 25897 table_id: # flags: STMT_END_F +master-bin.000001 25897 Table_map 1 25936 table_id: # (test.t1) +master-bin.000001 25936 Write_rows 1 25970 table_id: # flags: STMT_END_F +master-bin.000001 25970 Table_map 1 26009 table_id: # (test.t1) +master-bin.000001 26009 Write_rows 1 26043 table_id: # flags: STMT_END_F +master-bin.000001 26043 Table_map 1 26082 table_id: # (test.t1) +master-bin.000001 26082 Write_rows 1 26116 table_id: # flags: STMT_END_F +master-bin.000001 26116 Table_map 1 26155 table_id: # (test.t1) +master-bin.000001 26155 Write_rows 1 26189 table_id: # flags: STMT_END_F +master-bin.000001 26189 Table_map 1 26228 table_id: # (test.t1) +master-bin.000001 26228 Write_rows 1 26262 table_id: # flags: STMT_END_F +master-bin.000001 26262 Table_map 1 26301 table_id: # (test.t1) +master-bin.000001 26301 Write_rows 1 26335 table_id: # flags: STMT_END_F +master-bin.000001 26335 Table_map 1 26374 table_id: # (test.t1) +master-bin.000001 26374 Write_rows 1 26408 table_id: # flags: STMT_END_F +master-bin.000001 26408 Table_map 1 26447 table_id: # (test.t1) +master-bin.000001 26447 Write_rows 1 26481 table_id: # flags: STMT_END_F +master-bin.000001 26481 Table_map 1 26520 table_id: # (test.t1) +master-bin.000001 26520 Write_rows 1 26554 table_id: # flags: STMT_END_F +master-bin.000001 26554 Table_map 1 26593 table_id: # (test.t1) +master-bin.000001 26593 Write_rows 1 26627 table_id: # flags: STMT_END_F +master-bin.000001 26627 Table_map 1 26666 table_id: # (test.t1) +master-bin.000001 26666 Write_rows 1 26700 table_id: # flags: STMT_END_F +master-bin.000001 26700 Table_map 1 26739 table_id: # (test.t1) +master-bin.000001 26739 Write_rows 1 26773 table_id: # flags: STMT_END_F +master-bin.000001 26773 Table_map 1 26812 table_id: # (test.t1) +master-bin.000001 26812 Write_rows 1 26846 table_id: # flags: STMT_END_F +master-bin.000001 26846 Table_map 1 26885 table_id: # (test.t1) +master-bin.000001 26885 Write_rows 1 26919 table_id: # flags: STMT_END_F +master-bin.000001 26919 Table_map 1 26958 table_id: # (test.t1) +master-bin.000001 26958 Write_rows 1 26992 table_id: # flags: STMT_END_F +master-bin.000001 26992 Table_map 1 27031 table_id: # (test.t1) +master-bin.000001 27031 Write_rows 1 27065 table_id: # flags: STMT_END_F +master-bin.000001 27065 Table_map 1 27104 table_id: # (test.t1) +master-bin.000001 27104 Write_rows 1 27138 table_id: # flags: STMT_END_F +master-bin.000001 27138 Table_map 1 27177 table_id: # (test.t1) +master-bin.000001 27177 Write_rows 1 27211 table_id: # flags: STMT_END_F +master-bin.000001 27211 Table_map 1 27250 table_id: # (test.t1) +master-bin.000001 27250 Write_rows 1 27284 table_id: # flags: STMT_END_F +master-bin.000001 27284 Table_map 1 27323 table_id: # (test.t1) +master-bin.000001 27323 Write_rows 1 27357 table_id: # flags: STMT_END_F +master-bin.000001 27357 Table_map 1 27396 table_id: # (test.t1) +master-bin.000001 27396 Write_rows 1 27430 table_id: # flags: STMT_END_F +master-bin.000001 27430 Table_map 1 27469 table_id: # (test.t1) +master-bin.000001 27469 Write_rows 1 27503 table_id: # flags: STMT_END_F +master-bin.000001 27503 Table_map 1 27542 table_id: # (test.t1) +master-bin.000001 27542 Write_rows 1 27576 table_id: # flags: STMT_END_F +master-bin.000001 27576 Table_map 1 27615 table_id: # (test.t1) +master-bin.000001 27615 Write_rows 1 27649 table_id: # flags: STMT_END_F +master-bin.000001 27649 Table_map 1 27688 table_id: # (test.t1) +master-bin.000001 27688 Write_rows 1 27722 table_id: # flags: STMT_END_F +master-bin.000001 27722 Table_map 1 27761 table_id: # (test.t1) +master-bin.000001 27761 Write_rows 1 27795 table_id: # flags: STMT_END_F +master-bin.000001 27795 Table_map 1 27834 table_id: # (test.t1) +master-bin.000001 27834 Write_rows 1 27868 table_id: # flags: STMT_END_F +master-bin.000001 27868 Table_map 1 27907 table_id: # (test.t1) +master-bin.000001 27907 Write_rows 1 27941 table_id: # flags: STMT_END_F +master-bin.000001 27941 Table_map 1 27980 table_id: # (test.t1) +master-bin.000001 27980 Write_rows 1 28014 table_id: # flags: STMT_END_F +master-bin.000001 28014 Table_map 1 28053 table_id: # (test.t1) +master-bin.000001 28053 Write_rows 1 28087 table_id: # flags: STMT_END_F +master-bin.000001 28087 Table_map 1 28126 table_id: # (test.t1) +master-bin.000001 28126 Write_rows 1 28160 table_id: # flags: STMT_END_F +master-bin.000001 28160 Table_map 1 28199 table_id: # (test.t1) +master-bin.000001 28199 Write_rows 1 28233 table_id: # flags: STMT_END_F +master-bin.000001 28233 Table_map 1 28272 table_id: # (test.t1) +master-bin.000001 28272 Write_rows 1 28306 table_id: # flags: STMT_END_F +master-bin.000001 28306 Table_map 1 28345 table_id: # (test.t1) +master-bin.000001 28345 Write_rows 1 28379 table_id: # flags: STMT_END_F +master-bin.000001 28379 Table_map 1 28418 table_id: # (test.t1) +master-bin.000001 28418 Write_rows 1 28452 table_id: # flags: STMT_END_F +master-bin.000001 28452 Table_map 1 28491 table_id: # (test.t1) +master-bin.000001 28491 Write_rows 1 28525 table_id: # flags: STMT_END_F +master-bin.000001 28525 Table_map 1 28564 table_id: # (test.t1) +master-bin.000001 28564 Write_rows 1 28598 table_id: # flags: STMT_END_F +master-bin.000001 28598 Table_map 1 28637 table_id: # (test.t1) +master-bin.000001 28637 Write_rows 1 28671 table_id: # flags: STMT_END_F +master-bin.000001 28671 Table_map 1 28710 table_id: # (test.t1) +master-bin.000001 28710 Write_rows 1 28744 table_id: # flags: STMT_END_F +master-bin.000001 28744 Table_map 1 28783 table_id: # (test.t1) +master-bin.000001 28783 Write_rows 1 28817 table_id: # flags: STMT_END_F +master-bin.000001 28817 Table_map 1 28856 table_id: # (test.t1) +master-bin.000001 28856 Write_rows 1 28890 table_id: # flags: STMT_END_F +master-bin.000001 28890 Table_map 1 28929 table_id: # (test.t1) +master-bin.000001 28929 Write_rows 1 28963 table_id: # flags: STMT_END_F +master-bin.000001 28963 Table_map 1 29002 table_id: # (test.t1) +master-bin.000001 29002 Write_rows 1 29036 table_id: # flags: STMT_END_F +master-bin.000001 29036 Table_map 1 29075 table_id: # (test.t1) +master-bin.000001 29075 Write_rows 1 29109 table_id: # flags: STMT_END_F +master-bin.000001 29109 Table_map 1 29148 table_id: # (test.t1) +master-bin.000001 29148 Write_rows 1 29182 table_id: # flags: STMT_END_F +master-bin.000001 29182 Table_map 1 29221 table_id: # (test.t1) +master-bin.000001 29221 Write_rows 1 29255 table_id: # flags: STMT_END_F +master-bin.000001 29255 Table_map 1 29294 table_id: # (test.t1) +master-bin.000001 29294 Write_rows 1 29328 table_id: # flags: STMT_END_F +master-bin.000001 29328 Table_map 1 29367 table_id: # (test.t1) +master-bin.000001 29367 Write_rows 1 29401 table_id: # flags: STMT_END_F +master-bin.000001 29401 Table_map 1 29440 table_id: # (test.t1) +master-bin.000001 29440 Write_rows 1 29474 table_id: # flags: STMT_END_F +master-bin.000001 29474 Xid 1 29501 COMMIT /* XID */ master-bin.000001 29501 Rotate 1 29545 master-bin.000002;pos=4 drop table t1; set global binlog_cache_size=@bcs; diff --git a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result index 45fef628357..238cafa6f68 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result @@ -268,7 +268,7 @@ reset master; create table t1 (a int) engine=innodb; show binlog events from 0; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 106 Server ver: 5.1.21-beta-debug-log, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4 master-bin.000001 106 Query 1 206 use `test`; create table t1 (a int) engine=innodb master-bin.000001 206 Query 1 274 use `test`; BEGIN master-bin.000001 274 Query 1 365 use `test`; insert into t1 values( 400 ) @@ -671,7 +671,7 @@ master-bin.000001 36210 Query 1 36299 use `test`; insert into t1 values( 4 ) master-bin.000001 36299 Query 1 36388 use `test`; insert into t1 values( 3 ) master-bin.000001 36388 Query 1 36477 use `test`; insert into t1 values( 2 ) master-bin.000001 36477 Query 1 36566 use `test`; insert into t1 values( 1 ) -master-bin.000001 36566 Xid 1 36593 COMMIT /* xid=196 */ +master-bin.000001 36566 Xid 1 36593 COMMIT /* XID */ master-bin.000001 36593 Rotate 1 36637 master-bin.000002;pos=4 drop table t1; set global binlog_cache_size=@bcs; From 772c7fc59149107f1273cd8e870d40f652b32e48 Mon Sep 17 00:00:00 2001 From: "iggy@amd64.(none)" <> Date: Mon, 2 Jul 2007 14:22:03 -0400 Subject: [PATCH 35/38] Bug#24924 shared-memory-base-name that is too long causes buffer overflow - Testcase fixup. --- mysql-test/t/windows_shm.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/t/windows_shm.test b/mysql-test/t/windows_shm.test index 203471aac56..1c6f05f2da0 100644 --- a/mysql-test/t/windows_shm.test +++ b/mysql-test/t/windows_shm.test @@ -4,6 +4,6 @@ # # Bug #24924: shared-memory-base-name that is too long causes buffer overflow # ---exec $MYSQLADMIN --no-defaults --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ping +--exec $MYSQLADMIN --no-defaults --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX ping --echo End of 5.0 tests. From ee5403110d3f7651ece18f3d2a89258b509616da Mon Sep 17 00:00:00 2001 From: "ramil/ram@mysql.com/ramil.myoffice.izhnet.ru" <> Date: Tue, 3 Jul 2007 17:17:58 +0500 Subject: [PATCH 36/38] Complementary fix for bug #29353: inserting a negative value to a csv table leads to the table corruption New Field::store() method implemented to explicitly set thd->count_cuted_fields before value storing, instead of (incorrectly) setting it in the CSV storage engine. Thread row counter now properly incremented during check and repair in the CSV engine. --- include/mysql/plugin.h | 3 ++- mysql-test/r/csv.result | 2 +- sql/field.cc | 12 ++++++++++++ sql/field.h | 2 ++ sql/mysql_priv.h | 7 +++++++ sql/sql_class.cc | 5 +++++ sql/sql_class.h | 2 -- storage/csv/ha_tina.cc | 11 ++++------- 8 files changed, 33 insertions(+), 11 deletions(-) diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 7b224695324..dd540225deb 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -655,7 +655,8 @@ void **thd_ha_data(const MYSQL_THD thd, const struct handlerton *hton); int thd_tx_isolation(const MYSQL_THD thd); char *thd_security_context(MYSQL_THD thd, char *buffer, unsigned int length, unsigned int max_query_len); - +/* Increments the row counter, see THD::row_count */ +void thd_inc_row_count(MYSQL_THD thd); #ifdef __cplusplus } diff --git a/mysql-test/r/csv.result b/mysql-test/r/csv.result index e7cdd612a25..5076220f74b 100644 --- a/mysql-test/r/csv.result +++ b/mysql-test/r/csv.result @@ -5276,7 +5276,7 @@ drop table t1; create table t1(a int, b int) engine=csv; repair table t1; Table Op Msg_type Msg_text -test.t1 repair Warning Data truncated for column 'a' at row 1 +test.t1 repair Warning Data truncated for column 'a' at row 5 test.t1 repair status OK check table t1; Table Op Msg_type Msg_text diff --git a/sql/field.cc b/sql/field.cc index 55a93ed46d6..332a654c89f 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1360,6 +1360,18 @@ bool Field::send_binary(Protocol *protocol) } +int Field::store(const char *to, uint length, CHARSET_INFO *cs, + enum_check_fields check_level) +{ + int res; + enum_check_fields old_check_level= table->in_use->count_cuted_fields; + table->in_use->count_cuted_fields= check_level; + res= store(to, length, cs); + table->in_use->count_cuted_fields= old_check_level; + return res; +} + + my_decimal *Field::val_decimal(my_decimal *decimal) { /* This never have to be called */ diff --git a/sql/field.h b/sql/field.h index a0fe0f2e57e..ef76cb47d36 100644 --- a/sql/field.h +++ b/sql/field.h @@ -100,6 +100,8 @@ public: virtual int store(longlong nr, bool unsigned_val)=0; virtual int store_decimal(const my_decimal *d)=0; virtual int store_time(MYSQL_TIME *ltime, timestamp_type t_type); + int store(const char *to, uint length, CHARSET_INFO *cs, + enum_check_fields check_level); virtual double val_real(void)=0; virtual longlong val_int(void)=0; virtual my_decimal *val_decimal(my_decimal *); diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 5a50b03282f..9264ca295d9 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -494,6 +494,13 @@ enum enum_parsing_place struct st_table; class THD; +enum enum_check_fields +{ + CHECK_FIELD_IGNORE, + CHECK_FIELD_WARN, + CHECK_FIELD_ERROR_FOR_NULL +}; + /* Struct to handle simple linked lists */ typedef struct st_sql_list { diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 40b37ed7405..e279e23ab69 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -253,6 +253,11 @@ int thd_tx_isolation(const THD *thd) return (int) thd->variables.tx_isolation; } +extern "C" +void thd_inc_row_count(THD *thd) +{ + thd->row_count++; +} /* Dumps a text description of a thread, its security context diff --git a/sql/sql_class.h b/sql/sql_class.h index c46adc62c7c..c3ee71e3297 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -39,8 +39,6 @@ enum enum_ha_read_modes { RFIRST, RNEXT, RPREV, RLAST, RKEY, RNEXT_SAME }; enum enum_duplicates { DUP_ERROR, DUP_REPLACE, DUP_UPDATE }; enum enum_delay_key_write { DELAY_KEY_WRITE_NONE, DELAY_KEY_WRITE_ON, DELAY_KEY_WRITE_ALL }; -enum enum_check_fields -{ CHECK_FIELD_IGNORE, CHECK_FIELD_WARN, CHECK_FIELD_ERROR_FOR_NULL }; enum enum_mark_columns { MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE}; diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index 239d47890ed..2ee96fd5d05 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -45,8 +45,6 @@ TODO: #pragma implementation // gcc: Class implementation #endif -#define MYSQL_SERVER 1 - #include "mysql_priv.h" #include #include "ha_tina.h" @@ -675,7 +673,8 @@ int ha_tina::find_current_row(uchar *buf) if (bitmap_is_set(table->read_set, (*field)->field_index)) { - if ((*field)->store(buffer.ptr(), buffer.length(), buffer.charset())) + if ((*field)->store(buffer.ptr(), buffer.length(), buffer.charset(), + CHECK_FIELD_WARN)) goto err; } } @@ -1002,7 +1001,6 @@ int ha_tina::delete_row(const uchar * buf) int ha_tina::rnd_init(bool scan) { - THD *thd= table ? table->in_use : current_thd; DBUG_ENTER("ha_tina::rnd_init"); /* set buffer to the beginning of the file */ @@ -1014,7 +1012,6 @@ int ha_tina::rnd_init(bool scan) stats.records= 0; records_is_known= 0; chain_ptr= chain; - thd->count_cuted_fields= CHECK_FIELD_WARN; // To find wrong values DBUG_RETURN(0); } @@ -1298,9 +1295,9 @@ int ha_tina::repair(THD* thd, HA_CHECK_OPT* check_opt) current_position= next_position= 0; /* Read the file row-by-row. If everything is ok, repair is not needed. */ - thd->count_cuted_fields= CHECK_FIELD_WARN; // To find wrong values while (!(rc= find_current_row(buf))) { + thd_inc_row_count(thd); rows_repaired++; current_position= next_position; } @@ -1464,9 +1461,9 @@ int ha_tina::check(THD* thd, HA_CHECK_OPT* check_opt) /* set current position to the beginning of the file */ current_position= next_position= 0; /* Read the file row-by-row. If everything is ok, repair is not needed. */ - thd->count_cuted_fields= CHECK_FIELD_WARN; // To find wrong values while (!(rc= find_current_row(buf))) { + thd_inc_row_count(thd); count--; current_position= next_position; } From 4f49d804cf16828942c8ab6e15071255b141d53b Mon Sep 17 00:00:00 2001 From: "tsmith@sita.local" <> Date: Tue, 3 Jul 2007 19:51:32 -0600 Subject: [PATCH 37/38] rpl_misc_functions.result, rpl_misc_functions.test: work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup --- mysql-test/suite/rpl/r/rpl_misc_functions.result | 2 +- mysql-test/suite/rpl/t/rpl_misc_functions.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_misc_functions.result b/mysql-test/suite/rpl/r/rpl_misc_functions.result index ca7403316b1..94aa1bb61a7 100644 --- a/mysql-test/suite/rpl/r/rpl_misc_functions.result +++ b/mysql-test/suite/rpl/r/rpl_misc_functions.result @@ -48,7 +48,7 @@ where ABS(t1.col_a - t1_slave.col_a) < 0.0001 ; SELECT @aux; @aux 12 +DROP TABLE t1, t1_slave; DROP PROCEDURE test_replication_sp1; DROP PROCEDURE test_replication_sp2; DROP FUNCTION test_replication_sf; -DROP TABLE t1, t1_slave; diff --git a/mysql-test/suite/rpl/t/rpl_misc_functions.test b/mysql-test/suite/rpl/t/rpl_misc_functions.test index b87fff919b2..d56402cbe76 100644 --- a/mysql-test/suite/rpl/t/rpl_misc_functions.test +++ b/mysql-test/suite/rpl/t/rpl_misc_functions.test @@ -104,10 +104,10 @@ if (`SELECT @aux <> 12 OR @aux IS NULL`) # Cleanup connection master; +DROP TABLE t1, t1_slave; DROP PROCEDURE test_replication_sp1; DROP PROCEDURE test_replication_sp2; DROP FUNCTION test_replication_sf; -DROP TABLE t1, t1_slave; --sync_slave_with_master From 3bcf0039a68177a82d1ee330661c102e0615ee8f Mon Sep 17 00:00:00 2001 From: "tsmith@sita.local" <> Date: Wed, 4 Jul 2007 12:26:39 -0600 Subject: [PATCH 38/38] rpl_misc_functions.result, rpl_misc_functions.test: Remove indeterministic behavior from a test --- .../suite/rpl/r/rpl_misc_functions.result | 17 ++++++++------- .../suite/rpl/t/rpl_misc_functions.test | 21 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_misc_functions.result b/mysql-test/suite/rpl/r/rpl_misc_functions.result index 94aa1bb61a7..a8e5520ca8f 100644 --- a/mysql-test/suite/rpl/r/rpl_misc_functions.result +++ b/mysql-test/suite/rpl/r/rpl_misc_functions.result @@ -20,11 +20,12 @@ select * from t1, t2 where (t1.id=t2.id) and not(t1.i=t2.i and t1.r1=t2.r1 and t id i r1 r2 p id i r1 r2 p drop table t1; DROP TABLE IF EXISTS t1; -CREATE TABLE t1 (col_a double default NULL); +CREATE TABLE t1 (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, +col_a DOUBLE DEFAULT NULL); CREATE PROCEDURE test_replication_sp1() BEGIN -INSERT INTO t1 VALUES (rand()), (rand()); -INSERT INTO t1 VALUES (rand()); +INSERT INTO t1 (col_a) VALUES (rand()), (rand()); +INSERT INTO t1 (col_a) VALUES (rand()); END| CREATE PROCEDURE test_replication_sp2() BEGIN @@ -37,14 +38,14 @@ RETURN (rand() + rand()); END| CALL test_replication_sp1(); CALL test_replication_sp2(); -INSERT INTO t1 VALUES (test_replication_sf()); -INSERT INTO t1 VALUES (test_replication_sf()); -INSERT INTO t1 VALUES (test_replication_sf()); +INSERT INTO t1 (col_a) VALUES (test_replication_sf()); +INSERT INTO t1 (col_a) VALUES (test_replication_sf()); +INSERT INTO t1 (col_a) VALUES (test_replication_sf()); select * from t1 into outfile "../tmp/t1_slave.txt"; create temporary table t1_slave select * from t1 where 1=0; load data infile '../tmp/t1_slave.txt' into table t1_slave; -select count(*) into @aux from t1, t1_slave -where ABS(t1.col_a - t1_slave.col_a) < 0.0001 ; +select count(*) into @aux from t1 join t1_slave using (id) +where ABS(t1.col_a - t1_slave.col_a) < 0.0000001 ; SELECT @aux; @aux 12 diff --git a/mysql-test/suite/rpl/t/rpl_misc_functions.test b/mysql-test/suite/rpl/t/rpl_misc_functions.test index d56402cbe76..1c94471c975 100644 --- a/mysql-test/suite/rpl/t/rpl_misc_functions.test +++ b/mysql-test/suite/rpl/t/rpl_misc_functions.test @@ -43,15 +43,16 @@ drop table t1; DROP TABLE IF EXISTS t1; --enable_warnings -CREATE TABLE t1 (col_a double default NULL); +CREATE TABLE t1 (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + col_a DOUBLE DEFAULT NULL); DELIMITER |; # Use a SP that calls rand() multiple times CREATE PROCEDURE test_replication_sp1() BEGIN - INSERT INTO t1 VALUES (rand()), (rand()); - INSERT INTO t1 VALUES (rand()); + INSERT INTO t1 (col_a) VALUES (rand()), (rand()); + INSERT INTO t1 (col_a) VALUES (rand()); END| # Use a SP that calls another SP to call rand() multiple times @@ -73,9 +74,9 @@ DELIMITER ;| # the master to those on the slave. CALL test_replication_sp1(); CALL test_replication_sp2(); -INSERT INTO t1 VALUES (test_replication_sf()); -INSERT INTO t1 VALUES (test_replication_sf()); -INSERT INTO t1 VALUES (test_replication_sf()); +INSERT INTO t1 (col_a) VALUES (test_replication_sf()); +INSERT INTO t1 (col_a) VALUES (test_replication_sf()); +INSERT INTO t1 (col_a) VALUES (test_replication_sf()); --sync_slave_with_master @@ -90,14 +91,14 @@ load data infile '../tmp/t1_slave.txt' into table t1_slave; # Compare master and slave temp table, use subtraction # for floating point comparison of "double" -select count(*) into @aux from t1, t1_slave -where ABS(t1.col_a - t1_slave.col_a) < 0.0001 ; +select count(*) into @aux from t1 join t1_slave using (id) +where ABS(t1.col_a - t1_slave.col_a) < 0.0000001 ; SELECT @aux; if (`SELECT @aux <> 12 OR @aux IS NULL`) { --echo # ERROR: We expected to get count(*) = 12. - SELECT col_a FROM t1; - SELECT col_a FROM t1_slave; + SELECT id, col_a FROM t1; + SELECT id, col_a FROM t1_slave; --echo # abort exit; }