diff options
| author | Andrei <andrei.elkin@mariadb.com> | 2022-08-08 12:44:01 +0300 |
|---|---|---|
| committer | Andrei <andrei.elkin@mariadb.com> | 2022-08-08 12:44:01 +0300 |
| commit | cb8010fc9ba2d2d9ff3b96b3655a2cdbad2737dc (patch) | |
| tree | 10e212b48c275f4fd4462130dda15a5e5139b0b7 | |
| parent | 225c885dab5a60b79954d4e98746ffee05b7bf4d (diff) | |
| download | mariadb-git-bb-10.10-andrei.tar.gz | |
MDEV-29078. Merge to 10.10 to account MDEV-19801.bb-10.10-andrei
Also a new test comment line gets corrected.
| -rw-r--r-- | mysql-test/include/reset_slave.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_old_master_29078.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_old_master_29078.test | 8 |
3 files changed, 11 insertions, 5 deletions
diff --git a/mysql-test/include/reset_slave.inc b/mysql-test/include/reset_slave.inc index 89778148f4a..567ec796dd3 100644 --- a/mysql-test/include/reset_slave.inc +++ b/mysql-test/include/reset_slave.inc @@ -6,7 +6,7 @@ # ==== Usage ==== # # [--let $master_use_gtid_option= NO] -# --source include/rpl_reset_slave.inc +# --source include/reset_slave.inc # # Parameters: # $master_use_gtid_option 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 8d9f7e8e789..0b8f8dc7fae 100644 --- a/mysql-test/suite/rpl/r/rpl_old_master_29078.result +++ b/mysql-test/suite/rpl/r/rpl_old_master_29078.result @@ -48,7 +48,7 @@ ROLLBACK /* added by mysqlbinlog */; /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/; connection slave; set global explicit_defaults_for_timestamp=1; -reset slave; +include/reset_slave.inc include/start_slave.inc show create table t1; Table Create Table @@ -69,7 +69,9 @@ NULL NULL drop table t1; include/stop_slave.inc 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 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 b19fd6466e5..0f69ef82ec1 100644 --- a/mysql-test/suite/rpl/t/rpl_old_master_29078.test +++ b/mysql-test/suite/rpl/t/rpl_old_master_29078.test @@ -24,7 +24,9 @@ create table t2 (a timestamp); --connection slave set global explicit_defaults_for_timestamp=1; -reset slave; +--let $master_use_gtid_option= No +--source include/reset_slave.inc + --source include/start_slave.inc --sync_with_master show create table t1; @@ -35,7 +37,9 @@ drop table t1; --source include/stop_slave.inc set global explicit_defaults_for_timestamp=0; -reset slave; +--let $master_use_gtid_option= No +--source include/reset_slave.inc + --source include/start_slave.inc --sync_with_master show create table t1; |