diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-06-21 14:39:40 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-06-21 14:39:40 +0200 |
| commit | e631cb0640dbc21f5db95bcabffb7a3b6694d3f7 (patch) | |
| tree | 710e96baabd4b8947934df3100c4e0f935c31b60 | |
| parent | c2112f5fd0f8c4ea8102002726d12c6d5c5e48c3 (diff) | |
| download | mariadb-git-e631cb0640dbc21f5db95bcabffb7a3b6694d3f7.tar.gz | |
Test case fix to replication team tree.
mysql-test/extra/rpl_tests/rpl_deadlock.test:
Restoring old test code, but masking out offending columns
mysql-test/r/rpl_deadlock_innodb.result:
Result change
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_deadlock.test | 18 | ||||
| -rw-r--r-- | mysql-test/r/rpl_deadlock_innodb.result | 32 |
2 files changed, 31 insertions, 19 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_deadlock.test b/mysql-test/extra/rpl_tests/rpl_deadlock.test index 38bba8d750d..62fe9b2223a 100644 --- a/mysql-test/extra/rpl_tests/rpl_deadlock.test +++ b/mysql-test/extra/rpl_tests/rpl_deadlock.test @@ -72,7 +72,11 @@ sync_with_master; select * from t1; # check that repl-ed succeeded finally select * from t2 /* must be 1 */; # check that no error is reported -source include/show_slave_status.inc; +--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 # +--replace_result $MASTER_MYPORT MASTER_MYPORT +--vertical_results +show slave status; +--horizontal_results # 2) Test lock wait timeout @@ -89,7 +93,11 @@ sync_with_master; select * from t1; # check that repl-ed succeeded finally select * from t2; # check that no error is reported -source include/show_slave_status.inc; +--replace_column 1 # 7 # 8 # 9 # 11 # 16 # 22 # 23 # 33 # +--replace_result $MASTER_MYPORT MASTER_MYPORT +--vertical_results +show slave status; +--horizontal_results # Now we repeat 2), but with BEGIN in the same relay log as # COMMIT (to see if seeking into hot log is ok). @@ -109,7 +117,11 @@ commit; sync_with_master; select * from t1; select * from t2; -source include/show_slave_status.inc; +--replace_column 1 # 7 # 8 # 9 # 11 # 16 # 22 # 23 # 33 # 35 # 36 # +--replace_result $MASTER_MYPORT MASTER_MYPORT +--vertical_results +show slave status; +--horizontal_results connection master; drop table t1,t2,t3,t4; diff --git a/mysql-test/r/rpl_deadlock_innodb.result b/mysql-test/r/rpl_deadlock_innodb.result index 458281d93b5..1753fc0cb2d 100644 --- a/mysql-test/r/rpl_deadlock_innodb.result +++ b/mysql-test/r/rpl_deadlock_innodb.result @@ -44,14 +44,14 @@ a select * from t2 /* must be 1 */; a 0 -SHOW SLAVE STATUS; +show slave status; Slave_IO_State # Master_Host 127.0.0.1 Master_User root -Master_Port MASTER_PORT +Master_Port MASTER_MYPORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 1709 +Read_Master_Log_Pos # Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 @@ -66,7 +66,7 @@ Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 1709 +Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition None Until_Log_File @@ -103,18 +103,18 @@ select * from t2; a 0 0 -SHOW SLAVE STATUS; +show slave status; Slave_IO_State # Master_Host 127.0.0.1 Master_User root -Master_Port MASTER_PORT +Master_Port MASTER_MYPORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 1709 +Read_Master_Log_Pos # Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 -Slave_IO_Running Yes +Slave_IO_Running # Slave_SQL_Running Yes Replicate_Do_DB Replicate_Ignore_DB @@ -125,7 +125,7 @@ Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 1709 +Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition None Until_Log_File @@ -138,8 +138,8 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # Master_SSL_Verify_Server_Cert No -Last_IO_Errno # -Last_IO_Error # +Last_IO_Errno 0 +Last_IO_Error Last_SQL_Errno 0 Last_SQL_Error set @my_max_relay_log_size= @@global.max_relay_log_size; @@ -167,18 +167,18 @@ a 0 0 0 -SHOW SLAVE STATUS; +show slave status; Slave_IO_State # Master_Host 127.0.0.1 Master_User root -Master_Port MASTER_PORT +Master_Port MASTER_MYPORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 1709 +Read_Master_Log_Pos # Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 -Slave_IO_Running Yes +Slave_IO_Running # Slave_SQL_Running Yes Replicate_Do_DB Replicate_Ignore_DB @@ -189,7 +189,7 @@ Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 1709 +Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition None Until_Log_File |