From: Manish Kumar Date: April 10 2012 6:06am Subject: bzr push into mysql-trunk branch (manish.4.kumar:3855 to 3856) List-Archive: http://lists.mysql.com/commits/143431 Message-Id: <201204100606.q3A66sD2007148@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3856 Manish Kumar 2012-04-10 [merge] upmerge from mysql-5.5 -> mysql-trunk @ mysql-test/suite/rpl/r/rpl_report_port.result Updated the corresponding result file. @ mysql-test/suite/rpl/t/rpl_report_port.test Added the restart server option before ending the test. removed: mysql-test/suite/rpl/t/rpl_report_port-slave.opt modified: mysql-test/suite/rpl/r/rpl_report_port.result mysql-test/suite/rpl/t/rpl_report_port.test 3855 Nuno Carvalho 2012-04-09 BUG#13941187: RPL.RPL_MASTER_POS_WAIT SPORADIC FAILURES rpl.rpl_master_pos_wait has sporadic failures on pb2. This is due to the indeterminism of running STOP SLAVE SQL_THREAD and SQL_THREAD_WAIT_AFTER_GTIDS in parallel, where the latter may return NULL (slave stoppped) or -1 (timeout). To avoid SQL_THREAD_WAIT_AFTER_GTIDS return -1, disabled timeout from SQL_THREAD_WAIT_AFTER_GTIDS query, setting it to 0. modified: mysql-test/suite/rpl/r/rpl_master_pos_wait.result mysql-test/suite/rpl/t/rpl_master_pos_wait.test === modified file 'mysql-test/suite/rpl/r/rpl_report_port.result' --- a/mysql-test/suite/rpl/r/rpl_report_port.result 2012-03-23 20:11:19 +0000 +++ b/mysql-test/suite/rpl/r/rpl_report_port.result 2012-04-10 06:03:57 +0000 @@ -3,9 +3,12 @@ Warnings: Note #### Sending passwords in plain text without SSL/TLS is extremely insecure. Note #### Storing MySQL user name or password information in the master.info repository is not secure and is therefore not recommended. Please see the MySQL Manual for more about this issue and possible alternatives. [connection master] -include/assert.inc [The default value shown for the slave's port number is the actual port number of the slave.] include/rpl_restart_server.inc [server_number=2 parameters: --report-port=9000] include/start_slave.inc [Slave restarted with the report-port set to some value] include/assert.inc [The value shown for the slave's port number is 9000 which is the value set for report-port.] +include/rpl_restart_server.inc [server_number=2 parameters: --report-port=] +include/start_slave.inc +[Slave restarted with the report-port set to the value of slave's port number] +include/assert.inc [The default value shown for the slave's port number is the actual port number of the slave.] include/rpl_end.inc === removed file 'mysql-test/suite/rpl/t/rpl_report_port-slave.opt' --- a/mysql-test/suite/rpl/t/rpl_report_port-slave.opt 2012-02-28 08:32:27 +0000 +++ b/mysql-test/suite/rpl/t/rpl_report_port-slave.opt 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ ---report-port= === modified file 'mysql-test/suite/rpl/t/rpl_report_port.test' --- a/mysql-test/suite/rpl/t/rpl_report_port.test 2012-03-09 02:37:16 +0000 +++ b/mysql-test/suite/rpl/t/rpl_report_port.test 2012-04-10 06:02:27 +0000 @@ -10,22 +10,18 @@ # #====Method==== # -# Start replication with report port not set.This will give the actual port -# number of the slave (ie. SLAVE_PORT) for the on doing SHOW SLAVE HOSTS on -# the master. -# Restart the slave server with report port set to 9000 and start the slave. +# Start replication with report port set to 9000 and restart the slave. # In this case on doing SHOW SLAVE HOSTS on the master, we get the port number # of the slave to be 9000. +# In the second case restart the slave server with report port not set. In this +# case on doing SHOW SLAVE HOSTS on the master, we get the actual port number +# of the slave (ie. SLAVE_PORT). source include/master-slave.inc; +source include/have_binlog_format_mixed.inc; connection master; ---let $report_port= query_get_value(SHOW SLAVE HOSTS, Port, 1) ---let assert_text= The default value shown for the slave's port number is the actual port number of the slave. ---let assert_cond= $report_port = "$SLAVE_MYPORT" ---source include/assert.inc - # Start the server with some value being passed to the report_port=