bk commit into 6.0 tree (mkindahl:1.2564)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
6.0 repository of mkindahl.  When mkindahl does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-14 12:20:13+01:00, mkindahl@stripped +2 -0
  Test changes to eliminate some sporadic pushbuild errors.

  mysql-test/suite/rpl/t/rpl_variables.test@stripped, 2008-02-14 12:19:59+01:00, mkindahl@stripped +1 -0
    Adding sync to guarantee that slave has started after a timeout.

  mysql-test/t/symlink.test@stripped, 2008-02-14 12:20:04+01:00, mkindahl@stripped +1 -1
    Accepting another error code as well for a statement in the test.

diff -Nrup a/mysql-test/suite/rpl/t/rpl_variables.test b/mysql-test/suite/rpl/t/rpl_variables.test
--- a/mysql-test/suite/rpl/t/rpl_variables.test	2007-06-27 14:27:23 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_variables.test	2008-02-14 12:19:59 +01:00
@@ -18,3 +18,4 @@ show variables like 'slave_skip_errors';
 
 # Cleanup
 set global slave_net_timeout=default;
+sync_slave_with_master;
diff -Nrup a/mysql-test/t/symlink.test b/mysql-test/t/symlink.test
--- a/mysql-test/t/symlink.test	2008-02-05 13:42:23 +01:00
+++ b/mysql-test/t/symlink.test	2008-02-14 12:20:04 +01:00
@@ -208,7 +208,7 @@ USE db1;
 #no warning from create table
 SET SESSION keep_files_on_create = TRUE;
 --disable_abort_on_error
---error 1,1
+--error 1,1,ER_TABLE_EXISTS_ERROR
 CREATE TABLE t1 (a INT) ENGINE MYISAM;
 --enable_abort_on_error