diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/ddl_i18n.check_views.inc | 12 | ||||
| -rw-r--r-- | mysql-test/r/ddl_i18n_koi8r.result | 52 | ||||
| -rw-r--r-- | mysql-test/r/ddl_i18n_utf8.result | 52 | ||||
| -rw-r--r-- | mysql-test/r/information_schema.result | 25 | ||||
| -rw-r--r-- | mysql-test/r/information_schema_db.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/mysqldump.result | 34 | ||||
| -rw-r--r-- | mysql-test/r/show_check.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/ddl_i18n_koi8r.test | 8 | ||||
| -rw-r--r-- | mysql-test/t/ddl_i18n_utf8.test | 8 | ||||
| -rw-r--r-- | mysql-test/t/mysqldump.test | 55 |
10 files changed, 218 insertions, 34 deletions
diff --git a/mysql-test/include/ddl_i18n.check_views.inc b/mysql-test/include/ddl_i18n.check_views.inc index 727f3506e4a..db3ad02f459 100644 --- a/mysql-test/include/ddl_i18n.check_views.inc +++ b/mysql-test/include/ddl_i18n.check_views.inc @@ -9,6 +9,10 @@ SHOW CREATE VIEW v1| SHOW CREATE VIEW v2| +--echo + +SHOW CREATE VIEW v3| + # - Check INFORMATION_SCHEMA; --echo @@ -20,6 +24,10 @@ SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'| SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'| +--echo + +SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'| + # - Execute the views; --echo @@ -30,3 +38,7 @@ SELECT COLLATION(c1), COLLATION(c2) FROM v1| --echo SELECT COLLATION(c1) FROM v2| + +--echo + +SELECT * FROM v3| diff --git a/mysql-test/r/ddl_i18n_koi8r.result b/mysql-test/r/ddl_i18n_koi8r.result index dfdc8fd463e..34cea2a5a7d 100644 --- a/mysql-test/r/ddl_i18n_koi8r.result +++ b/mysql-test/r/ddl_i18n_koi8r.result @@ -16,6 +16,8 @@ FROM t1| CREATE VIEW v2 AS SELECT _utf8'тест' as c1| +CREATE VIEW v3 AS SELECT _utf8'тест'| + SHOW CREATE VIEW v1| @@ -26,15 +28,22 @@ SHOW CREATE VIEW v2| View Create View character_set_client collation_connection v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _utf8'тест' AS `c1` koi8r koi8r_general_ci +SHOW CREATE VIEW v3| +View Create View character_set_client collation_connection +v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _utf8'тест' AS `` koi8r koi8r_general_ci + SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL mysqltest1 v1 SELECT '' AS c1, AS c2 -FROM t1 NONE YES root@localhost DEFINER koi8r koi8r_general_ci +NULL mysqltest1 v1 select '' AS `c1`,`mysqltest1`.`t1`.`` AS `c2` from `mysqltest1`.`t1` NONE YES root@localhost DEFINER koi8r koi8r_general_ci SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL mysqltest1 v2 SELECT '' as c1 NONE NO root@localhost DEFINER koi8r koi8r_general_ci +NULL mysqltest1 v2 select '' AS `c1` NONE NO root@localhost DEFINER koi8r koi8r_general_ci + +SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'| +TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION +NULL mysqltest1 v3 select '' AS `` NONE NO root@localhost DEFINER koi8r koi8r_general_ci SELECT COLLATION(c1), COLLATION(c2) FROM v1| @@ -45,6 +54,10 @@ SELECT COLLATION(c1) FROM v2| COLLATION(c1) utf8_general_ci +SELECT * FROM v3| + + + ALTER DATABASE mysqltest1 COLLATE cp866_general_ci| @@ -54,6 +67,7 @@ SET @@character_set_results= cp1251| SET @@collation_connection= cp1251_general_ci| SELECT * FROM mysqltest1.v1| SELECT * FROM mysqltest1.v2| +SELECT * FROM mysqltest1.v3| use mysqltest1| set names koi8r| @@ -66,15 +80,22 @@ SHOW CREATE VIEW v2| View Create View character_set_client collation_connection v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _utf8'тест' AS `c1` koi8r koi8r_general_ci +SHOW CREATE VIEW v3| +View Create View character_set_client collation_connection +v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _utf8'тест' AS `` koi8r koi8r_general_ci + SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL mysqltest1 v1 SELECT '' AS c1, AS c2 -FROM t1 NONE YES root@localhost DEFINER koi8r koi8r_general_ci +NULL mysqltest1 v1 select '' AS `c1`,`mysqltest1`.`t1`.`` AS `c2` from `mysqltest1`.`t1` NONE YES root@localhost DEFINER koi8r koi8r_general_ci SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL mysqltest1 v2 SELECT '' as c1 NONE NO root@localhost DEFINER koi8r koi8r_general_ci +NULL mysqltest1 v2 select '' AS `c1` NONE NO root@localhost DEFINER koi8r koi8r_general_ci + +SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'| +TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION +NULL mysqltest1 v3 select '' AS `` NONE NO root@localhost DEFINER koi8r koi8r_general_ci SELECT COLLATION(c1), COLLATION(c2) FROM v1| @@ -85,6 +106,10 @@ SELECT COLLATION(c1) FROM v2| COLLATION(c1) utf8_general_ci +SELECT * FROM v3| + + + ---> Dumping mysqltest1 to ddl_i18n_koi8r.views.mysqltest1.sql @@ -99,6 +124,7 @@ SET @@character_set_results= cp1251| SET @@collation_connection= cp1251_general_ci| SELECT * FROM mysqltest1.v1| SELECT * FROM mysqltest1.v2| +SELECT * FROM mysqltest1.v3| use mysqltest1| set names koi8r| @@ -111,15 +137,23 @@ SHOW CREATE VIEW v2| View Create View character_set_client collation_connection v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _utf8'тест' AS `c1` koi8r koi8r_general_ci +SHOW CREATE VIEW v3| +View Create View character_set_client collation_connection +v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _utf8'тест' AS `` koi8r koi8r_general_ci + SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL mysqltest1 v1 select '' AS `c1`,`t1`.`` AS `c2` from `t1` NONE YES root@localhost DEFINER koi8r koi8r_general_ci +NULL mysqltest1 v1 select '' AS `c1`,`mysqltest1`.`t1`.`` AS `c2` from `mysqltest1`.`t1` NONE YES root@localhost DEFINER koi8r koi8r_general_ci SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION NULL mysqltest1 v2 select '' AS `c1` NONE NO root@localhost DEFINER koi8r koi8r_general_ci +SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'| +TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION +NULL mysqltest1 v3 select '' AS `` NONE NO root@localhost DEFINER koi8r koi8r_general_ci + SELECT COLLATION(c1), COLLATION(c2) FROM v1| COLLATION(c1) COLLATION(c2) @@ -129,6 +163,10 @@ SELECT COLLATION(c1) FROM v2| COLLATION(c1) utf8_general_ci +SELECT * FROM v3| + + + ---> connection: default use test| DROP DATABASE mysqltest1| diff --git a/mysql-test/r/ddl_i18n_utf8.result b/mysql-test/r/ddl_i18n_utf8.result index c009265d384..cf5dac3dc7c 100644 --- a/mysql-test/r/ddl_i18n_utf8.result +++ b/mysql-test/r/ddl_i18n_utf8.result @@ -16,6 +16,8 @@ FROM t1| CREATE VIEW v2 AS SELECT _koi8r'' as c1| +CREATE VIEW v3 AS SELECT _koi8r''| + SHOW CREATE VIEW v1| @@ -26,15 +28,22 @@ SHOW CREATE VIEW v2| View Create View character_set_client collation_connection v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'' AS `c1` utf8 utf8_general_ci +SHOW CREATE VIEW v3| +View Create View character_set_client collation_connection +v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'' AS `тест` utf8 utf8_general_ci + SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL mysqltest1 v1 SELECT 'тест' AS c1, кол AS c2 -FROM t1 NONE YES root@localhost DEFINER utf8 utf8_general_ci +NULL mysqltest1 v1 select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1` NONE YES root@localhost DEFINER utf8 utf8_general_ci SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL mysqltest1 v2 SELECT 'тест' as c1 NONE NO root@localhost DEFINER utf8 utf8_general_ci +NULL mysqltest1 v2 select 'тест' AS `c1` NONE NO root@localhost DEFINER utf8 utf8_general_ci + +SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'| +TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION +NULL mysqltest1 v3 select 'тест' AS `тест` NONE NO root@localhost DEFINER utf8 utf8_general_ci SELECT COLLATION(c1), COLLATION(c2) FROM v1| @@ -45,6 +54,10 @@ SELECT COLLATION(c1) FROM v2| COLLATION(c1) koi8r_general_ci +SELECT * FROM v3| +тест +тест + ALTER DATABASE mysqltest1 COLLATE cp866_general_ci| @@ -54,6 +67,7 @@ SET @@character_set_results= cp1251| SET @@collation_connection= cp1251_general_ci| SELECT * FROM mysqltest1.v1| SELECT * FROM mysqltest1.v2| +SELECT * FROM mysqltest1.v3| use mysqltest1| set names utf8| @@ -66,15 +80,22 @@ SHOW CREATE VIEW v2| View Create View character_set_client collation_connection v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'' AS `c1` utf8 utf8_general_ci +SHOW CREATE VIEW v3| +View Create View character_set_client collation_connection +v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'' AS `тест` utf8 utf8_general_ci + SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL mysqltest1 v1 SELECT 'тест' AS c1, кол AS c2 -FROM t1 NONE YES root@localhost DEFINER utf8 utf8_general_ci +NULL mysqltest1 v1 select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1` NONE YES root@localhost DEFINER utf8 utf8_general_ci SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL mysqltest1 v2 SELECT 'тест' as c1 NONE NO root@localhost DEFINER utf8 utf8_general_ci +NULL mysqltest1 v2 select 'тест' AS `c1` NONE NO root@localhost DEFINER utf8 utf8_general_ci + +SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'| +TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION +NULL mysqltest1 v3 select 'тест' AS `тест` NONE NO root@localhost DEFINER utf8 utf8_general_ci SELECT COLLATION(c1), COLLATION(c2) FROM v1| @@ -85,6 +106,10 @@ SELECT COLLATION(c1) FROM v2| COLLATION(c1) koi8r_general_ci +SELECT * FROM v3| +тест +тест + ---> Dumping mysqltest1 to ddl_i18n_utf8views.mysqltest1.sql @@ -99,6 +124,7 @@ SET @@character_set_results= cp1251| SET @@collation_connection= cp1251_general_ci| SELECT * FROM mysqltest1.v1| SELECT * FROM mysqltest1.v2| +SELECT * FROM mysqltest1.v3| use mysqltest1| set names utf8| @@ -111,15 +137,23 @@ SHOW CREATE VIEW v2| View Create View character_set_client collation_connection v2 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select _koi8r'' AS `c1` utf8 utf8_general_ci +SHOW CREATE VIEW v3| +View Create View character_set_client collation_connection +v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select _koi8r'' AS `тест` utf8 utf8_general_ci + SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v1'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL mysqltest1 v1 select 'тест' AS `c1`,`t1`.`кол` AS `c2` from `t1` NONE YES root@localhost DEFINER utf8 utf8_general_ci +NULL mysqltest1 v1 select 'тест' AS `c1`,`mysqltest1`.`t1`.`кол` AS `c2` from `mysqltest1`.`t1` NONE YES root@localhost DEFINER utf8 utf8_general_ci SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v2'| TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION NULL mysqltest1 v2 select 'тест' AS `c1` NONE NO root@localhost DEFINER utf8 utf8_general_ci +SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE table_name = 'v3'| +TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION +NULL mysqltest1 v3 select 'тест' AS `тест` NONE NO root@localhost DEFINER utf8 utf8_general_ci + SELECT COLLATION(c1), COLLATION(c2) FROM v1| COLLATION(c1) COLLATION(c2) @@ -129,6 +163,10 @@ SELECT COLLATION(c1) FROM v2| COLLATION(c1) koi8r_general_ci +SELECT * FROM v3| +тест +тест + ---> connection: default use test| DROP DATABASE mysqltest1| diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 708d8ab027d..7f4efa32dc2 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -387,15 +387,11 @@ show keys from v4; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment select * from information_schema.views where TABLE_NAME like "v%"; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL test v0 select schema_name from information_schema.schemata NONE NO root@localhost DEFINER latin1 latin1_swedish_ci -NULL test v1 select table_name from information_schema.tables -where table_name="v1" NONE NO root@localhost DEFINER latin1 latin1_swedish_ci -NULL test v2 select column_name from information_schema.columns -where table_name="v2" NONE NO root@localhost DEFINER latin1 latin1_swedish_ci -NULL test v3 select CHARACTER_SET_NAME from information_schema.character_sets -where CHARACTER_SET_NAME like "latin1%" NONE NO root@localhost DEFINER latin1 latin1_swedish_ci -NULL test v4 select COLLATION_NAME from information_schema.collations -where COLLATION_NAME like "latin1%" NONE NO root@localhost DEFINER latin1 latin1_swedish_ci +NULL test v0 select `schemata`.`SCHEMA_NAME` AS `c` from `information_schema`.`schemata` NONE NO root@localhost DEFINER latin1 latin1_swedish_ci +NULL test v1 select `tables`.`TABLE_NAME` AS `c` from `information_schema`.`tables` where (`tables`.`TABLE_NAME` = 'v1') NONE NO root@localhost DEFINER latin1 latin1_swedish_ci +NULL test v2 select `columns`.`COLUMN_NAME` AS `c` from `information_schema`.`columns` where (`columns`.`TABLE_NAME` = 'v2') NONE NO root@localhost DEFINER latin1 latin1_swedish_ci +NULL test v3 select `character_sets`.`CHARACTER_SET_NAME` AS `c` from `information_schema`.`character_sets` where (`character_sets`.`CHARACTER_SET_NAME` like 'latin1%') NONE NO root@localhost DEFINER latin1 latin1_swedish_ci +NULL test v4 select `collations`.`COLLATION_NAME` AS `c` from `information_schema`.`collations` where (`collations`.`COLLATION_NAME` like 'latin1%') NONE NO root@localhost DEFINER latin1 latin1_swedish_ci drop view v0, v1, v2, v3, v4; create table t1 (a int); grant select,update,insert on t1 to mysqltest_1@localhost; @@ -488,9 +484,9 @@ create view v2 (c) as select a from t1 WITH LOCAL CHECK OPTION; create view v3 (c) as select a from t1 WITH CASCADED CHECK OPTION; select * from information_schema.views; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL test v1 select a from t1 with check option CASCADED YES root@localhost DEFINER latin1 latin1_swedish_ci -NULL test v2 select a from t1 WITH LOCAL CHECK OPTION LOCAL YES root@localhost DEFINER latin1 latin1_swedish_ci -NULL test v3 select a from t1 WITH CASCADED CHECK OPTION CASCADED YES root@localhost DEFINER latin1 latin1_swedish_ci +NULL test v1 select `test`.`t1`.`a` AS `c` from `test`.`t1` CASCADED YES root@localhost DEFINER latin1 latin1_swedish_ci +NULL test v2 select `test`.`t1`.`a` AS `c` from `test`.`t1` LOCAL YES root@localhost DEFINER latin1 latin1_swedish_ci +NULL test v3 select `test`.`t1`.`a` AS `c` from `test`.`t1` CASCADED YES root@localhost DEFINER latin1 latin1_swedish_ci grant select (a) on test.t1 to joe@localhost with grant option; select * from INFORMATION_SCHEMA.COLUMN_PRIVILEGES; GRANTEE TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME PRIVILEGE_TYPE IS_GRANTABLE @@ -1175,7 +1171,7 @@ select * from information_schema.views where table_name='v1' or table_name='v2'; TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION NULL test v1 NONE YES root@localhost DEFINER latin1 latin1_swedish_ci -NULL test v2 select 1 NONE NO mysqltest_1@localhost DEFINER latin1 latin1_swedish_ci +NULL test v2 select 1 AS `1` NONE NO mysqltest_1@localhost DEFINER latin1 latin1_swedish_ci drop view v1, v2; drop table t1; drop user mysqltest_1@localhost; @@ -1559,8 +1555,7 @@ AS SELECT * FROM INFORMATION_SCHEMA.TABLES; SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS where TABLE_NAME = 'v1'; VIEW_DEFINITION -SELECT * -FROM INFORMATION_SCHEMA.TABLES +select `TABLES`.`TABLE_CATALOG` AS `TABLE_CATALOG`,`TABLES`.`TABLE_SCHEMA` AS `TABLE_SCHEMA`,`TABLES`.`TABLE_NAME` AS `TABLE_NAME`,`TABLES`.`TABLE_TYPE` AS `TABLE_TYPE`,`TABLES`.`ENGINE` AS `ENGINE`,`TABLES`.`VERSION` AS `VERSION`,`TABLES`.`ROW_FORMAT` AS `ROW_FORMAT`,`TABLES`.`TABLE_ROWS` AS `TABLE_ROWS`,`TABLES`.`AVG_ROW_LENGTH` AS `AVG_ROW_LENGTH`,`TABLES`.`DATA_LENGTH` AS `DATA_LENGTH`,`TABLES`.`MAX_DATA_LENGTH` AS `MAX_DATA_LENGTH`,`TABLES`.`INDEX_LENGTH` AS `INDEX_LENGTH`,`TABLES`.`DATA_FREE` AS `DATA_FREE`,`TABLES`.`AUTO_INCREMENT` AS `AUTO_INCREMENT`,`TABLES`.`CREATE_TIME` AS `CREATE_TIME`,`TABLES`.`UPDATE_TIME` AS `UPDATE_TIME`,`TABLES`.`CHECK_TIME` AS `CHECK_TIME`,`TABLES`.`TABLE_COLLATION` AS `TABLE_COLLATION`,`TABLES`.`CHECKSUM` AS `CHECKSUM`,`TABLES`.`CREATE_OPTIONS` AS `CREATE_OPTIONS`,`TABLES`.`TABLE_COMMENT` AS `TABLE_COMMENT` from `INFORMATION_SCHEMA`.`TABLES` DROP VIEW v1; SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME ='information_schema'; diff --git a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result index cb56fb3d5cc..3044a11fb39 100644 --- a/mysql-test/r/information_schema_db.result +++ b/mysql-test/r/information_schema_db.result @@ -210,7 +210,7 @@ v2 select view_definition from information_schema.views a where a.table_name = 'v2'; view_definition -select f1 from testdb_1.v1 +select `v1`.`f1` AS `f1` from `testdb_1`.`v1` select view_definition from information_schema.views a where a.table_name = 'testdb_1.v1'; view_definition diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index d0bfab6237a..a1b8eaa52f8 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -4230,6 +4230,40 @@ LOCK TABLES `test` WRITE; UNLOCK TABLES; drop database `test-database`; use test; + +# ----------------------------------------------------------------- +# -- Bug#30217: Views: changes in metadata behaviour between 5.0 and 5.1. +# ----------------------------------------------------------------- + +DROP DATABASE IF EXISTS mysqldump_test_db; +CREATE DATABASE mysqldump_test_db; +use mysqldump_test_db; + +CREATE VIEW v1(x, y) AS SELECT 'a', 'a'; + +SELECT view_definition +FROM INFORMATION_SCHEMA.VIEWS +WHERE table_schema = 'mysqldump_test_db' AND table_name = 'v1'; +view_definition +select 'a' AS `x`,'a' AS `y` + +---> Dumping mysqldump_test_db to bug30217.sql + +DROP DATABASE mysqldump_test_db; +use test; + +---> Restoring mysqldump_test_db... + +SELECT view_definition +FROM INFORMATION_SCHEMA.VIEWS +WHERE table_schema = 'mysqldump_test_db' AND table_name = 'v1'; +view_definition +select 'a' AS `x`,'a' AS `y` + +DROP DATABASE mysqldump_test_db; + +# -- End of test case for Bug#32538. + # # End of 5.1 tests # diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 320550c0ccd..103b3c9a289 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -1075,7 +1075,7 @@ Catalog Database Table Table_alias Column Column_alias Type Length Max length Is def VIEWS TABLE_CATALOG TABLE_CATALOG 253 1536 0 Y 0 0 33 def VIEWS TABLE_SCHEMA TABLE_SCHEMA 253 192 4 N 1 0 33 def VIEWS TABLE_NAME TABLE_NAME 253 192 2 N 1 0 33 -def VIEWS VIEW_DEFINITION VIEW_DEFINITION 252 589815 8 N 17 0 33 +def VIEWS VIEW_DEFINITION VIEW_DEFINITION 252 589815 15 N 17 0 33 def VIEWS CHECK_OPTION CHECK_OPTION 253 24 4 N 1 0 33 def VIEWS IS_UPDATABLE IS_UPDATABLE 253 9 2 N 1 0 33 def VIEWS DEFINER DEFINER 253 231 14 N 1 0 33 @@ -1083,7 +1083,7 @@ def VIEWS SECURITY_TYPE SECURITY_TYPE 253 21 7 N 1 0 33 def VIEWS CHARACTER_SET_CLIENT CHARACTER_SET_CLIENT 253 96 6 N 1 0 33 def VIEWS COLLATION_CONNECTION COLLATION_CONNECTION 253 96 6 N 1 0 33 TABLE_CATALOG TABLE_SCHEMA TABLE_NAME VIEW_DEFINITION CHECK_OPTION IS_UPDATABLE DEFINER SECURITY_TYPE CHARACTER_SET_CLIENT COLLATION_CONNECTION -NULL test v1 SELECT 1 NONE NO root@localhost DEFINER binary binary +NULL test v1 select 1 AS `1` NONE NO root@localhost DEFINER binary binary ---------------------------------------------------------------- SHOW CREATE PROCEDURE p1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr diff --git a/mysql-test/t/ddl_i18n_koi8r.test b/mysql-test/t/ddl_i18n_koi8r.test index 1d16adbad55..e3bed098126 100644 --- a/mysql-test/t/ddl_i18n_koi8r.test +++ b/mysql-test/t/ddl_i18n_koi8r.test @@ -85,6 +85,10 @@ CREATE VIEW v2 AS SELECT _utf8'тест' as c1| --echo +CREATE VIEW v3 AS SELECT _utf8'тест'| + +--echo + # # First-round checks. # @@ -120,6 +124,7 @@ SET @@collation_connection= cp1251_general_ci| --disable_result_log SELECT * FROM mysqltest1.v1| SELECT * FROM mysqltest1.v2| +SELECT * FROM mysqltest1.v3| --enable_result_log use mysqltest1| @@ -168,7 +173,7 @@ DROP DATABASE mysqltest1| --echo --echo ---> connection: con3 -# - Switch environment variables and trigger loading stored procedures; +# - Switch environment variables and trigger loading views; SET @@character_set_client= cp1251| SET @@character_set_results= cp1251| @@ -177,6 +182,7 @@ SET @@collation_connection= cp1251_general_ci| --disable_result_log SELECT * FROM mysqltest1.v1| SELECT * FROM mysqltest1.v2| +SELECT * FROM mysqltest1.v3| --enable_result_log use mysqltest1| diff --git a/mysql-test/t/ddl_i18n_utf8.test b/mysql-test/t/ddl_i18n_utf8.test index c80137a58b5..d76debcba5b 100644 --- a/mysql-test/t/ddl_i18n_utf8.test +++ b/mysql-test/t/ddl_i18n_utf8.test @@ -85,6 +85,10 @@ CREATE VIEW v2 AS SELECT _koi8r'' as c1| --echo +CREATE VIEW v3 AS SELECT _koi8r''| + +--echo + # # First-round checks. # @@ -120,6 +124,7 @@ SET @@collation_connection= cp1251_general_ci| --disable_result_log SELECT * FROM mysqltest1.v1| SELECT * FROM mysqltest1.v2| +SELECT * FROM mysqltest1.v3| --enable_result_log use mysqltest1| @@ -168,7 +173,7 @@ DROP DATABASE mysqltest1| --echo --echo ---> connection: con3 -# - Switch environment variables and trigger loading stored procedures; +# - Switch environment variables and trigger loading views; SET @@character_set_client= cp1251| SET @@character_set_results= cp1251| @@ -177,6 +182,7 @@ SET @@collation_connection= cp1251_general_ci| --disable_result_log SELECT * FROM mysqltest1.v1| SELECT * FROM mysqltest1.v2| +SELECT * FROM mysqltest1.v3| --enable_result_log use mysqltest1| diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 0e4e9989ffa..6cbe345bc8a 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1799,6 +1799,61 @@ create table test (a int); drop database `test-database`; use test; +########################################################################### + +--echo +--echo # ----------------------------------------------------------------- +--echo # -- Bug#30217: Views: changes in metadata behaviour between 5.0 and 5.1. +--echo # ----------------------------------------------------------------- +--echo + +--disable_warnings +DROP DATABASE IF EXISTS mysqldump_test_db; +--enable_warnings + +CREATE DATABASE mysqldump_test_db; +use mysqldump_test_db; + +--echo + +CREATE VIEW v1(x, y) AS SELECT 'a', 'a'; + +--echo + +SELECT view_definition +FROM INFORMATION_SCHEMA.VIEWS +WHERE table_schema = 'mysqldump_test_db' AND table_name = 'v1'; + +--echo + +--echo ---> Dumping mysqldump_test_db to bug30217.sql +--exec $MYSQL_DUMP --character-sets-dir=$CHARSETSDIR --databases mysqldump_test_db > $MYSQLTEST_VARDIR/tmp/bug30217.sql + +--echo + +DROP DATABASE mysqldump_test_db; +use test; + +--echo + +--echo ---> Restoring mysqldump_test_db... +--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug30217.sql + +--echo + +SELECT view_definition +FROM INFORMATION_SCHEMA.VIEWS +WHERE table_schema = 'mysqldump_test_db' AND table_name = 'v1'; + +--echo + +DROP DATABASE mysqldump_test_db; + +--echo +--echo # -- End of test case for Bug#32538. +--echo + +########################################################################### --echo # --echo # End of 5.1 tests |