diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_loaddata.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl_log.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_log-slave.opt | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_log.test | 10 |
4 files changed, 13 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result index b42f78f01bd..e93f8487c32 100644 --- a/mysql-test/r/rpl_loaddata.result +++ b/mysql-test/r/rpl_loaddata.result @@ -22,7 +22,7 @@ day id category name 2003-04-22 2416 a bbbbb show binlog events from 898; Log_name Pos Event_type Server_id Orig_log_pos Info -slave-bin.001 898 Query 1 895 use test; insert into t3 select * from t2 +slave-bin.001 898 Query 1 898 use test; insert into t3 select * from t2 drop table t1; drop table t2; drop table t3; diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index fbec0542e4b..26e465f9c3b 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -84,7 +84,7 @@ slave-bin.001 200 Query 1 200 use test; insert into t1 values (NULL) slave-bin.001 263 Query 1 263 use test; drop table t1 slave-bin.001 311 Query 1 311 use test; create table t1 (word char(20) not null) slave-bin.001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=581 -slave-bin.001 1065 Exec_load 1 1056 ;file_id=1 +slave-bin.001 1065 Exec_load 1 1065 ;file_id=1 slave-bin.001 1088 Query 1 1088 use test; drop table t1 slave-bin.001 1136 Query 1 1136 use test; create table t5 (a int) slave-bin.001 1194 Query 1 1194 use test; drop table t5 diff --git a/mysql-test/t/rpl_log-slave.opt b/mysql-test/t/rpl_log-slave.opt new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/mysql-test/t/rpl_log-slave.opt @@ -0,0 +1 @@ + diff --git a/mysql-test/t/rpl_log.test b/mysql-test/t/rpl_log.test index ad962b585a1..e01b3e4e09c 100644 --- a/mysql-test/t/rpl_log.test +++ b/mysql-test/t/rpl_log.test @@ -5,6 +5,16 @@ connection slave; slave stop; reset master; reset slave; +# We are going to read the slave's binlog which contains file_id (for some LOAD +# DATA INFILE); to make it repeatable (not influenced by other tests), we need +# to stop and start the slave, to be sure file_id will start from 1. +# This can be done with 'server_stop slave', but +# this would require the manager, so most of the time the test will be skipped +# :( +# To workaround this, I (Guilhem) add a (empty) rpl_log-slave.opt (because when +# mysql-test-run finds such a file it restarts the slave before doing the +# test). That's not very elegant but I could find no better way, sorry. + let $VERSION=`select version()`; connection master; |