From: Dmitry Shulga
Date: June 9 2011 6:13pm
Subject: bzr commit into mysql-trunk branch (Dmitry.Shulga:3177) Bug#11764334
List-Archive: http://lists.mysql.com/commits/138994
X-Bug: 11764334
Message-Id: <201106091813.p59IDHGK019496@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6415976514912215191=="

--===============6415976514912215191==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/shulga/projects/mysql/mysql-trunk/ based on revid:dmitry.shulga@stripped

 3177 Dmitry Shulga	2011-06-10 [merge]
      Auto-merge of follow-up for bug#11764334 from mysql-5.5 tree.

    modified:
      mysql-test/r/events_bugs.result
      mysql-test/t/events_bugs.test
=== modified file 'mysql-test/r/events_bugs.result'
--- a/mysql-test/r/events_bugs.result	2011-06-09 17:07:03 +0000
+++ b/mysql-test/r/events_bugs.result	2011-06-09 18:08:38 +0000
@@ -802,11 +802,11 @@ USE event_test11764334;
 CREATE EVENT ev1 ON SCHEDULE EVERY 3 SECOND DISABLE DO SELECT 1;
 SHOW EVENTS IN event_test11764334 WHERE NAME='ev1';
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-event_test11764334	ev1	root@localhost	SYSTEM	RECURRING	NULL	3	SECOND	2011-06-09 19:59:01	NULL	DISABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
+event_test11764334	ev1	root@localhost	SYSTEM	RECURRING	NULL	3	SECOND	#	#	DISABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 ALTER EVENT ev1 ON SCHEDULE EVERY 4 SECOND;
 SHOW EVENTS IN event_test11764334 WHERE NAME='ev1';
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
-event_test11764334	ev1	root@localhost	SYSTEM	RECURRING	NULL	4	SECOND	2011-06-09 19:59:01	NULL	DISABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
+event_test11764334	ev1	root@localhost	SYSTEM	RECURRING	NULL	4	SECOND	#	#	DISABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP EVENT ev1;
 DROP DATABASE event_test11764334;
 USE test;

=== modified file 'mysql-test/t/events_bugs.test'
--- a/mysql-test/t/events_bugs.test	2011-06-09 17:07:03 +0000
+++ b/mysql-test/t/events_bugs.test	2011-06-09 18:08:38 +0000
@@ -1295,8 +1295,10 @@ DROP DATABASE IF EXISTS event_test117643
 CREATE DATABASE event_test11764334;
 USE event_test11764334;
 CREATE EVENT ev1 ON SCHEDULE EVERY 3 SECOND DISABLE DO SELECT 1;
+--replace_column 9 # 10 #
 SHOW EVENTS IN event_test11764334 WHERE NAME='ev1';
 ALTER EVENT ev1 ON SCHEDULE EVERY 4 SECOND;
+--replace_column 9 # 10 #
 SHOW EVENTS IN event_test11764334 WHERE NAME='ev1';
 DROP EVENT ev1;
 DROP DATABASE event_test11764334;


--===============6415976514912215191==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.shulga@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   8ar69hlgux0sjhql
# target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/
# testament_sha1: b3c57f4eddaf6b9d9a883cff36007d4bd64d0d4a
# timestamp: 2011-06-10 01:13:12 +0700
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\
#   bug11763757/
# base_revision_id: dmitry.shulga@stripped\
#   mkf1ay4o5fm2bldw
# 
# Begin bundle
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
zhYhUhlCWAdgUpdKGZSs/4u5IpwoSEJjVLGA


--===============6415976514912215191==--