bk commit into 5.0 tree (mkindahl:1.2589)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.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-01-31 12:17:40+01:00, mkindahl@stripped +4 -0
  Changes to fix tests in pushbuild.

  mysql-test/include/have_local_infile.inc@stripped, 2008-01-31 12:15:03+01:00, mkindahl@stripped +4 -0
    BitKeeper file /data0/mkindahl/mysql-5.0-rpl-merge/mysql-test/include/have_local_infile.inc

  mysql-test/include/have_local_infile.inc@stripped, 2008-01-31 12:15:03+01:00, mkindahl@stripped +0 -0

  mysql-test/r/have_local_infile.require@stripped, 2008-01-31 12:15:04+01:00, mkindahl@stripped +2 -0
    BitKeeper file /data0/mkindahl/mysql-5.0-rpl-merge/mysql-test/r/have_local_infile.require

  mysql-test/r/have_local_infile.require@stripped, 2008-01-31 12:15:04+01:00, mkindahl@stripped +0 -0

  mysql-test/t/binlog_start_comment.test@stripped, 2008-01-31 12:17:19+01:00, mkindahl@stripped +4 -2
    Test requires that local_infile is on, so added require for that.

  mysql-test/t/rpl_sp.test@stripped, 2008-01-31 12:17:25+01:00, mkindahl@stripped +1 -1
    Adding missing sync_slave_with_master causing following tests to fail.

diff -Nrup a/mysql-test/include/have_local_infile.inc b/mysql-test/include/have_local_infile.inc
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/include/have_local_infile.inc	2008-01-31 12:15:03 +01:00
@@ -0,0 +1,4 @@
+--require r/have_local_infile.require
+disable_query_log;
+show variables like 'local_infile';
+enable_query_log;
diff -Nrup a/mysql-test/r/have_local_infile.require b/mysql-test/r/have_local_infile.require
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/r/have_local_infile.require	2008-01-31 12:15:04 +01:00
@@ -0,0 +1,2 @@
+Variable_name	Value
+local_infile	ON
diff -Nrup a/mysql-test/t/binlog_start_comment.test b/mysql-test/t/binlog_start_comment.test
--- a/mysql-test/t/binlog_start_comment.test	2007-12-18 08:43:48 +01:00
+++ b/mysql-test/t/binlog_start_comment.test	2008-01-31 12:17:19 +01:00
@@ -1,7 +1,9 @@
 # Test case for bug#32205 Replaying statements from mysqlbinlog fails
 # with a syntax error, replicates fine
 
--- source include/have_log_bin.inc
+source include/have_log_bin.inc;
+source include/have_local_infile.inc;
+
 reset master;
 --disable_warnings
 drop table if exists t1,t2;
@@ -19,4 +21,4 @@ select * from t2;
 
 # clean up
 drop table t1,t2;
---system rm $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
+#--system rm $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
diff -Nrup a/mysql-test/t/rpl_sp.test b/mysql-test/t/rpl_sp.test
--- a/mysql-test/t/rpl_sp.test	2007-01-08 22:01:04 +01:00
+++ b/mysql-test/t/rpl_sp.test	2008-01-31 12:17:25 +01:00
@@ -560,7 +560,6 @@ set @a:= mysqltest2.f1();
 sync_slave_with_master;
 connection master;
 
-
 # Final inspection which verifies how all statements of this test file
 # were written to the binary log.
 --replace_column 2 # 5 #
@@ -577,3 +576,4 @@ set global log_bin_trust_function_creato
 # Clean up
 drop database mysqltest;
 drop database mysqltest2;
+sync_slave_with_master;