summaryrefslogtreecommitdiff
path: root/mysql-test/t/view.test
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2009-08-11 13:29:45 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2009-08-11 13:29:45 -0300
commit501c7d2e4f2c99e12b7eec96b555f45eb763885d (patch)
tree6f1a53beee5c20bc11a819e4724567e9c8ccd12c /mysql-test/t/view.test
parent502eb9843eacf00dacc5ead09ff25aab161cee0c (diff)
parent4b80599a6250dc7244953038078e79a53ff5647b (diff)
downloadmariadb-git-501c7d2e4f2c99e12b7eec96b555f45eb763885d.tar.gz
Merge from mysql-5.0-bugteam.
Diffstat (limited to 'mysql-test/t/view.test')
-rw-r--r--mysql-test/t/view.test46
1 files changed, 23 insertions, 23 deletions
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index 7bec02e6fb6..b2490847dbc 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -3680,29 +3680,6 @@ SELECT * FROM v1 IGNORE INDEX (c2) WHERE c2=2;
DROP VIEW v1;
DROP TABLE t1;
---echo # -----------------------------------------------------------------
---echo # -- Bug#40825: Error 1356 while selecting from a view
---echo # -- with a "HAVING" clause though query works
---echo # -----------------------------------------------------------------
---echo
-
-CREATE TABLE t1 (c INT);
-
---echo
-
-CREATE VIEW v1 (view_column) AS SELECT c AS alias FROM t1 HAVING alias;
-SHOW CREATE VIEW v1;
-SELECT * FROM v1;
-
---echo
-
-DROP VIEW v1;
-DROP TABLE t1;
-
---echo
---echo # -- End of test case for Bug#40825
---echo
-
--echo #
--echo # Bug #45806 crash when replacing into a view with a join!
--echo #
@@ -3736,6 +3713,29 @@ DROP TABLE t1;
--echo # -- End of test case for Bug#45806
--echo # -----------------------------------------------------------------
+--echo # -- Bug#40825: Error 1356 while selecting from a view
+--echo # -- with a "HAVING" clause though query works
+--echo # -----------------------------------------------------------------
+--echo
+
+CREATE TABLE t1 (c INT);
+
+--echo
+
+CREATE VIEW v1 (view_column) AS SELECT c AS alias FROM t1 HAVING alias;
+SHOW CREATE VIEW v1;
+SELECT * FROM v1;
+
+--echo
+
+DROP VIEW v1;
+DROP TABLE t1;
+
+--echo
+--echo # -- End of test case for Bug#40825
+--echo
+
+--echo # -----------------------------------------------------------------
--echo # -- End of 5.0 tests.
--echo # -----------------------------------------------------------------