diff options
| author | asklavou <angelique.sklavounos@mariadb.com> | 2022-11-07 14:56:09 +0000 |
|---|---|---|
| committer | asklavou <angelique.sklavounos@mariadb.com> | 2022-11-09 16:34:55 +0000 |
| commit | 0ffdcf678451121792021aba0693539e8e62900d (patch) | |
| tree | 8a9f57c09258ac1e350f77bd848e71c8bd3f5b6a /mysql-test/main | |
| parent | 6b91792a087a4c356584a6f1fa8e7d9809a1d58a (diff) | |
| download | mariadb-git-0ffdcf678451121792021aba0693539e8e62900d.tar.gz | |
MDEV 28970: Add RESET MASTER to clear possible remaining binlog from previous test
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/mysql_upgrade_view.result | 1 | ||||
| -rw-r--r-- | mysql-test/main/mysql_upgrade_view.test | 2 | ||||
| -rw-r--r-- | mysql-test/main/stat_tables_rbr.result | 1 | ||||
| -rw-r--r-- | mysql-test/main/stat_tables_rbr.test | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/main/mysql_upgrade_view.result b/mysql-test/main/mysql_upgrade_view.result index 172ef7e4159..052a320d0ee 100644 --- a/mysql-test/main/mysql_upgrade_view.result +++ b/mysql-test/main/mysql_upgrade_view.result @@ -1,3 +1,4 @@ +reset master; set sql_log_bin=0; drop table if exists t1,v1,v2,v3,v4,v1badcheck; drop view if exists t1,v1,v2,v3,v4,v1badcheck; diff --git a/mysql-test/main/mysql_upgrade_view.test b/mysql-test/main/mysql_upgrade_view.test index 6a496858d22..f894b56b08b 100644 --- a/mysql-test/main/mysql_upgrade_view.test +++ b/mysql-test/main/mysql_upgrade_view.test @@ -1,5 +1,5 @@ -- source include/have_log_bin.inc - +reset master; # clear binlogs set sql_log_bin=0; --disable_warnings drop table if exists t1,v1,v2,v3,v4,v1badcheck; diff --git a/mysql-test/main/stat_tables_rbr.result b/mysql-test/main/stat_tables_rbr.result index 7ae7ade4398..c154ef03b0c 100644 --- a/mysql-test/main/stat_tables_rbr.result +++ b/mysql-test/main/stat_tables_rbr.result @@ -1,3 +1,4 @@ +RESET MASTER; # # Bug mdev-463: assertion failure when running ANALYZE with RBR on # diff --git a/mysql-test/main/stat_tables_rbr.test b/mysql-test/main/stat_tables_rbr.test index 29f7c4e6622..95890d35ac7 100644 --- a/mysql-test/main/stat_tables_rbr.test +++ b/mysql-test/main/stat_tables_rbr.test @@ -1,7 +1,7 @@ --source include/have_binlog_format_row.inc --source include/have_innodb.inc --source include/have_partition.inc - +RESET MASTER; # clear up binlogs --echo # --echo # Bug mdev-463: assertion failure when running ANALYZE with RBR on --echo # |