diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-12-19 17:32:45 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-10 06:30:42 -0500 |
| commit | 3435e8a51552c3c73feab4b1c731dd8da225618c (patch) | |
| tree | 9bdd89d7134a6618d1b6438c9af1713732846c1d /mysql-test/extra | |
| parent | 185d140f191f550d030550f6718103a89eb64212 (diff) | |
| download | mariadb-git-3435e8a51552c3c73feab4b1c731dd8da225618c.tar.gz | |
MDEV-7635: Part 1
innodb_autoinc_lock_mode = 2
innodb_buffer_pool_dump_at_shutdown = ON
innodb_buffer_pool_dump_pct = 25
innodb_buffer_pool_load_at_startup = ON
innodb_checksum_algorithm = CRC32
innodb_file_format = Barracuda
innodb_large_prefix = ON
innodb_log_compressed_pages = ON
innodb_purge_threads = 4
innodb_strict_mode = ON
binlog_annotate_row_events = ON
binlog_format = MIXED
binlog-row-event-max-size = 8192
group_concat_max_len = 1M
lock_wait_timeout = 86400
log_slow_admin_statements = ON
log_slow_slave_statements = ON
log_warnings = 2
max_allowed_packet = 16M
replicate_annotate_row_events = ON
slave_net_timeout = 60
sync_binlog = 1
aria_recover = BACKUP,QUICK
myisam_recover_options = BACKUP,QUICK
Diffstat (limited to 'mysql-test/extra')
4 files changed, 7 insertions, 2 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test index 01e8497e4de..d2f605e0f96 100644 --- a/mysql-test/extra/rpl_tests/rpl_log.test +++ b/mysql-test/extra/rpl_tests/rpl_log.test @@ -43,7 +43,7 @@ source include/show_binlog_events.inc; let $binlog_limit= 3; source include/show_binlog_events.inc; -let $binlog_limit= 2,4; +let $binlog_limit= 2,5; source include/show_binlog_events.inc; let $binlog_limit=; flush logs; diff --git a/mysql-test/extra/rpl_tests/rpl_row_annotate.test b/mysql-test/extra/rpl_tests/rpl_row_annotate.test index 0614ca97f1d..b7ab4f4eade 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_annotate.test +++ b/mysql-test/extra/rpl_tests/rpl_row_annotate.test @@ -182,4 +182,8 @@ DROP DATABASE test1; sync_slave_with_master; --enable_query_log +use test; +connection slave; +call mtr.add_suppression("Can't find record in 't3'"); + --source include/rpl_end.inc diff --git a/mysql-test/extra/rpl_tests/rpl_row_basic.test b/mysql-test/extra/rpl_tests/rpl_row_basic.test index f45c8824b10..2e1007b1c04 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_basic.test +++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test @@ -411,6 +411,7 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions; call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 1 size mismatch.* error.* 1535"); call mtr.add_suppression("Slave SQL.*Could not execute Delete_rows event on table test.t1.* error.* 1032"); call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t.. cannot be converted from type.*, error.* 1677"); +call mtr.add_suppression("Can't find record in 't1'"); --let $rpl_only_running_threads= 1 --source include/rpl_reset.inc diff --git a/mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc b/mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc index 4e68a1560f8..988ffcc1bc1 100644 --- a/mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc +++ b/mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc @@ -4,7 +4,7 @@ --source extra/rpl_tests/rpl_show_binlog_events.inc --let $binlog_limit= 2 --source extra/rpl_tests/rpl_show_binlog_events.inc ---let $binlog_limit= 2,3 +--let $binlog_limit= 2,4 --source extra/rpl_tests/rpl_show_binlog_events.inc --let $binlog_limit= --let $binlog_file= |