From: Dmitry Shulga
Date: June 10 2011 1:31pm
Subject: bzr commit into mysql-trunk branch (Dmitry.Shulga:3187) Bug#11753738
List-Archive: http://lists.mysql.com/commits/139066
X-Bug: 11753738
Message-Id: <201106101331.p5ADVJP4008123@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1209292288086313561=="

--===============1209292288086313561==
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:jon.hauglid@stripped

 3187 Dmitry Shulga	2011-06-10
      Follow-up patch for bug#11753738.

    modified:
      mysql-test/r/trigger.result
=== 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


--===============1209292288086313561==
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\
#   kemr1ntq3ln392x4
# target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/
# testament_sha1: de2d97b244c364e2632a70d95e520f377b839b8e
# timestamp: 2011-06-10 20:31:15 +0700
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\
#   bug11763757/
# base_revision_id: jon.hauglid@stripped\
#   u5030fex1hg5kpvz
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcxTRWAAAY7fgAAQWOP//3cG
vyC////wUAP5d5XenmlHO3vXsElCJlPEDI9JtQTaT0mkeSZpBsoPJHqDQiZU/FPRoNU0xDR5I0NM
hoAANBppBGETJPJMRkaAGgGg0Gg0DFNJlT08k1PUPUxqaaAGg0yaA0aaAElI00yCmTwjQ1GmnqGQ
NAAABPGH67BquW1KlWAAVq33yZfu/A54292Mgn2sTY1+rMrFJOlfCY210fUMiv4p1h+tfeUPvXEP
hC4tX6IZ3uLBsnRtxbHMntsnhCL58BrBfyzazcja2Y6iGnjgitFDVq6Fm5f7DtWxyEjbqMC8mxnU
WvBsUi4ClzigQieo/TxBGeQRQR9WZqBw1gRJ76yh0kqoJWBYy7a41PVwa2CaIqU4spub9ZARtbg7
pJ2aiWa23E0UvMu82T5G13Mckj10GF4V3kLXDKaQcfDiK0BkCL5cZh63hXuTeoE0QacPvGtBvCid
cs4o4xU4zQYChK/8FI4yGOKyTUbQGC0i+5S4UMFKVggwm4PtFuVKouCpCvkGXMloWETGyrGOExlY
vAlPxEQdK4JOTL5MEok6x4qbpGYZxjpsD8izliGJozUvwJuB1MBRZLemGl6QMcKilYzJIS4ioVBL
2rQpEBDRgK5YxwqkXTZJJF4EVD3MQqyIlC9IyFPE8apq8idD6wsjTEus0gMOdf4ii6xdD84/fkdG
zmqM82e7OT82JDOX3ab2ryZdbEB2ub4e3qkUeBfcHptlKwUYOvgQsWbEUai1n3hw2WTe0Vpv5RHl
PACeoOgNxv4DoaazDh9dGXPopklc1ItSMkcb+ET35TjITuoV5McKweVl5hTi1GXB5mIY2ijmN7e1
uRjQWDbQU9+2LE3TlsEw5ujIviNKXgVWYs6krEePkpPQgodbG49vwg3gWkZCMsbWKafJdC4kzu0z
QlY1KCcnPKoios0PjIytWlA843VS/aZwbJGPq71rQY8ETAzhhRIsxrVgX7Naa0wR2LYaKPSZJkMy
ZMZaR9fZVpt7WXkXHcoipbAlo56nuxorDhQQZG/zkLx6zLAtsFaHKGma4KQpujCmhIYaUGhVTV3y
axTxKmLPIIrGQvU1tJ9G6lc9zioQ4qWhygoKgmkKJucAwsWtlFkR2ApoCOVIKmengKb/M+IApRyY
tu+Q8iZoz4SJwau6Ryq7Uj8mbWs1iRTDZTQZRit8zBsgIjBhiGLJuZATBQYk4qCJ9RRvrFLhDcol
wJF1vC2gHQhoDABwTOcmslGB5znWTVjAaQmtOlc4quCMgEVULDguOXze63YE4M1+DxjE3LXONIBB
BNitI2WCHxqKHBIm2bL9xVIJaVByUPFKQJisLgKBmJs1LLYCniWstUAC1C3dcKxIXh+sYz2hIz/x
dyRThQkMxTRWAA==


--===============1209292288086313561==--