Merge mysql.com:/home/ram/work/b28144/b28144.5.0

into  mysql.com:/home/ram/work/b28144/b28144.5.1


mysql-test/r/rpl_log_pos.result:
  ul
mysql-test/r/rpl_ssl.result:
  ul
mysql-test/t/rpl_log_pos.test:
  manual merge
mysql-test/t/rpl_ssl.test:
  manual merge

mysql-test/include/wait_for_slave_param.inc

+# include/wait_for_slave_param.inc
+#
+# SUMMARY
+#
+#    Waits until SHOW SLAVE STATUS has returned a spicified value.
+#
+# USAGE
+#
+#    let $slave_param= Slave_SQL_Running;
+#    let $slave_param_value= No;
+#    --source include/slave_wait_param.inc
+
+let $slave_wait_param_counter= 300;
+let $slave_value= query_get_value("SHOW SLAVE STATUS", $slave_param, 1);
+while (`select "$slave_value" != "$slave_param_value"`)
+{
+  dec $slave_wait_param_counter;
+  if (!$slave_wait_param_counter)
+  {
+    --echo ERROR: failed while waiting for slave parameter $slave_param: $slave_param_value
+    query_vertical show slave status;
+    exit;
+  }
+  sleep 0.1;
+  let $slave_value= query_get_value("SHOW SLAVE STATUS", $slave_param, 1);
+}

mysql-test/t/rpl_log_pos.test

@@ -14,31 +14,29 @@ source include/master-slave.inc;
 --replace_column 3 <Binlog_Ignore_DB>
 show master status;
 sync_slave_with_master;
---replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 8 # 9 # 23 # 33 #
-show slave status;
-stop slave;
-change master to master_log_pos=75;
-start slave;
-sleep 5;
+
 stop slave;
+--source include/wait_for_slave_to_stop.inc
 
 change master to master_log_pos=75;
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 1 # 8 # 9 # 23 # 33 #
-show slave status;
+query_vertical show slave status;
+
 start slave;
-sleep 5;
---replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 8 # 9 # 23 # 33 #
-show slave status;
+let $slave_param= Slave_SQL_Running;
+let $slave_param_value= Yes;
+--source include/wait_for_slave_param.inc
+let $slave_param= Slave_IO_Running;
+let $slave_param_value= No;
+--source include/wait_for_slave_param.inc
 stop slave;
-change master to master_log_pos=178;
-start slave;
-sleep 2;
+--source include/wait_for_slave_to_stop.inc
+
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 1 # 8 # 9 # 11 # 23 # 33 #
-show slave status;
+query_vertical show slave status;
+
 connection master;
 --replace_column 3 <Binlog_Ignore_DB>
 show master status;
@@ -48,7 +46,6 @@ create table t1 (n int);
 insert into t1 values (1),(2),(3);
 save_master_pos;
 connection slave;
-stop slave;
 change master to master_log_pos=106;
 start slave;
 sync_with_master;
@@ -57,4 +54,4 @@ connection master;
 drop table t1;
 sync_slave_with_master;
 
-# End of 4.1 tests
+--echo End of 5.0 tests

mysql-test/t/rpl_ssl.test

@@ -58,6 +58,7 @@ connection master;
 # the sync has something to do
 insert into t1 values (NULL);
 sync_slave_with_master;
+--source include/wait_for_slave_to_start.inc
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
 --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
 query_vertical show slave status;
@@ -67,3 +68,4 @@ drop user replssl@localhost;
 drop table t1;
 sync_slave_with_master;
 
+--echo End of 5.0 tests