diff options
author | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-07-31 17:40:09 +0300 |
---|---|---|
committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2006-07-31 17:40:09 +0300 |
commit | 4acf6de89b0a0aca6137c361e116d5f58e86814e (patch) | |
tree | e5627597f34d1311f08bf95378ef777b9c710030 /mysql-test | |
parent | 667c73be65bc1c1a6f77d6e2bb140cdddae9ec73 (diff) | |
parent | c8673b09b871f5c6d55ce69e8302dbf0e5b2c348 (diff) | |
download | mariadb-git-4acf6de89b0a0aca6137c361e116d5f58e86814e.tar.gz |
Merge bk-internal:/home/bk/mysql-5.0-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B21080-5.0-opt
mysql-test/r/view.result:
merge
mysql-test/t/view.test:
merge
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/view.result | 11 | ||||
-rw-r--r-- | mysql-test/t/view.test | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index b2c65423b59..3b5ccad7298 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -2807,6 +2807,17 @@ yadda yad DROP VIEW v1; DROP TABLE t1; +CREATE TABLE t1 (x INT, y INT); +CREATE ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW v1 AS SELECT x FROM t1; +SHOW CREATE VIEW v1; +View Create View +v1 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `v1` AS select `t1`.`x` AS `x` from `t1` +ALTER VIEW v1 AS SELECT x, y FROM t1; +SHOW CREATE VIEW v1; +View Create View +v1 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `v1` AS select `t1`.`x` AS `x`,`t1`.`y` AS `y` from `t1` +DROP VIEW v1; +DROP TABLE t1; CREATE TABLE t1 (s1 char); INSERT INTO t1 VALUES ('Z'); CREATE VIEW v1 AS SELECT s1 collate latin1_german1_ci AS col FROM t1; diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test index 1b930353ca4..fba5f75c32c 100644 --- a/mysql-test/t/view.test +++ b/mysql-test/t/view.test @@ -2669,6 +2669,17 @@ DROP VIEW v1; DROP TABLE t1; # +#Bug #21080: ALTER VIEW makes user restate SQL SECURITY mode, and ALGORITHM +# +CREATE TABLE t1 (x INT, y INT); +CREATE ALGORITHM=TEMPTABLE SQL SECURITY INVOKER VIEW v1 AS SELECT x FROM t1; +SHOW CREATE VIEW v1; + +ALTER VIEW v1 AS SELECT x, y FROM t1; +SHOW CREATE VIEW v1; + +DROP VIEW v1; +DROP TABLE t1; # Bug #21086: server crashes when VIEW defined with a SELECT with COLLATE # clause is called # |