mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
Fix for the rpl_until.test.
Don't use --command in tests; use command. mysql-test/r/rpl_until.result: result update mysql-test/t/rpl_until.test: real-sleep is incorrect syntax; mysqltest knows only real_sleep. Tip: don't use -- before commands; if mysqltest does not recognize the command after -- it just says "it must be a comment", so there is no syntax error detection. If you don't use the -- it will report the syntax error. The typo caused no sleep, so the slave did not have time to stop. Now it has time so we needn't replace the Slave_SQL_Running (and it's better to not replace it, because if we don't see that it is running, it will trigger errors just a bit later).
This commit is contained in:
parent
da81724aa0
commit
d5b3cb44b9
2 changed files with 3 additions and 3 deletions
|
@ -55,7 +55,7 @@ stop slave;
|
|||
start slave until master_log_file='master-bin.000001', master_log_pos=561;
|
||||
show slave status;
|
||||
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
|
||||
# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 561 slave-relay-bin.000002 # master-bin.000001 Yes # 0 0 561 # Master master-bin.000001 561 No #
|
||||
# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 561 slave-relay-bin.000002 # master-bin.000001 Yes No 0 0 561 # Master master-bin.000001 561 No #
|
||||
start slave until master_log_file='master-bin', master_log_pos=561;
|
||||
ERROR HY000: Wrong parameter or combination of parameters for START SLAVE UNTIL
|
||||
start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
|
||||
|
|
|
@ -60,10 +60,10 @@ stop slave;
|
|||
# this should stop immideately
|
||||
start slave until master_log_file='master-bin.000001', master_log_pos=561;
|
||||
# 2 is not enough when running with valgrind
|
||||
--real-sleep 4;
|
||||
real_sleep 4
|
||||
# here the sql slave thread should be stopped
|
||||
--replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004
|
||||
--replace_column 1 # 9 # 12 # 23 # 33 #
|
||||
--replace_column 1 # 9 # 23 # 33 #
|
||||
show slave status;
|
||||
|
||||
#testing various error conditions
|
||||
|
|
Loading…
Reference in a new issue