diff options
| author | Sujatha <sujatha.sivakumar@mariadb.com> | 2021-05-18 15:45:43 +0530 |
|---|---|---|
| committer | Sujatha <sujatha.sivakumar@mariadb.com> | 2021-05-19 14:21:49 +0530 |
| commit | af8d4a97e29905f2806e7f26b420ce517e96c723 (patch) | |
| tree | 2adbe2d88c2194d1d20b256e95eb29dac88aabed | |
| parent | acede480c55e42136dcb08a65f16ba4b1a6c958f (diff) | |
| download | mariadb-git-af8d4a97e29905f2806e7f26b420ce517e96c723.tar.gz | |
MDEV-22530: Aborting OPTIMIZE TABLE still logs in binary log and replicates to the Slave server.
Post push fix to address test issue.
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_admin_cmd_kill.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_admin_cmd_kill.test | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_admin_cmd_kill.result b/mysql-test/suite/binlog/r/binlog_admin_cmd_kill.result index a2eb7ee5c0a..d9bfead8dd1 100644 --- a/mysql-test/suite/binlog/r/binlog_admin_cmd_kill.result +++ b/mysql-test/suite/binlog/r/binlog_admin_cmd_kill.result @@ -20,7 +20,7 @@ master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (f INT) ENGINE=INNODB master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Query # # use `test`; CREATE TABLE t2 (f INT) ENGINE=INNODB DROP TABLE t1,t2; -FLUSH LOGS; +RESET MASTER; # # Kill OPTIMIZE command after table modification # diff --git a/mysql-test/suite/binlog/t/binlog_admin_cmd_kill.test b/mysql-test/suite/binlog/t/binlog_admin_cmd_kill.test index 9b248097ae2..e2397f0eab8 100644 --- a/mysql-test/suite/binlog/t/binlog_admin_cmd_kill.test +++ b/mysql-test/suite/binlog/t/binlog_admin_cmd_kill.test @@ -56,7 +56,7 @@ SET debug_sync = 'reset'; --source include/show_binlog_events.inc DROP TABLE t1,t2; -FLUSH LOGS; +RESET MASTER; --echo # --echo # Kill OPTIMIZE command after table modification @@ -81,6 +81,9 @@ eval KILL $thd_id; SET debug_sync = 'reset'; --disconnect con1 +--let $wait_binlog_event= OPTIMIZE +--source include/wait_for_binlog_event.inc + DROP TABLE t1,t2; let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1); FLUSH LOGS; |