summaryrefslogtreecommitdiff
path: root/mysql-test/t/view.test
diff options
context:
space:
mode:
authoranozdrin/alik@quad. <>2008-02-21 12:24:40 +0300
committeranozdrin/alik@quad. <>2008-02-21 12:24:40 +0300
commitf039cf7ac79df7deb2d94743a5e3c5ac24364692 (patch)
treea0612f5b54f463e797291d098ceb491f5d9d6cd7 /mysql-test/t/view.test
parent919ccd91116987bd3a23fbab839adc492a1e7428 (diff)
parentf5cb5fdc4fce3b6469655ee2ecc828606d41f7c2 (diff)
downloadmariadb-git-f039cf7ac79df7deb2d94743a5e3c5ac24364692.tar.gz
Merge quad.:/mnt/raid/alik/MySQL/devel/bug-34337/5.0-rt-bug34337
into quad.:/mnt/raid/alik/MySQL/devel/bug-34337/5.1-rt-bug34337
Diffstat (limited to 'mysql-test/t/view.test')
-rw-r--r--mysql-test/t/view.test60
1 files changed, 32 insertions, 28 deletions
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 5c600f05f12..f337bcdaf89 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -3468,6 +3468,38 @@ set @@sql_mode=@old_mode;
drop view v1;
drop table t1;
+###########################################################################
+
+--echo # -----------------------------------------------------------------
+--echo # -- Bug#34337: Server crash when Altering a view using a table name.
+--echo # -----------------------------------------------------------------
+--echo
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+--echo
+
+CREATE TABLE t1(c1 INT);
+
+--echo
+
+SELECT * FROM t1;
+
+--error ER_WRONG_OBJECT
+ALTER ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW t1 (c2) AS SELECT (1);
+
+--echo
+
+DROP TABLE t1;
+
+--echo
+--echo # -- End of test case for Bug#34337.
+--echo
+
+###########################################################################
+
--echo # -----------------------------------------------------------------
--echo # -- End of 5.0 tests.
--echo # -----------------------------------------------------------------
@@ -3625,33 +3657,5 @@ drop procedure p;
###########################################################################
--echo # -----------------------------------------------------------------
---echo # -- Bug#34337: Server crash when Altering a view using a table name.
---echo # -----------------------------------------------------------------
---echo
-
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
---echo
-
-CREATE TABLE t1(c1 INT);
-
---echo
-
---error ER_WRONG_OBJECT
-ALTER ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW t1 (c2) AS SELECT (1);
-
---echo
-
-DROP TABLE t1;
-
---echo
---echo # -- End of test case for Bug#34337.
---echo
-
-###########################################################################
-
---echo # -----------------------------------------------------------------
--echo # -- End of 5.1 tests.
--echo # -----------------------------------------------------------------