diff options
| author | unknown <lars/lthalmann@dl145k.mysql.com> | 2006-09-21 13:54:57 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145k.mysql.com> | 2006-09-21 13:54:57 +0200 |
| commit | 01fe0214a38051f7b9f4abb8ae7a0c46d5536ca6 (patch) | |
| tree | a172f6e88727c33c247ca6dc16ad78f674653b88 /mysql-test/extra | |
| parent | f8ff88f9e3c37938460534e208c62997222ec9db (diff) | |
| parent | 9de027bdd54c84f0037f123e815e8628029261c5 (diff) | |
| download | mariadb-git-01fe0214a38051f7b9f4abb8ae7a0c46d5536ca6.tar.gz | |
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
Manual merge 5.0->5.1
mysql-test/r/rpl_insert_id.result:
Manual merge 5.0->5.1
mysql-test/r/rpl_stm_max_relay_size.result:
Manual merge 5.0->5.1
mysql-test/t/rpl_insert_id.test:
Manual merge 5.0->5.1
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_max_relay_size.test | 44 |
1 files changed, 41 insertions, 3 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_max_relay_size.test b/mysql-test/extra/rpl_tests/rpl_max_relay_size.test index 14223392224..50325f83358 100644 --- a/mysql-test/extra/rpl_tests/rpl_max_relay_size.test +++ b/mysql-test/extra/rpl_tests/rpl_max_relay_size.test @@ -9,7 +9,10 @@ connection slave; stop slave; connection master; -# Generate a big enough master's binlog to cause relay log rotations + +--echo # +--echo # Generate a big enough master's binlog to cause relay log rotations +--echo # create table t1 (a int); let $1=800; @@ -26,6 +29,11 @@ drop table t1; save_master_pos; connection slave; reset slave; + +--echo # +--echo # Test 1 +--echo # + set global max_binlog_size=8192; set global max_relay_log_size=8192-1; # mapped to 4096 select @@global.max_relay_log_size; @@ -33,7 +41,13 @@ start slave; sync_with_master; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 16 # 23 # 33 # +--vertical_results show slave status; + +--echo # +--echo # Test 2 +--echo # + stop slave; reset slave; set global max_relay_log_size=(5*4096); @@ -42,7 +56,13 @@ start slave; sync_with_master; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 16 # 23 # 33 # +--vertical_results show slave status; + +--echo # +--echo # Test 3: max_relay_log_size = 0 +--echo # + stop slave; reset slave; set global max_relay_log_size=0; @@ -51,9 +71,12 @@ start slave; sync_with_master; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 16 # 23 # 33 # +--vertical_results show slave status; -# Tests below are mainly to ensure that we have not coded with wrong assumptions +--echo # +--echo # Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions +--echo # stop slave; reset slave; @@ -62,8 +85,13 @@ reset slave; flush logs; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 16 # 23 # 33 # +--vertical_results show slave status; +--echo # +--echo # Test 5 +--echo # + reset slave; start slave; sync_with_master; @@ -78,8 +106,13 @@ connection slave; sync_with_master; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 16 # 23 # 33 # +--vertical_results show slave status; -# one more rotation, to be sure Relay_Log_Space is correctly updated + +--echo # +--echo # Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated +--echo # + flush logs; connection master; drop table t1; @@ -88,6 +121,7 @@ connection slave; sync_with_master; --replace_result $MASTER_MYPORT MASTER_PORT --replace_column 1 # 8 # 9 # 16 # 23 # 33 # +--vertical_results show slave status; connection master; @@ -95,3 +129,7 @@ connection master; flush logs; -- replace_column 3 <Binlog_Ignore_DB> show master status; + +--echo # +--echo # End of 4.1 tests +--echo # |