diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 08:40:14 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-11-09 08:40:14 +0200 |
| commit | 47ab793d71f2755b026672e4657174a1740b6ae2 (patch) | |
| tree | 919aa71c2f31dbafa84a0e3b5fdf61f8d23afd3a /mysql-test/suite/rpl | |
| parent | de2fa9eced796a38bf2a194f35589f6eef814483 (diff) | |
| parent | 524b4a89da3d9143ad72a82d73617ffde9e3a7a8 (diff) | |
| download | mariadb-git-47ab793d71f2755b026672e4657174a1740b6ae2.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/rpl')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_row_big_table_id.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test index 02665c70b9e..c44bfa80ad4 100644 --- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test +++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test @@ -8,6 +8,7 @@ # Finish the following tests by calling its common test script: # include/rpl_get_master_version_and_clock.test. +source include/not_valgrind.inc; source include/have_debug.inc; source include/have_debug_sync.inc; source include/master-slave.inc; diff --git a/mysql-test/suite/rpl/t/rpl_row_big_table_id.test b/mysql-test/suite/rpl/t/rpl_row_big_table_id.test index abf22cc876e..d898e894bc6 100644 --- a/mysql-test/suite/rpl/t/rpl_row_big_table_id.test +++ b/mysql-test/suite/rpl/t/rpl_row_big_table_id.test @@ -7,6 +7,7 @@ # Verify row-based events applying when table map id value is about and greater # than 1 << 32. ################################################################## +--source include/not_valgrind.inc --source include/word_size.inc --source include/have_debug.inc --source include/have_binlog_format_row.inc |