summaryrefslogtreecommitdiff
path: root/mysql-test/extra
diff options
context:
space:
mode:
authorunknown <sven@riska.(none)>2008-02-27 15:18:27 +0100
committerunknown <sven@riska.(none)>2008-02-27 15:18:27 +0100
commit51a99d70e92ca9fd1e8e9889a531ab86846d4062 (patch)
treeaa973ede0eb8c4348dc79ea778736e09d9905a7f /mysql-test/extra
parentc7db565fc80b040c9de28359a3a4b780f7297bc0 (diff)
downloadmariadb-git-51a99d70e92ca9fd1e8e9889a531ab86846d4062.tar.gz
Fix pushbuild errors.
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: The test unnecessarily refused to run in non-debug mode. It can safely run in non-debug mode and produces the same result, so I removed the restriction. mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Updated result file. It is a little unclear what the best thing to put in the binlog is, but the present results for this particular test are enough to replicate. Mats will figure out more as he fixes BUG#29020. After BUG#34768 has been fixed, these statements should be marked unsafe and not allowed in statement mode. mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Updated result file. It is a little unclear what the best thing to put in the binlog is, but the present results for this particular test are enough to replicate. Mats will figure out more as he fixes BUG#29020. After BUG#34768 has been fixed, these statements should be marked unsafe and not allowed in statement mode.
Diffstat (limited to 'mysql-test/extra')
-rw-r--r--mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
index 6ac8a89591a..6879089a1b7 100644
--- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
+++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
@@ -7,7 +7,7 @@
-- source include/have_log_bin.inc
-- source include/have_innodb.inc
--- source include/have_debug.inc
+
--disable_warnings
drop table if exists t1, t2;