diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-31 12:17:40 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-31 12:17:40 +0100 |
| commit | 1fa513188870389442d8483206583f234f9e093a (patch) | |
| tree | 1c45f012ce17fb7f3b98c3bb2c6ce80f19dbca25 | |
| parent | 34b9c6f50403001eaf1114d2f6241b6e0938cc5d (diff) | |
| download | mariadb-git-1fa513188870389442d8483206583f234f9e093a.tar.gz | |
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.
| -rw-r--r-- | mysql-test/include/have_local_infile.inc | 4 | ||||
| -rw-r--r-- | mysql-test/r/have_local_infile.require | 2 | ||||
| -rw-r--r-- | mysql-test/t/binlog_start_comment.test | 6 | ||||
| -rw-r--r-- | mysql-test/t/rpl_sp.test | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/mysql-test/include/have_local_infile.inc b/mysql-test/include/have_local_infile.inc new file mode 100644 index 00000000000..4a1362c6e30 --- /dev/null +++ b/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; diff --git a/mysql-test/r/have_local_infile.require b/mysql-test/r/have_local_infile.require new file mode 100644 index 00000000000..124540f7b77 --- /dev/null +++ b/mysql-test/r/have_local_infile.require @@ -0,0 +1,2 @@ +Variable_name Value +local_infile ON diff --git a/mysql-test/t/binlog_start_comment.test b/mysql-test/t/binlog_start_comment.test index 9e0b9555ff1..14e2269406b 100644 --- a/mysql-test/t/binlog_start_comment.test +++ b/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 diff --git a/mysql-test/t/rpl_sp.test b/mysql-test/t/rpl_sp.test index fc17c5615ef..f7cd8907e34 100644 --- a/mysql-test/t/rpl_sp.test +++ b/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; |