summaryrefslogtreecommitdiff
path: root/mysql-test/r/trigger.result
diff options
context:
space:
mode:
authorDmitry Shulga <Dmitry.Shulga@oracle.com>2011-06-10 14:20:15 +0700
committerDmitry Shulga <Dmitry.Shulga@oracle.com>2011-06-10 14:20:15 +0700
commit2d715ba6042cc8e1ad5114c25070aa8d18095246 (patch)
tree1baeecb0b58bae9ae8a41c5f81245e2b8037b411 /mysql-test/r/trigger.result
parent155df6c6574bbc23f8458ea958b838c02cd263d7 (diff)
parent1fea8c1b9070018be12f9c748fec781322944d7c (diff)
downloadmariadb-git-2d715ba6042cc8e1ad5114c25070aa8d18095246.tar.gz
Manual-merge of patch for bug#11753738 from mysql-5.1 tree.
Diffstat (limited to 'mysql-test/r/trigger.result')
-rw-r--r--mysql-test/r/trigger.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result
index e759153eaaf..e9d43b3c6f2 100644
--- a/mysql-test/r/trigger.result
+++ b/mysql-test/r/trigger.result
@@ -2118,7 +2118,7 @@ CREATE TRIGGER trg1 BEFORE INSERT ON t2 FOR EACH ROW INSERT/*!INTO*/t1 VALUES (1
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: 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 'VALUES (1)' at line 1'
SELECT * FROM t1;
b
# Work around Bug#45235