bzr commit into mysql-5.1-bugteam branch (sven.sandberg:3026) Bug#39934

[Sven Sandberg]

#At file:///home/sven/bzr/b39934-mats-slave_row_engine/5.1-bugteam/ based on revid:sven.sandberg@stripped

 3026 Sven Sandberg	2009-07-15
      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.

    modified:
      mysql-test/r/mysqldump.result
      mysql-test/t/mysqldump.test
=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2009-07-14 20:12:27 +0000
+++ b/mysql-test/r/mysqldump.result	2009-07-15 17:17:55 +0000
@@ -2239,8 +2239,6 @@ create  view v1 as
 select * from v3 where b in (1, 2, 3, 4, 5, 6, 7);
 create  view v2 as
 select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1;
-Warnings:
-Note	1592	Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Statement: CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select v3.a from v3, v1 where v1.a=v3.a and v3.b=3 limit 1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;

=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test	2009-07-13 19:11:16 +0000
+++ b/mysql-test/t/mysqldump.test	2009-07-15 17:17:55 +0000
@@ -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
 


Attachment: [text/bzr-bundle] bzr/[e-mail]