diff options
| author | unknown <SergeyV@selena.> | 2006-02-27 20:00:03 +0300 |
|---|---|---|
| committer | unknown <SergeyV@selena.> | 2006-02-27 20:00:03 +0300 |
| commit | 0aae3cd515b83bf66ae4d9006acce02e77114f32 (patch) | |
| tree | 5f9d848b17f9f892413610706513a39699dbf2cd /mysql-test | |
| parent | a431e91279b53652f50f2a2ccab0e5ea62db4cc9 (diff) | |
| parent | fefdd728ff508e18e85af9ee93944f3f368ff8d4 (diff) | |
| download | mariadb-git-0aae3cd515b83bf66ae4d9006acce02e77114f32.tar.gz | |
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into selena.:H:/MYSQL/src/#15943-mysql-5.0
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/view.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/view.test | 15 |
2 files changed, 25 insertions, 0 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index adf92909709..c9a79e50cc3 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -2529,3 +2529,13 @@ Warnings: Warning 1052 Column 'x' in group statement is ambiguous DROP VIEW v1; DROP TABLE t1; +drop table if exists t1; +drop view if exists v1; +create table t1 (id int); +create view v1 as select * from t1; +drop table t1; +show create view v1; +drop view v1; +// +View Create View +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select sql_no_cache `test`.`t1`.`id` AS `id` from `t1` diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index 77a903e2d3c..b7e678c6f77 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -2370,3 +2370,18 @@ SELECT IF(x IS NULL, 'blank', 'not blank') AS x FROM v1 GROUP BY x; DROP VIEW v1; DROP TABLE t1; + +# +# BUG#15943: mysql_next_result hangs on invalid SHOW CREATE VIEW +# + +delimiter //; +drop table if exists t1; +drop view if exists v1; +create table t1 (id int); +create view v1 as select * from t1; +drop table t1; +show create view v1; +drop view v1; +// +delimiter ;// |