bzr commit into mysql-5.1 branch (hezx:2720) Bug#37051

[He Zhenxing]

#At file:///media/sda3/work/mysql/bzrwork/merge/5.1-rpl-merge/

 2720 He Zhenxing	2008-08-26
      Fix cherry picking patch of BUG#37051
modified:
  mysql-test/include/wait_for_slave_sql_error_and_skip.inc
  mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result

per-file messages:
  mysql-test/include/wait_for_slave_sql_error_and_skip.inc
    include/start_slave.inc not exist yet, changed to start slave and source
include/wait_for_slave_to_start.inc
  mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
    update result
=== modified file 'mysql-test/include/wait_for_slave_sql_error_and_skip.inc'
--- a/mysql-test/include/wait_for_slave_sql_error_and_skip.inc	2008-08-26 10:01:49 +0000
+++ b/mysql-test/include/wait_for_slave_sql_error_and_skip.inc	2008-08-26 12:11:56 +0000
@@ -19,5 +19,6 @@ if ($show_sql_error)
 
 # skip the erroneous statement
 set global sql_slave_skip_counter=1;
-source include/start_slave.inc;
+start slave;
+source include/wait_for_slave_to_start.inc;
 connection master;

=== modified file 'mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result'
--- a/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result	2008-08-26 10:01:49 +0000
+++ b/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result	2008-08-26 12:11:56 +0000
@@ -50,82 +50,82 @@ UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) 
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0 where t1.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t1 LEFT JOIN (t4, t7) ON (t1.id=t4.id and t1.id=t7.id) SET a=0 where t1.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t1 LEFT JOIN (t4, t7) ON (t1.id=t4.id and t1.id=t7.id) SET a=0
where t1.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t1 LEFT JOIN (t2, t4, t7) ON (t1.id=t2.id and t1.id=t4.id and t1.id=t7.id) SET
a=0, b=0 where t1.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t1 LEFT JOIN (t2, t4, t7) ON (t1.id=t2.id and t1.id=t4.id and
t1.id=t7.id) SET a=0, b=0 where t1.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t1 LEFT JOIN (t2, t3, t7) ON (t1.id=t2.id and t1.id=t3.id and t1.id=t7.id) SET
a=0, b=0, c=0 where t1.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t1 LEFT JOIN (t2, t3, t7) ON (t1.id=t2.id and t1.id=t3.id and
t1.id=t7.id) SET a=0, b=0, c=0 where t1.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t1 LEFT JOIN t7 ON (t1.id=t7.id) SET a=0, g=0 where t1.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t1 LEFT JOIN t7 ON (t1.id=t7.id) SET a=0, g=0 where t1.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t7 LEFT JOIN t1 ON (t1.id=t7.id) SET a=0, g=0 where t7.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t7 LEFT JOIN t1 ON (t1.id=t7.id) SET a=0, g=0 where t7.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t1 LEFT JOIN (t4, t5, t7) ON (t1.id=t4.id and t1.id=t5.id and t1.id=t7.id) SET
a=0, g=0 where t1.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t1 LEFT JOIN (t4, t5, t7) ON (t1.id=t4.id and t1.id=t5.id and
t1.id=t7.id) SET a=0, g=0 where t1.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t1 LEFT JOIN (t4, t7, t8) ON (t1.id=t4.id and t1.id=t7.id and t1.id=t8.id) SET
a=0, g=0 where t1.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t1 LEFT JOIN (t4, t7, t8) ON (t1.id=t4.id and t1.id=t7.id and
t1.id=t8.id) SET a=0, g=0 where t1.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t1 LEFT JOIN (t7, t8, t9) ON (t1.id=t7.id and t1.id=t8.id and t1.id=t9.id) SET
a=0, g=0, h=0, i=0 where t1.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t1 LEFT JOIN (t7, t8, t9) ON (t1.id=t7.id and t1.id=t8.id and
t1.id=t9.id) SET a=0, g=0, h=0, i=0 where t1.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t7 LEFT JOIN (t1, t2, t3) ON (t7.id=t1.id and t7.id=t2.id and t7.id=t3.id) SET
g=0, a=0, b=0, c=0 where t7.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t7 LEFT JOIN (t1, t2, t3) ON (t7.id=t1.id and t7.id=t2.id and
t7.id=t3.id) SET g=0, a=0, b=0, c=0 where t7.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t7 LEFT JOIN (t4, t5, t3) ON (t7.id=t4.id and t7.id=t5.id and t7.id=t3.id) SET
g=0, c=0 where t7.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t7 LEFT JOIN (t4, t5, t3) ON (t7.id=t4.id and t7.id=t5.id and
t7.id=t3.id) SET g=0, c=0 where t7.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t7 LEFT JOIN (t8, t9, t3) ON (t7.id=t8.id and t7.id=t9.id and t7.id=t3.id) SET
g=0, h=0, i=0, c=0 where t7.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t7 LEFT JOIN (t8, t9, t3) ON (t7.id=t8.id and t7.id=t9.id and
t7.id=t3.id) SET g=0, h=0, i=0, c=0 where t7.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0, d=0 where t1.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t1 LEFT JOIN t4 ON (t1.id=t4.id) SET a=0, d=0 where t1.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t1 LEFT JOIN (t4, t5, t6) ON (t1.id=t4.id and t1.id=t5.id and t1.id=t6.id) SET
a=0, d=0, e=0, f=0 where t1.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t1 LEFT JOIN (t4, t5, t6) ON (t1.id=t4.id and t1.id=t5.id and
t1.id=t6.id) SET a=0, d=0, e=0, f=0 where t1.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t4 LEFT JOIN (t1, t5, t6) ON (t4.id=t1.id and t4.id=t5.id and t4.id=t6.id) SET
a=0, e=0, f=0 where t4.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t4' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t4 LEFT JOIN (t1, t5, t6) ON (t4.id=t1.id and t4.id=t5.id and
t4.id=t6.id) SET a=0, e=0, f=0 where t4.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 UPDATE t7 LEFT JOIN (t1, t4, t2) ON (t7.id=t1.id and t7.id=t4.id and t7.id=t2.id) SET
a=0, b=0, d=0, g=0 where t7.id=1;
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Table 'test.t7' doesn't exist' on query. Default database:
'test'. Query: 'UPDATE t7 LEFT JOIN (t1, t4, t2) ON (t7.id=t1.id and t7.id=t4.id and
t7.id=t2.id) SET a=0, b=0, d=0, g=0 where t7.id=1'
 set global sql_slave_skip_counter=1;
-include/start_slave.inc
+start slave;
 [on slave]
 show tables like 't%';
 Tables_in_test (t%)