diff options
author | unknown <mattiasj@client-10-129-10-147.upp.off.mysql.com> | 2008-05-08 13:45:40 +0200 |
---|---|---|
committer | unknown <mattiasj@client-10-129-10-147.upp.off.mysql.com> | 2008-05-08 13:45:40 +0200 |
commit | 266eb2bd8dc57b8c74a6785a3118eb92d71650fa (patch) | |
tree | 3976cbff6bff52792752d519980ef272db6007ce /mysql-test/suite/rpl/r/rpl_view.result | |
parent | 41a7fa623abdf086313f5bbe2af9720eba0941ca (diff) | |
parent | ab6e91cf3af9ef3d69e80420eef1ada05d66b9f7 (diff) | |
download | mariadb-git-266eb2bd8dc57b8c74a6785a3118eb92d71650fa.tar.gz |
Merge client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-50-bugteam
into client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-51-bugteam
mysql-test/suite/rpl/r/rpl_sp.result:
Auto merged
mysql-test/suite/rpl/t/rpl_view.test:
Auto merged
sql/sql_view.cc:
This was already fixed in 5.1
mysql-test/suite/rpl/r/rpl_view.result:
manual merge
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_view.result')
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_view.result | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_view.result b/mysql-test/suite/rpl/r/rpl_view.result index 12b7b46ffed..b24f230e7c5 100644 --- a/mysql-test/suite/rpl/r/rpl_view.result +++ b/mysql-test/suite/rpl/r/rpl_view.result @@ -101,4 +101,18 @@ CREATE VIEW v1 AS SELECT * FROM t1; ERROR 42S01: Table 'v1' already exists DROP VIEW v1; DROP TABLE t1; +CREATE TABLE t1 (a INT); +# create view as output from mysqldump 10.11 (5.0.62) +/*!50001 CREATE ALGORITHM=UNDEFINED */ +/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */ +/*!50001 VIEW `v1` AS select `t1`.`a` AS `a` from `t1` where (`t1`.`a` < 3) */ +/*!50002 WITH CASCADED CHECK OPTION */; +SHOW CREATE VIEW v1; +View Create View +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1` where (`t1`.`a` < 3) WITH CASCADED CHECK OPTION +SHOW CREATE VIEW v1; +View Create View +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1` where (`t1`.`a` < 3) WITH CASCADED CHECK OPTION +DROP VIEW v1; +DROP TABLE t1; End of 5.0 tests |