diff options
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_old_master_29078.result | 9 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_old_master_29078.test | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_old_master_29078.result b/mysql-test/suite/rpl/r/rpl_old_master_29078.result index 5adee7f8c0b..fd2c4f18df3 100644 --- a/mysql-test/suite/rpl/r/rpl_old_master_29078.result +++ b/mysql-test/suite/rpl/r/rpl_old_master_29078.result @@ -5,6 +5,7 @@ include/master-slave.inc [connection master] connection slave; include/stop_slave.inc +CHANGE MASTER TO MASTER_USE_GTID=No; connection master; flush binary logs; /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/; @@ -47,7 +48,9 @@ ROLLBACK /* added by mysqlbinlog */; /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/; connection slave; set global explicit_defaults_for_timestamp=0; -reset slave; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' include/start_slave.inc show create table t1; Table Create Table @@ -63,7 +66,9 @@ f1 f2 drop table t1; include/stop_slave.inc set global explicit_defaults_for_timestamp=1; -reset slave; +include/reset_slave.inc +Warnings: +Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' include/start_slave.inc show create table t1; Table Create Table diff --git a/mysql-test/suite/rpl/t/rpl_old_master_29078.test b/mysql-test/suite/rpl/t/rpl_old_master_29078.test index 8b52644a783..8435f5b063a 100644 --- a/mysql-test/suite/rpl/t/rpl_old_master_29078.test +++ b/mysql-test/suite/rpl/t/rpl_old_master_29078.test @@ -7,6 +7,8 @@ --connection slave --source include/stop_slave.inc +--let $master_use_gtid_option=No +eval CHANGE MASTER TO MASTER_USE_GTID=$master_use_gtid_option; --connection master --let $datadir= `SELECT @@datadir` @@ -22,7 +24,7 @@ flush binary logs; --connection slave set global explicit_defaults_for_timestamp=0; -reset slave; +--source include/reset_slave.inc --source include/start_slave.inc --sync_with_master show create table t1; @@ -32,7 +34,7 @@ drop table t1; --source include/stop_slave.inc set global explicit_defaults_for_timestamp=1; -reset slave; +--source include/reset_slave.inc --source include/start_slave.inc --sync_with_master show create table t1; |