summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <anozdrin/alik@quad.>2008-02-21 12:48:55 +0300
committerunknown <anozdrin/alik@quad.>2008-02-21 12:48:55 +0300
commitffd88cb2bd1bb31a85036a422145b325a36d629e (patch)
tree1249f3dc5e86a345e53f41595e2d1ee8e47003a9
parent9bbf256cb3e95d4ebd04ba09afe6ac6e4af10879 (diff)
downloadmariadb-git-ffd88cb2bd1bb31a85036a422145b325a36d629e.tar.gz
Fix merge (fix result file)
-rw-r--r--mysql-test/r/view.result32
1 files changed, 17 insertions, 15 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
index c42a47422b2..0e89210cb60 100644
--- a/mysql-test/r/view.result
+++ b/mysql-test/r/view.result
@@ -3614,6 +3614,23 @@ set @@sql_mode=@old_mode;
drop view v1;
drop table t1;
# -----------------------------------------------------------------
+# -- Bug#34337: Server crash when Altering a view using a table name.
+# -----------------------------------------------------------------
+
+DROP TABLE IF EXISTS t1;
+
+CREATE TABLE t1(c1 INT);
+
+SELECT * FROM t1;
+c1
+ALTER ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW t1 (c2) AS SELECT (1);
+ERROR HY000: 'test.t1' is not VIEW
+
+DROP TABLE t1;
+
+# -- End of test case for Bug#34337.
+
+# -----------------------------------------------------------------
# -- End of 5.0 tests.
# -----------------------------------------------------------------
DROP DATABASE IF EXISTS `d-1`;
@@ -3732,20 +3749,5 @@ call p();
drop view a;
drop procedure p;
# -----------------------------------------------------------------
-# -- Bug#34337: Server crash when Altering a view using a table name.
-# -----------------------------------------------------------------
-
-DROP TABLE IF EXISTS t1;
-
-CREATE TABLE t1(c1 INT);
-
-ALTER ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW t1 (c2) AS SELECT (1);
-ERROR HY000: 'test.t1' is not VIEW
-
-DROP TABLE t1;
-
-# -- End of test case for Bug#34337.
-
-# -----------------------------------------------------------------
# -- End of 5.1 tests.
# -----------------------------------------------------------------