Commit 10b194d2 authored by mkindahl@dl145h.mysql.com's avatar mkindahl@dl145h.mysql.com
Browse files

Changes to fix tests in pushbuild.

parent b8428d15

mysql-test/include/have_local_infile.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--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 → 100644
+2 −0
Original line number Diff line number Diff line 
Variable_name	Value

local_infile	ON

mysql-test/t/binlog_start_comment.test

+4 −2
Original line number Diff line number Diff line 
# 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

+1 −1
Original line number Diff line number Diff line
@@ -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;