From 6f8f024aaf9a86e2bf12bc4a96bd5f9f4b2a7ac5 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Wed, 15 Jul 2009 19:17:55 +0200 Subject: post-push fixes for BUG#39934: make mysqldump.test pass even with binlog_format = MIXED or ROW. mysql-test/r/mysqldump.result: Remove warning from result file. mysql-test/t/mysqldump.test: The test gives a warning if binlog_format=STATEMENT due to BUG#45832. To make the result file not depend on binlog_format, we disable warnings. --- mysql-test/t/mysqldump.test | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mysql-test/t/mysqldump.test') diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index ec96124e14b..8178c9e1869 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -875,8 +875,13 @@ select * from t1; create view v1 as select * from v3 where b in (1, 2, 3, 4, 5, 6, 7); +# Disable warnings since LIMIT warning for unsafe statement if +# binlog_format = STATEMENT. Note: after BUG#45832, the warning should +# not be issued. +--disable_warnings create view v2 as select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1; +--enable_warnings --exec $MYSQL_DUMP --skip-comments test -- cgit v1.2.1