From fe0b818f9a07a9e56053c8addf53796e106e6c81 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 9 Mar 2006 21:00:45 +0300 Subject: After-merge fixes. mysql-test/r/trigger-grant.result: Updated the result file. mysql-test/r/view_grant.result: Updated the result file. mysql-test/t/trigger-grant.test: A patch for BUG#13198 has been merged, so need to update the test case. mysql-test/t/view_grant.test: A patch for BUG#16777 has been merged, so need to update the test case. sql/sql_parse.cc: After-merge fix (should have been a part of fix for BUG#16777). sql/sql_show.cc: After-merge fix -- empty identifier should be quoted. --- mysql-test/r/trigger-grant.result | 1 + 1 file changed, 1 insertion(+) (limited to 'mysql-test/r/trigger-grant.result') diff --git a/mysql-test/r/trigger-grant.result b/mysql-test/r/trigger-grant.result index c3bbc82ef5b..10f1e08eded 100644 --- a/mysql-test/r/trigger-grant.result +++ b/mysql-test/r/trigger-grant.result @@ -135,6 +135,7 @@ SET @new_sum = 0; Warnings: Note 1449 There is no 'mysqltest_nonexs'@'localhost' registered INSERT INTO t1 VALUES(6); +ERROR HY000: There is no 'mysqltest_nonexs'@'localhost' registered SHOW TRIGGERS; Trigger Event Table Statement Timing Created sql_mode Definer trg1 INSERT t1 SET @new_sum = 0 BEFORE NULL mysqltest_inv@localhost -- cgit v1.2.1