From ffd88cb2bd1bb31a85036a422145b325a36d629e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 21 Feb 2008 12:48:55 +0300 Subject: Fix merge (fix result file) --- mysql-test/r/view.result | 32 +++++++++++++++++--------------- 1 file 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 @@ -3613,6 +3613,23 @@ ERROR HY000: Field of view 'test.v1' underlying table doesn't have a default val 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. # ----------------------------------------------------------------- @@ -3731,21 +3748,6 @@ call p(); 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. # ----------------------------------------------------------------- -- cgit v1.2.1