Commit 1fa51318 authored by unknown's avatar unknown

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.
parent 34b9c6f5
--require r/have_local_infile.require
disable_query_log;
show variables like 'local_infile';
enable_query_log;
Variable_name Value
local_infile ON
# Test case for bug#32205 Replaying statements from mysqlbinlog fails # Test case for bug#32205 Replaying statements from mysqlbinlog fails
# with a syntax error, replicates fine # 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; reset master;
--disable_warnings --disable_warnings
drop table if exists t1,t2; drop table if exists t1,t2;
...@@ -19,4 +21,4 @@ select * from t2; ...@@ -19,4 +21,4 @@ select * from t2;
# clean up # clean up
drop table t1,t2; drop table t1,t2;
--system rm $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog #--system rm $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
...@@ -560,7 +560,6 @@ set @a:= mysqltest2.f1(); ...@@ -560,7 +560,6 @@ set @a:= mysqltest2.f1();
sync_slave_with_master; sync_slave_with_master;
connection master; connection master;
# Final inspection which verifies how all statements of this test file # Final inspection which verifies how all statements of this test file
# were written to the binary log. # were written to the binary log.
--replace_column 2 # 5 # --replace_column 2 # 5 #
...@@ -577,3 +576,4 @@ set global log_bin_trust_function_creators=0; ...@@ -577,3 +576,4 @@ set global log_bin_trust_function_creators=0;
# Clean up # Clean up
drop database mysqltest; drop database mysqltest;
drop database mysqltest2; drop database mysqltest2;
sync_slave_with_master;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment