#At file:///home/svoj/devel/bzr-mysql/mysql-6.0-falcon-team-work/
2826 Sergey Vojtovich 2008-09-22
WL#4545 - Add TABLESPACE_NAME field to I_S.TABLES
modified:
mysql-test/r/information_schema.result
mysql-test/suite/funcs_1/datadict/tables2.inc
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_tables.result
mysql-test/suite/funcs_1/r/is_tables_innodb.result
mysql-test/suite/funcs_1/r/is_tables_is.result
mysql-test/suite/funcs_1/r/is_tables_is_falcon.result
mysql-test/suite/funcs_1/r/is_tables_memory.result
mysql-test/suite/funcs_1/r/is_tables_myisam.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/funcs_1/r/is_tables_ndb.result
sql/sql_show.cc
per-file messages:
mysql-test/r/information_schema.result
Updated test result according to WL#4545. Added TABLESPACE_NAME column.
mysql-test/suite/funcs_1/datadict/tables2.inc
Updated test result according to WL#4545. Added TABLESPACE_NAME column.
mysql-test/suite/funcs_1/r/is_columns_is.result
Updated test result according to WL#4545. Added TABLESPACE_NAME column.
mysql-test/suite/funcs_1/r/is_tables.result
Updated test result according to WL#4545. Added TABLESPACE_NAME column.
mysql-test/suite/funcs_1/r/is_tables_innodb.result
Updated test result according to WL#4545. Added TABLESPACE_NAME column.
mysql-test/suite/funcs_1/r/is_tables_is.result
Updated test result according to WL#4545. Added TABLESPACE_NAME column.
mysql-test/suite/funcs_1/r/is_tables_is_falcon.result
Updated test result according to WL#4545. Added TABLESPACE_NAME column.
mysql-test/suite/funcs_1/r/is_tables_memory.result
Updated test result according to WL#4545. Added TABLESPACE_NAME column.
mysql-test/suite/funcs_1/r/is_tables_myisam.result
Updated test result according to WL#4545. Added TABLESPACE_NAME column.
mysql-test/suite/funcs_1/r/is_tables_mysql.result
Updated test result according to WL#4545. Added TABLESPACE_NAME column.
mysql-test/suite/funcs_1/r/is_tables_ndb.result
Updated test result according to WL#4545. Added TABLESPACE_NAME column.
sql/sql_show.cc
Added TABLESPACE_NAME column to I_S.TABLES.
=== modified file 'mysql-test/r/information_schema.result'
--- a/mysql-test/r/information_schema.result 2008-08-02 18:22:09 +0000
+++ b/mysql-test/r/information_schema.result 2008-09-22 14:32:42 +0000
@@ -1420,7 +1420,7 @@ SELECT *
FROM tables ta
JOIN collations co ON ( co.collation_name = ta.table_catalog )
JOIN character_sets cs ON ( cs.character_set_name = ta.table_catalog );
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLESPACE_NAME TABLE_COMMENT COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN CHARACTER_SET_NAME DEFAULT_COLLATE_NAME DESCRIPTION MAXLEN
DROP TABLE test.t1;
SET max_heap_table_size = DEFAULT;
USE test;
@@ -1504,7 +1504,7 @@ AS SELECT *
FROM information_schema.tables;
SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS where TABLE_NAME = 'v1';
VIEW_DEFINITION
-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`
+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`.`TABLESPACE_NAME` AS `TABLESPACE_NAME`,`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';
@@ -1537,11 +1537,11 @@ TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NO
select * from `information_schema`.`STATISTICS` where `TABLE_NAME` = NULL;
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT INDEX_COMMENT
select * from information_schema.tables where table_schema = NULL;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLESPACE_NAME TABLE_COMMENT
select * from information_schema.tables where table_catalog = NULL;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLESPACE_NAME TABLE_COMMENT
select * from information_schema.tables where table_name = NULL;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLESPACE_NAME TABLE_COMMENT
select * from `information_schema`.`TABLE_CONSTRAINTS` where `TABLE_SCHEMA` = NULL;
CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_SCHEMA TABLE_NAME CONSTRAINT_TYPE
select * from `information_schema`.`TABLE_CONSTRAINTS` where `TABLE_NAME` = NULL;
@@ -1623,7 +1623,7 @@ CREATE TABLE t1 (c1 int);
CREATE TABLE t2 (c2 int);
GRANT SELECT ON testdb1.t1 TO mysqluser_35955@localhost;
SELECT * FROM INFORMATION_SCHEMA.tables, t1;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT c1
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLESPACE_NAME TABLE_COMMENT c1
SELECT * FROM t2;
ERROR 42000: SELECT command denied to user 'mysqluser_35955'@'localhost' for table 't2'
SELECT * FROM t2, INFORMATION_SCHEMA.tables;
=== modified file 'mysql-test/suite/funcs_1/datadict/tables2.inc'
--- a/mysql-test/suite/funcs_1/datadict/tables2.inc 2008-07-04 08:28:36 +0000
+++ b/mysql-test/suite/funcs_1/datadict/tables2.inc 2008-09-22 14:32:42 +0000
@@ -32,7 +32,7 @@ let $ndb_pattern = 'number_of_replica
# We do not unify the engine name here, because the rowformat is
# specific to the engine.
--replace_result Dynamic DYNAMIC_OR_PAGE Page DYNAMIC_OR_PAGE MyISAM MYISAM_OR_MARIA MARIA MYISAM_OR_MARIA
---replace_column 8 "#TBLR#" 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "#CRT#" 16 "#UT#" 17 "#CT#" 20 "#CO#" 21 "#TC#"
+--replace_column 8 "#TBLR#" 9 "#ARL#" 10 "#DL#" 11 "#MDL#" 12 "#IL#" 13 "#DF#" 15 "#CRT#" 16 "#UT#" 17 "#CT#" 20 "#CO#" 21 "#TN#" 22 "#TC#"
eval
SELECT *,
LEFT( table_comment,
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_is.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result 2008-08-02 18:22:09 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result 2008-09-22 14:32:42 +0000
@@ -268,9 +268,10 @@ NULL information_schema TABLES ENGINE 5
NULL information_schema TABLES INDEX_LENGTH 12 NULL YES bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select Default Default
NULL information_schema TABLES MAX_DATA_LENGTH 11 NULL YES bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select Default Default
NULL information_schema TABLES ROW_FORMAT 7 NULL YES varchar 10 40 NULL NULL utf8 utf8_general_ci varchar(10) select Default Default
+NULL information_schema TABLES TABLESPACE_NAME 21 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema TABLES TABLE_CATALOG 1 NULL YES varchar 512 2048 NULL NULL utf8 utf8_general_ci varchar(512) select Default Default
NULL information_schema TABLES TABLE_COLLATION 18 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema TABLES TABLE_COMMENT 21 NO varchar 2048 8192 NULL NULL utf8 utf8_general_ci varchar(2048) select Default Default
+NULL information_schema TABLES TABLE_COMMENT 22 NO varchar 2048 8192 NULL NULL utf8 utf8_general_ci varchar(2048) select Default Default
NULL information_schema TABLES TABLE_NAME 3 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
NULL information_schema TABLES TABLE_ROWS 8 NULL YES bigint NULL NULL 19 0 NULL NULL bigint(21) unsigned select Default Default
NULL information_schema TABLES TABLE_SCHEMA 2 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
@@ -665,6 +666,7 @@ NULL information_schema TABLES CHECK_TIM
4.0000 information_schema TABLES TABLE_COLLATION varchar 64 256 utf8 utf8_general_ci varchar(64)
NULL information_schema TABLES CHECKSUM bigint NULL NULL NULL NULL bigint(21) unsigned
4.0000 information_schema TABLES CREATE_OPTIONS varchar 255 1020 utf8 utf8_general_ci varchar(255)
+4.0000 information_schema TABLES TABLESPACE_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
4.0000 information_schema TABLES TABLE_COMMENT varchar 2048 8192 utf8 utf8_general_ci varchar(2048)
4.0000 information_schema TABLESPACES TABLESPACE_NAME varchar 64 256 utf8 utf8_general_ci varchar(64)
4.0000 information_schema TABLESPACES ENGINE varchar 64 256 utf8 utf8_general_ci varchar(64)
=== modified file 'mysql-test/suite/funcs_1/r/is_tables.result'
--- a/mysql-test/suite/funcs_1/r/is_tables.result 2008-03-10 19:00:02 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables.result 2008-09-22 14:32:42 +0000
@@ -48,6 +48,7 @@ CHECK_TIME datetime YES NULL
TABLE_COLLATION varchar(64) YES NULL
CHECKSUM bigint(21) unsigned YES NULL
CREATE_OPTIONS varchar(255) YES NULL
+TABLESPACE_NAME varchar(64) YES NULL
TABLE_COMMENT varchar(2048) NO
SHOW CREATE TABLE information_schema.TABLES;
Table Create Table
@@ -72,6 +73,7 @@ TABLES CREATE TEMPORARY TABLE `TABLES` (
`TABLE_COLLATION` varchar(64) DEFAULT NULL,
`CHECKSUM` bigint(21) unsigned DEFAULT NULL,
`CREATE_OPTIONS` varchar(255) DEFAULT NULL,
+ `TABLESPACE_NAME` varchar(64) DEFAULT NULL,
`TABLE_COMMENT` varchar(2048) NOT NULL DEFAULT ''
) ENGINE=MEMORY DEFAULT CHARSET=utf8
SHOW COLUMNS FROM information_schema.TABLES;
@@ -96,6 +98,7 @@ CHECK_TIME datetime YES NULL
TABLE_COLLATION varchar(64) YES NULL
CHECKSUM bigint(21) unsigned YES NULL
CREATE_OPTIONS varchar(255) YES NULL
+TABLESPACE_NAME varchar(64) YES NULL
TABLE_COMMENT varchar(2048) NO
SELECT table_catalog, table_schema, table_name
FROM information_schema.tables WHERE table_catalog IS NOT NULL;
@@ -128,11 +131,11 @@ CREATE VIEW v3 AS SELECT * FROM tb3;
GRANT SELECT ON db_datadict.v3 to 'testuser3'@'localhost';
SELECT * FROM information_schema.tables
WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
-NULL db_datadict tb1 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict tb2 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict v3 VIEW #ENG# NULL #RF# NULL #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# NULL #CS# NULL VIEW
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLESPACE_NAME TABLE_COMMENT
+NULL db_datadict tb1 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict tb2 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict v3 VIEW #ENG# NULL #RF# NULL #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# NULL #CS# NULL NULL VIEW
SHOW TABLES FROM db_datadict;
Tables_in_db_datadict
tb1
@@ -142,9 +145,9 @@ v3
# Establish connection testuser2 (user=testuser2)
SELECT * FROM information_schema.tables
WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
-NULL db_datadict tb1 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLESPACE_NAME TABLE_COMMENT
+NULL db_datadict tb1 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
SHOW TABLES FROM db_datadict;
Tables_in_db_datadict
tb1
@@ -152,9 +155,9 @@ tb3
# Establish connection testuser3 (user=testuser3)
SELECT * FROM information_schema.tables
WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
-NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict v3 VIEW #ENG# NULL #RF# NULL #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# NULL #CS# NULL VIEW
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLESPACE_NAME TABLE_COMMENT
+NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict v3 VIEW #ENG# NULL #RF# NULL #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# NULL #CS# NULL NULL VIEW
SHOW TABLES FROM db_datadict;
Tables_in_db_datadict
tb3
@@ -162,11 +165,11 @@ v3
# Switch to connection default (user=root)
SELECT * FROM information_schema.tables
WHERE table_schema = 'db_datadict' ORDER BY table_name;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
-NULL db_datadict tb1 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict tb2 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS#
-NULL db_datadict v3 VIEW #ENG# NULL #RF# NULL #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# NULL #CS# NULL VIEW
+TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLESPACE_NAME TABLE_COMMENT
+NULL db_datadict tb1 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict tb2 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict tb3 BASE TABLE #ENG# 10 #RF# 0 #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# latin1_swedish_ci #CS# NULL
+NULL db_datadict v3 VIEW #ENG# NULL #RF# NULL #ARL# #DL# #MDL# #IL# #DF# NULL #CRT #UT# #CT# NULL #CS# NULL NULL VIEW
SHOW TABLES FROM db_datadict;
Tables_in_db_datadict
tb1
@@ -212,6 +215,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM #CS#
CREATE_OPTIONS
+TABLESPACE_NAME NULL
TABLE_COMMENT Initial Comment
SELECT table_name FROM information_schema.tables
WHERE table_name LIKE 't1_my_table%';
@@ -364,6 +368,7 @@ CHECK_TIME NULL
TABLE_COLLATION NULL
CHECKSUM NULL
CREATE_OPTIONS NULL
+TABLESPACE_NAME NULL
TABLE_COMMENT VIEW
DROP VIEW test.t1_my_tablex;
SELECT table_name FROM information_schema.tables
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_innodb.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_innodb.result 2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_innodb.result 2008-09-22 14:32:42 +0000
@@ -37,6 +37,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -60,6 +61,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -83,6 +85,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -129,6 +132,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -152,6 +156,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_is.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_is.result 2008-08-02 18:22:09 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_is.result 2008-09-22 14:32:42 +0000
@@ -33,6 +33,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -56,6 +57,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -79,6 +81,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -102,6 +105,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -125,6 +129,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -148,6 +153,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -171,6 +177,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -194,6 +201,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -217,6 +225,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -240,6 +249,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -263,6 +273,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -286,6 +297,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -309,6 +321,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -332,6 +345,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -355,6 +369,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -378,6 +393,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -401,6 +417,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -424,6 +441,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -447,6 +465,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -470,6 +489,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -493,6 +513,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -516,6 +537,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -539,6 +561,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -562,6 +585,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -585,6 +609,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -608,6 +633,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -631,6 +657,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -654,6 +681,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -677,6 +705,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -717,6 +746,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -740,6 +770,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -763,6 +794,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -786,6 +818,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -809,6 +842,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -832,6 +866,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -855,6 +890,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -878,6 +914,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -901,6 +938,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -924,6 +962,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -947,6 +986,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -970,6 +1010,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -993,6 +1034,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1016,6 +1058,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1039,6 +1082,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1062,6 +1106,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1085,6 +1130,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1108,6 +1154,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1131,6 +1178,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1154,6 +1202,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1177,6 +1226,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1200,6 +1250,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1223,6 +1274,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1246,6 +1298,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1269,6 +1322,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1292,6 +1346,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1315,6 +1370,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1338,6 +1394,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -1361,6 +1418,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_is_falcon.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_is_falcon.result 2008-09-03 09:00:56 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_is_falcon.result 2008-09-22 14:32:42 +0000
@@ -33,6 +33,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -56,6 +57,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -79,6 +81,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -102,6 +105,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -125,6 +129,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -148,6 +153,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -171,6 +177,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -194,6 +201,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -217,6 +225,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -240,6 +249,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -280,6 +290,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -303,6 +314,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -326,6 +338,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -349,6 +362,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -372,6 +386,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -395,6 +410,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -418,6 +434,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -441,6 +458,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -464,6 +482,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -487,6 +506,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_memory.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_memory.result 2008-06-16 18:39:58 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_memory.result 2008-09-22 14:32:42 +0000
@@ -38,6 +38,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -61,6 +62,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -84,6 +86,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -130,6 +133,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -153,6 +157,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_myisam.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_myisam.result 2008-07-04 08:28:36 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_myisam.result 2008-09-22 14:32:42 +0000
@@ -38,6 +38,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -61,6 +62,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -84,6 +86,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -130,6 +133,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -153,6 +157,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_mysql.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_mysql.result 2008-08-14 14:07:27 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_mysql.result 2008-09-22 14:32:42 +0000
@@ -32,6 +32,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Column privileges
Separator -----------------------------------------------------
@@ -55,6 +56,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Database privileges
Separator -----------------------------------------------------
@@ -78,6 +80,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Events
Separator -----------------------------------------------------
@@ -101,6 +104,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment User defined functions
Separator -----------------------------------------------------
@@ -124,6 +128,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment General log
Separator -----------------------------------------------------
@@ -147,6 +152,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment help categories
Separator -----------------------------------------------------
@@ -170,6 +176,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment help keywords
Separator -----------------------------------------------------
@@ -193,6 +200,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment keyword-topic relation
Separator -----------------------------------------------------
@@ -216,6 +224,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment help topics
Separator -----------------------------------------------------
@@ -239,6 +248,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Host privileges; Merged with database privileges
Separator -----------------------------------------------------
@@ -262,6 +272,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -285,6 +296,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -308,6 +320,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -331,6 +344,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment MySQL plugins
Separator -----------------------------------------------------
@@ -354,6 +368,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Stored Procedures
Separator -----------------------------------------------------
@@ -377,6 +392,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Procedure privileges
Separator -----------------------------------------------------
@@ -400,6 +416,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment MySQL Foreign Servers table
Separator -----------------------------------------------------
@@ -423,6 +440,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Slow log
Separator -----------------------------------------------------
@@ -446,6 +464,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Table privileges
Separator -----------------------------------------------------
@@ -469,6 +488,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Time zones
Separator -----------------------------------------------------
@@ -492,6 +512,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Leap seconds information for time zones
Separator -----------------------------------------------------
@@ -515,6 +536,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Time zone names
Separator -----------------------------------------------------
@@ -538,6 +560,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Time zone transitions
Separator -----------------------------------------------------
@@ -561,6 +584,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Time zone transition types
Separator -----------------------------------------------------
@@ -584,6 +608,7 @@ CHECK_TIME #CT#
TABLE_COLLATION utf8_bin
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment Users and global privileges
Separator -----------------------------------------------------
=== modified file 'mysql-test/suite/funcs_1/r/is_tables_ndb.result'
--- a/mysql-test/suite/funcs_1/r/is_tables_ndb.result 2008-06-28 09:54:53 +0000
+++ b/mysql-test/suite/funcs_1/r/is_tables_ndb.result 2008-09-22 14:32:42 +0000
@@ -37,6 +37,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -60,6 +61,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -83,6 +85,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -129,6 +132,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
@@ -152,6 +156,7 @@ CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
+TABLESPACE_NAME #TN#
TABLE_COMMENT #TC#
user_comment
Separator -----------------------------------------------------
=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc 2008-09-11 18:36:05 +0000
+++ b/sql/sql_show.cc 2008-09-22 14:32:42 +0000
@@ -3552,13 +3552,13 @@ static int get_schema_tables_record(THD
table->field[3]->store(STRING_WITH_LEN("SYSTEM VIEW"), cs);
else
table->field[3]->store(STRING_WITH_LEN("BASE TABLE"), cs);
- table->field[20]->store(error, strlen(error), cs);
+ table->field[21]->store(error, strlen(error), cs);
thd->clear_error();
}
else if (tables->view)
{
table->field[3]->store(STRING_WITH_LEN("VIEW"), cs);
- table->field[20]->store(STRING_WITH_LEN("VIEW"), cs);
+ table->field[21]->store(STRING_WITH_LEN("VIEW"), cs);
}
else
{
@@ -3638,8 +3638,13 @@ static int get_schema_tables_record(THD
share->table_charset->name : "default");
table->field[17]->store(tmp_buff, strlen(tmp_buff), cs);
+ if (share->tablespace)
+ {
+ table->field[20]->store(share->tablespace, strlen(share->tablespace), cs);
+ table->field[20]->set_notnull();
+ }
if (share->comment.str)
- table->field[20]->store(share->comment.str, share->comment.length, cs);
+ table->field[21]->store(share->comment.str, share->comment.length, cs);
if(file)
{
@@ -6396,6 +6401,7 @@ ST_FIELD_INFO tables_fields_info[]=
(MY_I_S_MAYBE_NULL | MY_I_S_UNSIGNED), "Checksum", OPEN_FULL_TABLE},
{"CREATE_OPTIONS", 255, MYSQL_TYPE_STRING, 0, 1, "Create_options",
OPEN_FRM_ONLY},
+ {"TABLESPACE_NAME", NAME_CHAR_LEN, MYSQL_TYPE_STRING, 0, 1, 0, OPEN_FRM_ONLY},
{"TABLE_COMMENT", TABLE_COMMENT_MAXLEN, MYSQL_TYPE_STRING, 0, 0, "Comment", OPEN_FRM_ONLY},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE}
};
