summaryrefslogtreecommitdiff
path: root/mysql-test/suite/binlog/t/binlog_sql_mode.test
diff options
context:
space:
mode:
authorSven Sandberg <sven.sandberg@oracle.com>2010-12-19 18:15:12 +0100
committerSven Sandberg <sven.sandberg@oracle.com>2010-12-19 18:15:12 +0100
commite37c86de18ba627f8c055e4a1b0923fb1f0a55de (patch)
tree91a12675003778cd8ccbccea5ce47ee09fc46efc /mysql-test/suite/binlog/t/binlog_sql_mode.test
parent7d5df402778b7e5c1df06f3dcaf499612d628a7c (diff)
parent09c80e12c535b080eaf914ed25dbf79546494030 (diff)
downloadmariadb-git-e37c86de18ba627f8c055e4a1b0923fb1f0a55de.tar.gz
Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.
Diffstat (limited to 'mysql-test/suite/binlog/t/binlog_sql_mode.test')
-rw-r--r--mysql-test/suite/binlog/t/binlog_sql_mode.test5
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_sql_mode.test b/mysql-test/suite/binlog/t/binlog_sql_mode.test
index 1777f8cb561..ab4f6450543 100644
--- a/mysql-test/suite/binlog/t/binlog_sql_mode.test
+++ b/mysql-test/suite/binlog/t/binlog_sql_mode.test
@@ -8,7 +8,6 @@
# Scan binlog file to check if the sql_mode is still set to 0 before generating binlog event
#
--- source include/master-slave.inc
-- source include/have_log_bin.inc
# BUG#39526 sql_mode not retained in binary log for CREATE PROCEDURE
@@ -50,10 +49,10 @@ CREATE EVENT testEvent ON SCHEDULE
END;|
DELIMITER ;|
---echo Chceck Result
+--echo Check Result
let $MYSQLD_DATADIR= `select @@datadir`;
---exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug39526.binlog
+--exec $MYSQL_BINLOG --force-if-open $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug39526.binlog
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
eval select
(@a:=load_file("$MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug39526.binlog"))