From: Jon Olav Hauglid
Date: November 9 2012 5:15pm
Subject: bzr push into mysql-5.6 branch (jon.hauglid:4574 to 4575) Bug#11762933
List-Archive: http://lists.mysql.com/commits/145225
X-Bug: 11762933
Message-Id: <20121109171504.18954.34453.4575@atum08.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4575 Jon Olav Hauglid	2012-11-09
      Bug#11762933: MYSQLDUMP WILL SILENTLY SKIP THE `EVENT` TABLE DATA IF DUMPS
      
      Post-push fix: Drop event explicitly since events are now dumped even with --skip-events

    modified:
      mysql-test/r/mysqldump.result
      mysql-test/t/mysqldump.test
 4574 Jon Olav Hauglid	2012-11-09 [merge]
      Null merge from mysql-5.5 to mysql-5.6

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2012-10-22 08:08:04 +0000
+++ b/mysql-test/r/mysqldump.result	2012-11-09 16:36:09 +0000
@@ -4377,6 +4377,8 @@ test	e29938	root@localhost	SYSTEM	ONE TI
 TRUNCATE mysql.event;
 SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
+test	e29938	root@localhost	SYSTEM	ONE TIME	2035-12-31 20:01:23	NULL	NULL	NULL	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
+DROP EVENT e29938;
 #
 # Bug#31113 mysqldump 5.1 can't handle a dash ("-") in database names
 #

=== modified file 'mysql-test/t/mysqldump.test'
--- a/mysql-test/t/mysqldump.test	2012-08-27 13:39:48 +0000
+++ b/mysql-test/t/mysqldump.test	2012-11-09 16:36:09 +0000
@@ -1889,6 +1889,7 @@ TRUNCATE mysql.event;
 --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug29938.sql
 SHOW EVENTS;
 --remove_file $MYSQLTEST_VARDIR/tmp/bug29938.sql
+DROP EVENT e29938;  # Events are now dumped even with --skip-events
 
 
 --echo #

No bundle (reason: useless for push emails).