Merge trift2.:/MySQL/M51/clone-5.1

into  trift2.:/MySQL/M51/push-5.1

mysql-test/include/master-slave-reset.inc

@@ -3,7 +3,7 @@ connection slave;
 #(the server was started with skip-slave-start)
 --disable_warnings
 stop slave;
---wait_for_slave_to_stop
+source include/wait_for_slave_to_stop.inc;
 --enable_warnings
 connection master;
 --disable_warnings
@@ -20,3 +20,4 @@ reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 --enable_warnings
 start slave;
+source include/wait_for_slave_to_start.inc;

mysql-test/suite/rpl/t/rpl_insert.test

@@ -18,10 +18,13 @@ let $query = "INSERT DELAYED INTO t1 VALUES (1, 'Dr. No'), (2, 'From Russia With
 
 # Wait until all the 5000 inserts has been inserted into the table
 let $wait_condition= SELECT COUNT(*) = 5000 FROM mysqlslap.t1;
---source include/wait_condition.inc
-
+source include/wait_condition.inc;
 SELECT COUNT(*) FROM mysqlslap.t1;
-sync_slave_with_master;
+
+connection slave;
+# Wait until all the 5000 inserts has been inserted into the table
+let $wait_condition= SELECT COUNT(*) = 5000 FROM mysqlslap.t1;
+source include/wait_condition.inc;
 SELECT COUNT(*) FROM mysqlslap.t1;
 
 --echo #

sql/set_var.cc

@@ -713,7 +713,7 @@ static uchar *slave_get_report_port(THD *thd)
   return (uchar*) &thd->sys_var_tmp.long_value;
 }
 
-static sys_var_readonly    sys_repl_report_port(&vars, "report_port", OPT_GLOBAL, SHOW_INT, slave_get_report_port);
+static sys_var_readonly    sys_repl_report_port(&vars, "report_port", OPT_GLOBAL, SHOW_LONG, slave_get_report_port);
 
 #endif