From: Date: July 19 2008 1:10pm Subject: bzr push into mysql-6.0-backup branch (aelkin:2729 to 2730) List-Archive: http://lists.mysql.com/commits/50076 Message-Id: <200807191110.m6JBAHV4029375@mysql1000.dsl.inet.fi> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 2730 Andrei Elkin 2008-07-19 manual merge with 5.1-bugteam: re-enabling rpl_temporary modified: mysql-test/suite/rpl/t/disabled.def 2729 Andrei Elkin 2008-07-19 [merge] merge from 5.1-bugteam. Reenabling rpl_server_id1 modified: mysql-test/suite/rpl/r/rpl_server_id1.result mysql-test/suite/rpl/r/rpl_temporary.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_server_id1.test mysql-test/suite/rpl/t/rpl_temporary.test === modified file 'mysql-test/suite/rpl/r/rpl_server_id1.result' --- a/mysql-test/suite/rpl/r/rpl_server_id1.result 2008-02-26 21:00:31 +0000 +++ b/mysql-test/suite/rpl/r/rpl_server_id1.result 2008-07-19 10:39:26 +0000 @@ -9,42 +9,5 @@ stop slave; change master to master_port=SLAVE_PORT; start slave; *** must be having the replicate-same-server-id IO thread error *** -show slave status; -Slave_IO_State -Master_Host 127.0.0.1 -Master_User root -Master_Port SLAVE_PORT -Connect_Retry 1 -Master_Log_File -Read_Master_Log_Pos 4 -Relay_Log_File slave-relay-bin.000001 -Relay_Log_Pos 4 -Relay_Master_Log_File -Slave_IO_Running No -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 0 -Exec_Master_Log_Pos 0 -Relay_Log_Space 107 -Until_Condition None -Until_Log_File -Until_Log_Pos 0 -Master_SSL_Allowed No -Master_SSL_CA_File -Master_SSL_CA_Path -Master_SSL_Cert -Master_SSL_Cipher -Master_SSL_Key -Seconds_Behind_Master NULL -Master_SSL_Verify_Server_Cert No -Last_IO_Errno 1593 -Last_IO_Error Fatal error: The slave I/O thread stops because master and slave have equal MySQL server ids; these ids must be different for replication to work (or the --replicate-same-server-id option must be used on slave but this does not always make sense; please check the manual before using it). -Last_SQL_Errno # -Last_SQL_Error # +Slave_IO_Errno= 1593 +Slave_IO_Error= Fatal error: The slave I/O thread stops because master and slave have equal MySQL server ids; these ids must be different for replication to work (or the --replicate-same-server-id option must be used on slave but this does not always make sense; please check the manual before using it). === modified file 'mysql-test/suite/rpl/r/rpl_temporary.result' --- a/mysql-test/suite/rpl/r/rpl_temporary.result 2007-06-27 12:28:02 +0000 +++ b/mysql-test/suite/rpl/r/rpl_temporary.result 2008-07-18 08:20:55 +0000 @@ -76,9 +76,9 @@ drop table t1,t2; create temporary table t3 (f int); create temporary table t4 (f int); create table t5 (f int); -select id from information_schema.processlist where command='Binlog Dump' into @id; -kill @id; +stop slave; insert into t5 select * from t4; +start slave; select * from t5 /* must be 1 after reconnection */; f drop temporary table t4; === modified file 'mysql-test/suite/rpl/t/disabled.def' --- a/mysql-test/suite/rpl/t/disabled.def 2008-07-17 10:44:32 +0000 +++ b/mysql-test/suite/rpl/t/disabled.def 2008-07-19 11:03:06 +0000 @@ -29,7 +29,6 @@ rpl_log_pos : Bug#8693 Te rpl_row_basic_7ndb : BUG#33360 2007-12-19 mats rpl_ndb_idempotent fails due to null field for table on slave side rpl_redirect : Failure is sporadic and and the test is superfluous (mats) rpl_innodb_bug28430 : Failure on Solaris Bug #36793 -rpl_server_id1 : Bug #36818 rpl_server_id1 fails expecting slave has stopped (azundris) rpl_row_basic_2myisam : Bug#37879 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often) rpl_row_basic_3innodb : Bug#37879 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often) @@ -38,6 +37,5 @@ rpl_idempotency : Bug#37767 2 rpl_flushlog_loop : Bug#37733 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often) rpl_locktrans_innodb : Bug#37712 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often) -rpl_temporary : Bug#34647 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often) rpl_temporary_errors : Bug#36968 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often) === modified file 'mysql-test/suite/rpl/t/rpl_server_id1.test' --- a/mysql-test/suite/rpl/t/rpl_server_id1.test 2008-05-20 15:14:03 +0000 +++ b/mysql-test/suite/rpl/t/rpl_server_id1.test 2008-07-18 11:53:16 +0000 @@ -10,17 +10,15 @@ reset master; # replicate ourselves stop slave; -source include/wait_for_slave_to_stop.inc; --replace_result $SLAVE_MYPORT SLAVE_PORT eval change master to master_port=$SLAVE_MYPORT; start slave; +let $slave_param= Last_IO_Errno; +let $slave_param_value= 1593; +source include/wait_for_slave_param.inc; --echo *** must be having the replicate-same-server-id IO thread error *** - -source include/wait_for_slave_io_to_stop.inc; - ---replace_result $SLAVE_MYPORT SLAVE_PORT ---replace_column 12 # 16 # 19 # 20 # 18 # 37 # 38 # -query_vertical show slave status; - -# End of 4.1 tests +let $last_io_errno= query_get_value("show slave status", Last_IO_Errno, 1); +let $last_io_error= query_get_value("show slave status", Last_IO_Error, 1); +echo Slave_IO_Errno= $last_io_errno; +echo Slave_IO_Error= $last_io_error; === modified file 'mysql-test/suite/rpl/t/rpl_temporary.test' --- a/mysql-test/suite/rpl/t/rpl_temporary.test 2008-03-12 12:07:35 +0000 +++ b/mysql-test/suite/rpl/t/rpl_temporary.test 2008-07-18 08:20:55 +0000 @@ -138,20 +138,21 @@ sync_slave_with_master; # # Bug#17284 erroneous temp table cleanup on slave +# The test targets at verifying that reconnected slave +# retained the former session's temporary tables # - connection master; create temporary table t4 (f int); create table t5 (f int); sync_slave_with_master; +# connection slave +stop slave; # to prepare for reconnecting w/o waiting for timeout connection master; -# find dumper's $id -select id from information_schema.processlist where command='Binlog Dump' into @id; -kill @id; # to stimulate reconnection by slave w/o timeout insert into t5 select * from t4; save_master_pos; connection slave; +start slave; sync_with_master; select * from t5 /* must be 1 after reconnection */;