summaryrefslogtreecommitdiff
path: root/mysql-test/r/trigger-compat.result
diff options
context:
space:
mode:
authorPatrick Crews <patrick.crews@sun.com>2009-02-19 18:24:25 -0500
committerPatrick Crews <patrick.crews@sun.com>2009-02-19 18:24:25 -0500
commite9b4b536f39d459b51c6b3db308be809003c7210 (patch)
treecdb649a4f978cf26309509f0be874d043fa91bb9 /mysql-test/r/trigger-compat.result
parent901427b2413a8f8c80b4720969d101357da57556 (diff)
parentcf571967ad8625643e0a7251e20246207cee46a9 (diff)
downloadmariadb-git-e9b4b536f39d459b51c6b3db308be809003c7210.tar.gz
merge 5.0 -> 5.1
These are only 5.0's fixes being merged. 5.1 and 6.0 Unix-removals will occur in different patches.
Diffstat (limited to 'mysql-test/r/trigger-compat.result')
-rw-r--r--mysql-test/r/trigger-compat.result4
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/r/trigger-compat.result b/mysql-test/r/trigger-compat.result
index 1609707fb09..2bcd919e0db 100644
--- a/mysql-test/r/trigger-compat.result
+++ b/mysql-test/r/trigger-compat.result
@@ -12,9 +12,7 @@ GRANT CREATE, TRIGGER ON mysqltest_db1.* TO mysqltest_dfn@localhost;
---> connection: wl2818_definer_con
CREATE TABLE t1(num_value INT);
CREATE TABLE t2(user_str TEXT);
-CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1
-FOR EACH ROW
-INSERT INTO t2 VALUES(CURRENT_USER());
+CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1 FOR EACH ROW INSERT INTO t2 VALUES(CURRENT_USER());
---> patching t1.TRG...