2707 Andrei Elkin 2008-07-18 [merge]
merge
modified:
client/mysql.cc
mysql-test/include/mix1.inc
mysql-test/r/client_xml.result
mysql-test/r/innodb_mysql.result
mysql-test/r/mysql.result
mysql-test/t/client_xml.test
mysql-test/t/mysql_delimiter.sql
mysys/default.c
sql/event_db_repository.cc
sql/events.cc
sql/filesort.cc
sql/mysql_priv.h
sql/opt_range.cc
sql/opt_range.h
sql/records.cc
sql/sql_acl.cc
sql/sql_delete.cc
sql/sql_help.cc
sql/sql_plugin.cc
sql/sql_select.cc
sql/sql_servers.cc
sql/sql_table.cc
sql/sql_udf.cc
sql/sql_update.cc
2706 Andrei Elkin 2008-07-18
Bug #36818 rpl_server_id1 fails expecting slave has stopped
the reason for the failure is that io thread passes through a sequence of state
changes before it eventually got stuck at the expect running state as NO.
It's unreasonble to wait for the running status while the whole idea of the test is
to get to the IO thread error.
Fixed with changing the waiting condition.
modified:
mysql-test/suite/rpl/r/rpl_server_id1.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_server_id1.test
2705 Andrei Elkin 2008-07-18
Bug #34647 rpl_temporary discovers more than one dump thread and fails to select
Many dump threads can exist due to a way the new version of mtr governs suites.
For this immediate problem the test is refined not to use I_S but rather to reconnect
explicitly with preserving logics of a an old target bug fixes verification.
modified:
mysql-test/suite/rpl/r/rpl_temporary.result
mysql-test/suite/rpl/t/rpl_temporary.test
2704 Kristofer Pettersson 2008-07-17 [merge]
Automerge
modified:
mysql-test/include/query_prealloc_size_basic.inc
mysql-test/r/query_prealloc_size_basic_32.result
mysql-test/r/query_prealloc_size_basic_64.result
=== modified file 'mysql-test/suite/rpl/r/rpl_server_id1.result'
--- a/mysql-test/suite/rpl/r/rpl_server_id1.result 2008-02-20 21:18:01 +0000
+++ b/mysql-test/suite/rpl/r/rpl_server_id1.result 2008-07-18 11:53:16 +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 106
-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-06-19 10:39:48 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def 2008-07-18 11:53:16 +0000
@@ -12,4 +12,4 @@
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)
+
=== 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 */;
| Thread |
|---|
| • bzr push into mysql-5.1 branch (aelkin:2704 to 2707) Bug#34647, Bug#36818 | Andrei Elkin | 18 Jul |
