diff options
| author | monty@mysql.com <> | 2003-11-22 03:21:40 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-11-22 03:21:40 +0200 |
| commit | d87494c5acf1b0e03cb3848b3e588c1d0259b44f (patch) | |
| tree | f843dfed18127f94f90e6cffa6456e545f7b6b57 /mysql-test | |
| parent | d08945498e44acb968d1aab6d269d9b1874246e6 (diff) | |
| download | mariadb-git-d87494c5acf1b0e03cb3848b3e588c1d0259b44f.tar.gz | |
Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
Updated project files for windows
Made rpl_change_master.test portable
Ensure that mutex are not freed if not initilized
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_change_master.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/rpl_change_master.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_change_master.result b/mysql-test/r/rpl_change_master.result index a886ad9c304..546a0ee2710 100644 --- a/mysql-test/r/rpl_change_master.result +++ b/mysql-test/r/rpl_change_master.result @@ -16,11 +16,11 @@ n 1 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 9306 1 master-bin.000001 273 slave-relay-bin.000002 258 master-bin.000001 No No 0 0 214 317 None 0 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 273 slave-relay-bin.000002 258 master-bin.000001 No No 0 0 214 317 None 0 No # change master to master_user='root'; 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 9306 1 master-bin.000001 214 slave-relay-bin.000001 4 master-bin.000001 No No 0 0 214 4 None 0 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 214 slave-relay-bin.000001 4 master-bin.000001 No No 0 0 214 4 None 0 No # select release_lock("a"); release_lock("a") 1 diff --git a/mysql-test/t/rpl_change_master.test b/mysql-test/t/rpl_change_master.test index 33fc2d75dd3..94f044d5413 100644 --- a/mysql-test/t/rpl_change_master.test +++ b/mysql-test/t/rpl_change_master.test @@ -11,9 +11,11 @@ connection slave; sleep 3; # can't sync_with_master as we should be blocked stop slave; select * from t1; +--replace_result $MASTER_MYPORT MASTER_MYPORT --replace_column 1 # 33 # show slave status; change master to master_user='root'; +--replace_result $MASTER_MYPORT MASTER_MYPORT --replace_column 1 # 33 # show slave status; # Will restart from after the values(2), which is bug |