List:Commits« Previous MessageNext Message »
From:Dmitry Shulga Date:June 10 2011 1:32pm
Subject:bzr push into mysql-trunk branch (Dmitry.Shulga:3186 to 3187) Bug#11753738
View as plain text  
 3187 Dmitry Shulga	2011-06-10
      Follow-up patch for bug#11753738.

    modified:
      mysql-test/r/trigger.result
 3186 Jon Olav Hauglid	2011-06-10 [merge]
      merge from mysql-5.5 to mysql-trunk
      Text conflict in VERSION

    modified:
      mysql-test/r/query_cache_28249.result
      mysql-test/t/disabled.def
      mysql-test/t/query_cache_28249.test
=== modified file 'mysql-test/r/trigger.result'
--- a/mysql-test/r/trigger.result	2011-06-10 07:38:06 +0000
+++ b/mysql-test/r/trigger.result	2011-06-10 13:31:09 +0000
@@ -2106,7 +2106,7 @@ CREATE TRIGGER trg1 BEFORE INSERT ON t2 
 SHOW TRIGGERS IN db1;
 Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_client	collation_connection	Database Collation
 INSERT INTO t2 VALUES (1);
-ERROR 42000: Trigger 'trg1' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'VALUES (1)' at line 1'
+ERROR 42000: Trigger 'trg1' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 't1 VALUES (1)' at line 1'
 SELECT * FROM t1;
 b
 # Work around Bug#45235


Attachment: [text/bzr-bundle] bzr/dmitry.shulga@oracle.com-20110610133109-kemr1ntq3ln392x4.bundle
Thread
bzr push into mysql-trunk branch (Dmitry.Shulga:3186 to 3187) Bug#11753738Dmitry Shulga10 Jun