bzr push into mysql-5.1 branch (mats:2621 to 2622)

[Mats Kindahl]

 2622 Mats Kindahl	2008-07-08
      Patch to remove extreneous printout.
modified:
  mysql-test/include/wait_for_slave_sql_to_stop.inc

 2621 Mats Kindahl	2008-07-08 [merge]
      Manual merge with mysql-5.1-rpl
modified:
  mysql-test/suite/rpl/t/rpl_insert.test
  mysql-test/t/disabled.def

=== modified file 'mysql-test/include/wait_for_slave_sql_to_stop.inc'
--- a/mysql-test/include/wait_for_slave_sql_to_stop.inc	2008-07-08 16:21:02 +0000
+++ b/mysql-test/include/wait_for_slave_sql_to_stop.inc	2008-07-08 17:59:50 +0000
@@ -15,7 +15,6 @@
 ####################################################
 if (!$keep_connection)
 {
-  --echo [on slave]
   connection slave;
 }
 let $row_number= 1;