MDEV-22530: Aborting OPTIMIZE TABLE still logs in binary log and repl…

…icates to the Slave server. Post push fix to address test issue.
MariaDB · May 19, 2021 · af8d4a9 · af8d4a9
1 parent acede48
commit af8d4a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -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
@@ -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;