diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-09-14 11:07:04 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-09-14 11:07:04 +0300 |
| commit | d0a78e6fa6f7ac5cbe16fa7680aa532af3d80e8e (patch) | |
| tree | fce4b18c473720fa7cbd61bd4bf4ac04214f27be /mysql-test/r/sql_mode.result | |
| parent | a8d4bfd168ab0e4d2fe545f1719e063e64196fcf (diff) | |
| parent | f7aeb6f9fd473d856585ffa068064067f02cbd94 (diff) | |
| download | mariadb-git-d0a78e6fa6f7ac5cbe16fa7680aa532af3d80e8e.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
mysql-test/r/func_in.result:
merge
mysql-test/r/lowercase_view.result:
merge
mysql-test/r/mysqldump.result:
merge
mysql-test/r/sql_mode.result:
merge
mysql-test/r/temp_table.result:
merge
mysql-test/r/view.result:
merge
mysql-test/t/view.test:
merge
Diffstat (limited to 'mysql-test/r/sql_mode.result')
| -rw-r--r-- | mysql-test/r/sql_mode.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result index 33ab83bbd11..c35c88b993b 100644 --- a/mysql-test/r/sql_mode.result +++ b/mysql-test/r/sql_mode.result @@ -449,11 +449,11 @@ create table t2 (a int); create view v1 as select a from t1; show create view v1; View Create View -v1 CREATE ALGORITHM=UNDEFINED VIEW `v1` AS select `t1`.`a` AS `a` from `t1` +v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test`.`v1` AS select `test`.`t1`.`a` AS `a` from `test`.`t1` SET @@SQL_MODE='ANSI_QUOTES'; show create view v1; View Create View -v1 CREATE ALGORITHM=UNDEFINED VIEW "v1" AS select "t1"."a" AS "a" from "t1" +v1 CREATE ALGORITHM=UNDEFINED DEFINER="root"@"localhost" SQL SECURITY DEFINER VIEW "test"."v1" AS select "test"."t1"."a" AS "a" from "test"."t1" create view v2 as select a from t2 where a in (select a from v1); drop view v2, v1; drop table t1, t2; |