1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-22530: Aborting OPTIMIZE TABLE still logs in binary log and replicates to the Slave server.

Browse Source 
Post push fix to address test issue.
This commit is contained in:
Sujatha 2021-05-18 15:45:43 +05:30
parent acede480c5
commit af8d4a97e2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog/r/binlog_admin_cmd_kill.result
View File

@ -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 # Gtid # # GTID #-#-#
master-bin.000001 # Query # # use `test`; CREATE TABLE t2 (f INT) ENGINE=INNODB master-bin.000001 # Query # # use `test`; CREATE TABLE t2 (f INT) ENGINE=INNODB
DROP TABLE t1,t2; DROP TABLE t1,t2;
FLUSH LOGS; RESET MASTER;
# #
# Kill OPTIMIZE command after table modification # Kill OPTIMIZE command after table modification
# #

5
mysql-test/suite/binlog/t/binlog_admin_cmd_kill.test
View File

@ -56,7 +56,7 @@ SET debug_sync = 'reset';
--source include/show_binlog_events.inc --source include/show_binlog_events.inc
DROP TABLE t1,t2; DROP TABLE t1,t2;
FLUSH LOGS; RESET MASTER;
--echo # --echo #
--echo # Kill OPTIMIZE command after table modification --echo # Kill OPTIMIZE command after table modification
@ -81,6 +81,9 @@ eval KILL $thd_id;
SET debug_sync = 'reset'; SET debug_sync = 'reset';
--disconnect con1 --disconnect con1
--let $wait_binlog_event= OPTIMIZE
--source include/wait_for_binlog_event.inc
DROP TABLE t1,t2; DROP TABLE t1,t2;
let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1); let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
FLUSH LOGS; FLUSH LOGS;