diff options
| author | paul@kite-hub.kitebird.com <> | 2004-09-10 15:04:28 -0500 |
|---|---|---|
| committer | paul@kite-hub.kitebird.com <> | 2004-09-10 15:04:28 -0500 |
| commit | 37aae429e8cc9bcf2a393585947ea012fe63796f (patch) | |
| tree | cfb04ef37ad2d5e6d2f95fc638f6aad2695730be | |
| parent | c61da73ce795892006e6a82aac819afadb3be480 (diff) | |
| download | mariadb-git-37aae429e8cc9bcf2a393585947ea012fe63796f.tar.gz | |
Fix bad output in SHOW CREATE VIEW, update affected
test result.
| -rw-r--r-- | mysql-test/r/view.result | 8 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index ac606469323..2b9d8d91653 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -55,7 +55,7 @@ Note 1003 select (`test`.`t1`.`b` + 1) AS `c` from `test`.`v1` create algorithm=temptable view v2 (c) as select b+1 from t1; show create table v2; Table Create Table -v2 CREATE ALGORITHM=TMPTABLE VIEW `test`.`v2` AS select (`test`.`t1`.`b` + 1) AS `c` from `test`.`t1` +v2 CREATE ALGORITHM=TEMPTABLE VIEW `test`.`v2` AS select (`test`.`t1`.`b` + 1) AS `c` from `test`.`t1` select c from v2; c 3 @@ -313,7 +313,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 DERIVED NULL NULL NULL NULL NULL NULL NULL no matching row in const table show create table mysqltest.v2; Table Create Table -v2 CREATE ALGORITHM=TMPTABLE VIEW `mysqltest`.`v2` AS select (`mysqltest`.`t1`.`a` + 1) AS `c`,(`mysqltest`.`t1`.`b` + 1) AS `d` from `mysqltest`.`t1` +v2 CREATE ALGORITHM=TEMPTABLE VIEW `mysqltest`.`v2` AS select (`mysqltest`.`t1`.`a` + 1) AS `c`,(`mysqltest`.`t1`.`b` + 1) AS `d` from `mysqltest`.`t1` explain select c from mysqltest.v3; ERROR HY000: EXPLAIN/SHOW can not be issued; lacking privileges for underlying table show create table mysqltest.v3; @@ -335,7 +335,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 DERIVED NULL NULL NULL NULL NULL NULL NULL no matching row in const table show create table mysqltest.v2; Table Create Table -v2 CREATE ALGORITHM=TMPTABLE VIEW `mysqltest`.`v2` AS select (`mysqltest`.`t1`.`a` + 1) AS `c`,(`mysqltest`.`t1`.`b` + 1) AS `d` from `mysqltest`.`t1` +v2 CREATE ALGORITHM=TEMPTABLE VIEW `mysqltest`.`v2` AS select (`mysqltest`.`t1`.`a` + 1) AS `c`,(`mysqltest`.`t1`.`b` + 1) AS `d` from `mysqltest`.`t1` explain select c from mysqltest.v3; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t2 system NULL NULL NULL NULL 0 const row not found @@ -348,7 +348,7 @@ id select_type table type possible_keys key key_len ref rows Extra 2 DERIVED NULL NULL NULL NULL NULL NULL NULL no matching row in const table show create table mysqltest.v4; Table Create Table -v4 CREATE ALGORITHM=TMPTABLE VIEW `mysqltest`.`v4` AS select (`mysqltest`.`t2`.`a` + 1) AS `c`,(`mysqltest`.`t2`.`b` + 1) AS `d` from `mysqltest`.`t2` +v4 CREATE ALGORITHM=TEMPTABLE VIEW `mysqltest`.`v4` AS select (`mysqltest`.`t2`.`a` + 1) AS `c`,(`mysqltest`.`t2`.`b` + 1) AS `d` from `mysqltest`.`t2` revoke all privileges on mysqltest.* from mysqltest_1@localhost; delete from mysql.user where user='mysqltest_1'; drop database mysqltest; diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 6e8365b2233..7868bc176bf 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1601,7 +1601,7 @@ view_store_create_info(THD *thd, TABLE_LIST *table, String *buff) { buff->append("ALGORITHM=", 10); if (table->algorithm == VIEW_ALGORITHM_TMPTABLE) - buff->append("TMPTABLE ", 9); + buff->append("TEMPTABLE ", 10); else buff->append("MERGE ", 6); } |