database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV 28970: Add RESET MASTER to clear possible remaining binlog from previous test

Browse Source
This commit is contained in:
asklavou
2022-11-07 14:56:09 +00:00
parent 6b91792a08
commit 0ffdcf6784
12 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/main/mysql_upgrade_view.result
View File

@ -1,3 +1,4 @@
reset master;
set sql_log_bin=0; set sql_log_bin=0;
drop table if exists t1,v1,v2,v3,v4,v1badcheck; drop table if exists t1,v1,v2,v3,v4,v1badcheck;
drop view if exists t1,v1,v2,v3,v4,v1badcheck; drop view if exists t1,v1,v2,v3,v4,v1badcheck;

2
mysql-test/main/mysql_upgrade_view.test
View File

@ -1,5 +1,5 @@
-- source include/have_log_bin.inc -- source include/have_log_bin.inc
reset master; # clear binlogs
set sql_log_bin=0; set sql_log_bin=0;
--disable_warnings --disable_warnings
drop table if exists t1,v1,v2,v3,v4,v1badcheck; drop table if exists t1,v1,v2,v3,v4,v1badcheck;

1
mysql-test/main/stat_tables_rbr.result
View File

@ -1,3 +1,4 @@
RESET MASTER;
# #
# Bug mdev-463: assertion failure when running ANALYZE with RBR on # Bug mdev-463: assertion failure when running ANALYZE with RBR on
# #

2
mysql-test/main/stat_tables_rbr.test
View File

@ -1,7 +1,7 @@
--source include/have_binlog_format_row.inc --source include/have_binlog_format_row.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_partition.inc --source include/have_partition.inc
RESET MASTER; # clear up binlogs
--echo # --echo #
--echo # Bug mdev-463: assertion failure when running ANALYZE with RBR on --echo # Bug mdev-463: assertion failure when running ANALYZE with RBR on
--echo # --echo #

1
mysql-test/suite/binlog/r/binlog_stm_binlog.result
View File

@ -1,3 +1,4 @@
reset master;
drop table if exists t1; drop table if exists t1;
create table t1 (a int, b int) engine=innodb; create table t1 (a int, b int) engine=innodb;
begin; begin;

1
mysql-test/suite/binlog/r/binlog_stm_datetime_ranges_mdev15289.result
View File

@ -1,3 +1,4 @@
reset master;
include/show_binlog_events.inc include/show_binlog_events.inc
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Gtid # # GTID #-#-# master-bin.000001 # Gtid # # GTID #-#-#

1
mysql-test/suite/binlog/r/binlog_stm_do_db.result
View File

@ -1,3 +1,4 @@
RESET MASTER;
SET @old_isolation_level= @@session.tx_isolation; SET @old_isolation_level= @@session.tx_isolation;
SET @@session.tx_isolation= 'READ-COMMITTED'; SET @@session.tx_isolation= 'READ-COMMITTED';
CREATE DATABASE b42829; CREATE DATABASE b42829;

1
mysql-test/suite/binlog/r/innodb_autoinc_lock_mode_binlog.result
View File

@ -1,3 +1,4 @@
reset master;
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
select @@innodb_autoinc_lock_mode; select @@innodb_autoinc_lock_mode;
@@innodb_autoinc_lock_mode @@innodb_autoinc_lock_mode

2
mysql-test/suite/binlog/t/binlog_stm_binlog.test
View File

@ -2,7 +2,7 @@
-- source include/have_binlog_format_mixed.inc -- source include/have_binlog_format_mixed.inc
let collation=utf8_unicode_ci; let collation=utf8_unicode_ci;
--source include/have_collation.inc --source include/have_collation.inc
reset master; # clear up binlogs
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;
--enable_warnings --enable_warnings

2
mysql-test/suite/binlog/t/binlog_stm_datetime_ranges_mdev15289.test
View File

@ -1,6 +1,6 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_binlog_format_statement.inc --source include/have_binlog_format_statement.inc
reset master; # clear up binlogs
--exec $MYSQL_CLIENT_TEST test_datetime_ranges_mdev15289 > $MYSQLTEST_VARDIR/log/binlog_stm_datetime_ranges_mysql_client_test.out.log 2>&1 --exec $MYSQL_CLIENT_TEST test_datetime_ranges_mdev15289 > $MYSQLTEST_VARDIR/log/binlog_stm_datetime_ranges_mysql_client_test.out.log 2>&1
--let $binlog_file = LAST --let $binlog_file = LAST

2
mysql-test/suite/binlog/t/binlog_stm_do_db.test
View File

@ -37,7 +37,7 @@
-- source include/have_log_bin.inc -- source include/have_log_bin.inc
-- source include/have_innodb.inc -- source include/have_innodb.inc
-- source include/have_binlog_format_statement.inc -- source include/have_binlog_format_statement.inc
RESET MASTER; # clear up binlogs
SET @old_isolation_level= @@session.tx_isolation; SET @old_isolation_level= @@session.tx_isolation;
SET @@session.tx_isolation= 'READ-COMMITTED'; SET @@session.tx_isolation= 'READ-COMMITTED';

2
mysql-test/suite/binlog/t/innodb_autoinc_lock_mode_binlog.test
View File

@ -1,6 +1,6 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_binlog_format_mixed.inc --source include/have_binlog_format_mixed.inc
reset master; #clear up binlogs
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
select @@innodb_autoinc_lock_mode; select @@innodb_autoinc_lock_mode;