Changes to fix tests in pushbuild.

mysql-test/include/have_local_infile.inc:
  BitKeeper file /data0/mkindahl/mysql-5.0-rpl-merge/mysql-test/include/have_local_infile.inc
mysql-test/r/have_local_infile.require:
  BitKeeper file /data0/mkindahl/mysql-5.0-rpl-merge/mysql-test/r/have_local_infile.require
mysql-test/t/binlog_start_comment.test:
  Test requires that local_infile is on, so added require for that.
mysql-test/t/rpl_sp.test:
  Adding missing sync_slave_with_master causing following tests to fail.

mysql-test/include/have_local_infile.inc

@@ -0,0 +1,4 @@
+--require r/have_local_infile.require
+disable_query_log;
+show variables like 'local_infile';
+enable_query_log;

mysql-test/r/have_local_infile.require

@@ -0,0 +1,2 @@
+Variable_name	Value
+local_infile	ON

mysql-test/t/binlog_start_comment.test

@@ -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

mysql-test/t/rpl_sp.test

@@ -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_creators=0;
 # Clean up
 drop database mysqltest;
 drop database mysqltest2;
+sync_slave_with_master;