Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into  mysql.com:/data2/mysql-5.1-maint

mysql-test/t/rpl_known_bugs_detection.test

@@ -79,7 +79,7 @@ ON DUPLICATE KEY UPDATE
 t1.field_3 = t2.field_c;
 SELECT * FROM t1;
 connection slave;
---source include/wait_for_slave_to_stop.inc
+--source include/wait_for_slave_sql_to_stop.inc
 # show the error message
 --replace_column 1 # 4 # 7 # 8 # 9 # 23 # 33 #
 --query_vertical show slave status;