From: Date: July 31 2008 11:12am Subject: bzr push into mysql-6.0-falcon branch (svoj:2761) List-Archive: http://lists.mysql.com/commits/50768 Message-Id: <20080731091220.4337941CED0@june.myoffice.izhnet.ru> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 2761 Sergey Vojtovich 2008-07-31 [merge] Merge falcon-6.0 -> falcon-6.0-team modified: mysql-test/suite/falcon/r/falcon_bug_31295.result mysql-test/suite/falcon/r/falcon_bug_33404.result mysql-test/suite/falcon/t/falcon_bug_31295.test mysql-test/suite/falcon/t/falcon_bug_33404.test mysql-test/suite/funcs_1/r/is_columns_is_falcon.result mysql-test/suite/funcs_1/r/is_tables_is_falcon.result mysql-test/t/information_schema-master.opt mysql-test/t/information_schema_db-master.opt mysql-test/t/mysqlshow-master.opt mysql-test/t/variables-master.opt storage/falcon/StorageHandler.cpp storage/falcon/StorageHandler.h storage/falcon/ha_falcon.cpp storage/falcon/ha_falcon.h === modified file 'mysql-test/suite/falcon/r/falcon_bug_31295.result' --- a/mysql-test/suite/falcon/r/falcon_bug_31295.result 2008-07-17 20:38:45 +0000 +++ b/mysql-test/suite/falcon/r/falcon_bug_31295.result 2008-07-29 10:45:39 +0000 @@ -1,22 +1,28 @@ *** Bug #31295 *** -SET @@storage_engine = 'Falcon'; +SET @@storage_engine = Falcon; DROP TABLE IF EXISTS t1; -DROP TABLESPACE ts1 ENGINE 'Falcon'; -CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE 'Falcon'; +DROP TABLESPACE ts1 ENGINE Falcon; +CREATE TABLESPACE ts1 ADD DATAFILE 'ts1.fts' ENGINE Falcon; CREATE TABLE t1(a int); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE TABLE_NAME='t1'; -SCHEMA_NAME TABLE_NAME PARTITION TABLESPACE INTERNAL_NAME -TEST T1 FALCON_USER T1 -ALTER TABLE t1 TABLESPACE ts1 ENGINE 'Falcon'; -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE TABLE_NAME='t1'; -SCHEMA_NAME TABLE_NAME PARTITION TABLESPACE INTERNAL_NAME -TEST T1 ts1 T1 -ALTER TABLE t1 ENGINE 'Falcon'; -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE TABLE_NAME='t1'; -SCHEMA_NAME TABLE_NAME PARTITION TABLESPACE INTERNAL_NAME -TEST T1 ts1 T1 +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) ENGINE=ENGINE DEFAULT CHARSET=latin1 +ALTER TABLE t1 TABLESPACE ts1 ENGINE Falcon; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) /*!50100 TABLESPACE `ts1` */ ENGINE=ENGINE DEFAULT CHARSET=latin1 +ALTER TABLE t1 ENGINE Falcon; +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) /*!50100 TABLESPACE `ts1` */ ENGINE=ENGINE DEFAULT CHARSET=latin1 SELECT count(*) FROM t1; count(*) 0 DROP TABLE t1; -DROP TABLESPACE ts1 ENGINE 'Falcon'; +DROP TABLESPACE ts1 ENGINE Falcon; === modified file 'mysql-test/suite/falcon/r/falcon_bug_33404.result' --- a/mysql-test/suite/falcon/r/falcon_bug_33404.result 2008-04-23 06:54:13 +0000 +++ b/mysql-test/suite/falcon/r/falcon_bug_33404.result 2008-07-29 10:45:39 +0000 @@ -12,23 +12,17 @@ SUBPARTITION p2s1, SUBPARTITION p2s2 ) ); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE -TABLE_NAME = 't1' AND SCHEMA_NAME='test'; -SCHEMA_NAME TABLE_NAME PARTITION TABLESPACE INTERNAL_NAME -TEST T1 P1S1 ts3 T1#P#P1#SP#P1S1 -TEST T1 P1S2 ts2 T1#P#P1#SP#P1S2 -TEST T1 P2S1 ts1 T1#P#P2#SP#P2S1 -TEST T1 P2S2 ts1 T1#P#P2#SP#P2S2 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) /*!50100 TABLESPACE `ts1` */ ENGINE=Falcon DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a) (PARTITION p1 VALUES LESS THAN (100) (SUBPARTITION p1s1 TABLESPACE = ts3 ENGINE = Falcon, SUBPARTITION p1s2 TABLESPACE = ts2 ENGINE = Falcon), PARTITION p2 VALUES LESS THAN MAXVALUE (SUBPARTITION p2s1 TABLESPACE = ts1 ENGINE = Falcon, SUBPARTITION p2s2 TABLESPACE = ts1 ENGINE = Falcon)) */ ALTER TABLE t1 REMOVE PARTITIONING; -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE -TABLE_NAME = 't1' AND SCHEMA_NAME='test'; -SCHEMA_NAME TABLE_NAME PARTITION TABLESPACE INTERNAL_NAME -TEST T1 ts1 T1 +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) /*!50100 TABLESPACE `ts1` */ ENGINE=Falcon DEFAULT CHARSET=latin1 ALTER TABLE t1 TABLESPACE ts1 PARTITION BY RANGE(a) SUBPARTITION BY HASH(a) ( PARTITION p1 VALUES LESS THAN (100) TABLESPACE ts2 ( @@ -40,56 +34,38 @@ SUBPARTITION p2s1, SUBPARTITION p2s2 ) ); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE -TABLE_NAME = 't1' AND SCHEMA_NAME='test'; -SCHEMA_NAME TABLE_NAME PARTITION TABLESPACE INTERNAL_NAME -TEST T1 P1S1 ts3 T1#P#P1#SP#P1S1 -TEST T1 P1S2 ts2 T1#P#P1#SP#P1S2 -TEST T1 P2S1 ts1 T1#P#P2#SP#P2S1 -TEST T1 P2S2 ts1 T1#P#P2#SP#P2S2 +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) /*!50100 TABLESPACE `ts1` */ ENGINE=Falcon DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a) (PARTITION p1 VALUES LESS THAN (100) (SUBPARTITION p1s1 TABLESPACE = ts3 ENGINE = Falcon, SUBPARTITION p1s2 TABLESPACE = ts2 ENGINE = Falcon), PARTITION p2 VALUES LESS THAN (200) (SUBPARTITION p2s1 TABLESPACE = ts1 ENGINE = Falcon, SUBPARTITION p2s2 TABLESPACE = ts1 ENGINE = Falcon)) */ ALTER TABLE t1 ADD PARTITION (PARTITION p3 VALUES LESS THAN MAXVALUE); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE -TABLE_NAME = 't1' AND SCHEMA_NAME='test'; -SCHEMA_NAME TABLE_NAME PARTITION TABLESPACE INTERNAL_NAME -TEST T1 P1S1 ts3 T1#P#P1#SP#P1S1 -TEST T1 P1S2 ts2 T1#P#P1#SP#P1S2 -TEST T1 P2S1 ts1 T1#P#P2#SP#P2S1 -TEST T1 P2S2 ts1 T1#P#P2#SP#P2S2 -TEST T1 P3SP0 ts1 T1#P#P3#SP#P3SP0 -TEST T1 P3SP1 ts1 T1#P#P3#SP#P3SP1 +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) /*!50100 TABLESPACE `ts1` */ ENGINE=Falcon DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a) (PARTITION p1 VALUES LESS THAN (100) (SUBPARTITION p1s1 TABLESPACE = ts3 ENGINE = Falcon, SUBPARTITION p1s2 TABLESPACE = ts2 ENGINE = Falcon), PARTITION p2 VALUES LESS THAN (200) (SUBPARTITION p2s1 TABLESPACE = ts1 ENGINE = Falcon, SUBPARTITION p2s2 TABLESPACE = ts1 ENGINE = Falcon), PARTITION p3 VALUES LESS THAN MAXVALUE (SUBPARTITION p3sp0 TABLESPACE = ts1 ENGINE = Falcon, SUBPARTITION p3sp1 TABLESPACE = ts1 ENGINE = Falcon)) */ ALTER TABLE t1 REORGANIZE PARTITION p3 INTO (PARTITION p3 VALUES LESS THAN MAXVALUE TABLESPACE ts1); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE -TABLE_NAME = 't1' AND SCHEMA_NAME='test'; -SCHEMA_NAME TABLE_NAME PARTITION TABLESPACE INTERNAL_NAME -TEST T1 P1S1 ts3 T1#P#P1#SP#P1S1 -TEST T1 P1S2 ts2 T1#P#P1#SP#P1S2 -TEST T1 P2S1 ts1 T1#P#P2#SP#P2S1 -TEST T1 P2S2 ts1 T1#P#P2#SP#P2S2 -TEST T1 P3SP0 ts1 T1#P#P3#SP#P3SP0 -TEST T1 P3SP1 ts1 T1#P#P3#SP#P3SP1 +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) /*!50100 TABLESPACE `ts1` */ ENGINE=Falcon DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a) (PARTITION p1 VALUES LESS THAN (100) (SUBPARTITION p1s1 TABLESPACE = ts3 ENGINE = Falcon, SUBPARTITION p1s2 TABLESPACE = ts2 ENGINE = Falcon), PARTITION p2 VALUES LESS THAN (200) (SUBPARTITION p2s1 TABLESPACE = ts1 ENGINE = Falcon, SUBPARTITION p2s2 TABLESPACE = ts1 ENGINE = Falcon), PARTITION p3 VALUES LESS THAN MAXVALUE (SUBPARTITION p3sp0 TABLESPACE = ts1 ENGINE = Falcon, SUBPARTITION p3sp1 TABLESPACE = ts1 ENGINE = Falcon)) */ ALTER TABLE t1 REORGANIZE PARTITION p3 INTO (PARTITION p3 VALUES LESS THAN MAXVALUE TABLESPACE ts2); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE -TABLE_NAME = 't1' AND SCHEMA_NAME='test'; -SCHEMA_NAME TABLE_NAME PARTITION TABLESPACE INTERNAL_NAME -TEST T1 P1S1 ts3 T1#P#P1#SP#P1S1 -TEST T1 P1S2 ts2 T1#P#P1#SP#P1S2 -TEST T1 P2S1 ts1 T1#P#P2#SP#P2S1 -TEST T1 P2S2 ts1 T1#P#P2#SP#P2S2 -TEST T1 P3SP0 ts2 T1#P#P3#SP#P3SP0 -TEST T1 P3SP1 ts2 T1#P#P3#SP#P3SP1 +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) /*!50100 TABLESPACE `ts1` */ ENGINE=Falcon DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a) (PARTITION p1 VALUES LESS THAN (100) (SUBPARTITION p1s1 TABLESPACE = ts3 ENGINE = Falcon, SUBPARTITION p1s2 TABLESPACE = ts2 ENGINE = Falcon), PARTITION p2 VALUES LESS THAN (200) (SUBPARTITION p2s1 TABLESPACE = ts1 ENGINE = Falcon, SUBPARTITION p2s2 TABLESPACE = ts1 ENGINE = Falcon), PARTITION p3 VALUES LESS THAN MAXVALUE (SUBPARTITION p3sp0 TABLESPACE = ts2 ENGINE = Falcon, SUBPARTITION p3sp1 TABLESPACE = ts2 ENGINE = Falcon)) */ ALTER TABLE t1 REORGANIZE PARTITION p1 INTO (PARTITION p1 VALUES LESS THAN (100) TABLESPACE ts2); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE -TABLE_NAME = 't1' AND SCHEMA_NAME='test'; -SCHEMA_NAME TABLE_NAME PARTITION TABLESPACE INTERNAL_NAME -TEST T1 P2S1 ts1 T1#P#P2#SP#P2S1 -TEST T1 P2S2 ts1 T1#P#P2#SP#P2S2 -TEST T1 P3SP0 ts2 T1#P#P3#SP#P3SP0 -TEST T1 P3SP1 ts2 T1#P#P3#SP#P3SP1 -TEST T1 P1SP0 ts2 T1#P#P1#SP#P1SP0 -TEST T1 P1SP1 ts2 T1#P#P1#SP#P1SP1 +SHOW CREATE TABLE t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` int(11) DEFAULT NULL +) /*!50100 TABLESPACE `ts1` */ ENGINE=Falcon DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (a) SUBPARTITION BY HASH (a) (PARTITION p1 VALUES LESS THAN (100) (SUBPARTITION p1sp0 TABLESPACE = ts2 ENGINE = Falcon, SUBPARTITION p1sp1 TABLESPACE = ts2 ENGINE = Falcon), PARTITION p2 VALUES LESS THAN (200) (SUBPARTITION p2s1 TABLESPACE = ts1 ENGINE = Falcon, SUBPARTITION p2s2 TABLESPACE = ts1 ENGINE = Falcon), PARTITION p3 VALUES LESS THAN MAXVALUE (SUBPARTITION p3sp0 TABLESPACE = ts2 ENGINE = Falcon, SUBPARTITION p3sp1 TABLESPACE = ts2 ENGINE = Falcon)) */ DROP TABLE t1; DROP TABLESPACE ts1 ENGINE=Falcon; DROP TABLESPACE ts2 ENGINE=Falcon; === modified file 'mysql-test/suite/falcon/t/falcon_bug_31295.test' --- a/mysql-test/suite/falcon/t/falcon_bug_31295.test 2008-07-17 20:38:45 +0000 +++ b/mysql-test/suite/falcon/t/falcon_bug_31295.test 2008-07-29 10:45:39 +0000 @@ -8,7 +8,7 @@ # ----------------------------------------------------- # # --- Initialisation --- # # ----------------------------------------------------- # -let $engine = 'Falcon'; +let $engine = Falcon; eval SET @@storage_engine = $engine; --disable_warnings @@ -23,12 +23,14 @@ CREATE TABLE t1(a int); # ----------------------------------------------------- # # --- Test --- # # ----------------------------------------------------- # -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE TABLE_NAME='t1'; +--replace_result $engine ENGINE +SHOW CREATE TABLE t1; eval ALTER TABLE t1 TABLESPACE ts1 ENGINE $engine; -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE TABLE_NAME='t1'; +--replace_result $engine ENGINE +SHOW CREATE TABLE t1; eval ALTER TABLE t1 ENGINE $engine; -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE TABLE_NAME='t1'; - +--replace_result $engine ENGINE +SHOW CREATE TABLE t1; # ----------------------------------------------------- # # --- Check --- # === modified file 'mysql-test/suite/falcon/t/falcon_bug_33404.test' --- a/mysql-test/suite/falcon/t/falcon_bug_33404.test 2008-04-23 06:54:13 +0000 +++ b/mysql-test/suite/falcon/t/falcon_bug_33404.test 2008-07-29 10:45:39 +0000 @@ -19,13 +19,10 @@ PARTITION BY RANGE(a) SUBPARTITION BY HA SUBPARTITION p2s2 ) ); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE - TABLE_NAME = 't1' AND SCHEMA_NAME='test'; SHOW CREATE TABLE t1; ALTER TABLE t1 REMOVE PARTITIONING; -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE - TABLE_NAME = 't1' AND SCHEMA_NAME='test'; +SHOW CREATE TABLE t1; ALTER TABLE t1 TABLESPACE ts1 PARTITION BY RANGE(a) SUBPARTITION BY HASH(a) ( @@ -38,27 +35,22 @@ PARTITION BY RANGE(a) SUBPARTITION BY HA SUBPARTITION p2s2 ) ); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE - TABLE_NAME = 't1' AND SCHEMA_NAME='test'; +SHOW CREATE TABLE t1; ALTER TABLE t1 ADD PARTITION (PARTITION p3 VALUES LESS THAN MAXVALUE); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE - TABLE_NAME = 't1' AND SCHEMA_NAME='test'; +SHOW CREATE TABLE t1; ALTER TABLE t1 REORGANIZE PARTITION p3 INTO (PARTITION p3 VALUES LESS THAN MAXVALUE TABLESPACE ts1); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE - TABLE_NAME = 't1' AND SCHEMA_NAME='test'; +SHOW CREATE TABLE t1; ALTER TABLE t1 REORGANIZE PARTITION p3 INTO (PARTITION p3 VALUES LESS THAN MAXVALUE TABLESPACE ts2); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE - TABLE_NAME = 't1' AND SCHEMA_NAME='test'; +SHOW CREATE TABLE t1; ALTER TABLE t1 REORGANIZE PARTITION p1 INTO (PARTITION p1 VALUES LESS THAN (100) TABLESPACE ts2); -SELECT * FROM INFORMATION_SCHEMA.FALCON_TABLES WHERE - TABLE_NAME = 't1' AND SCHEMA_NAME='test'; +SHOW CREATE TABLE t1; DROP TABLE t1; DROP TABLESPACE ts1 ENGINE=Falcon; === modified file 'mysql-test/suite/funcs_1/r/is_columns_is_falcon.result' --- a/mysql-test/suite/funcs_1/r/is_columns_is_falcon.result 2008-04-28 20:09:51 +0000 +++ b/mysql-test/suite/funcs_1/r/is_columns_is_falcon.result 2008-07-29 10:45:39 +0000 @@ -36,11 +36,6 @@ NULL information_schema FALCON_SYSTEM_ME NULL information_schema FALCON_SYSTEM_MEMORY_SUMMARY SMALL_HUNKS 5 0 NO int NULL NULL 10 0 NULL NULL int(4) select Default Default NULL information_schema FALCON_SYSTEM_MEMORY_SUMMARY TOTAL_SPACE 1 0 NO bigint NULL NULL 19 0 NULL NULL bigint(4) select Default Default NULL information_schema FALCON_SYSTEM_MEMORY_SUMMARY UNIQUE_SIZES 6 0 NO int NULL NULL 10 0 NULL NULL int(4) select Default Default -NULL information_schema FALCON_TABLES INTERNAL_NAME 5 NO varchar 127 508 NULL NULL utf8 utf8_general_ci varchar(127) select Default Default -NULL information_schema FALCON_TABLES PARTITION 3 NO varchar 127 508 NULL NULL utf8 utf8_general_ci varchar(127) select Default Default -NULL information_schema FALCON_TABLES SCHEMA_NAME 1 NO varchar 127 508 NULL NULL utf8 utf8_general_ci varchar(127) select Default Default -NULL information_schema FALCON_TABLES TABLESPACE 4 NO varchar 127 508 NULL NULL utf8 utf8_general_ci varchar(127) select Default Default -NULL information_schema FALCON_TABLES TABLE_NAME 2 NO varchar 127 508 NULL NULL utf8 utf8_general_ci varchar(127) select Default Default NULL information_schema FALCON_TABLESPACES COMMENT 3 NO varchar 127 508 NULL NULL utf8 utf8_general_ci varchar(127) select Default Default NULL information_schema FALCON_TABLESPACES TABLESPACE_NAME 1 NO varchar 127 508 NULL NULL utf8 utf8_general_ci varchar(127) select Default Default NULL information_schema FALCON_TABLESPACES TYPE 2 NO varchar 127 508 NULL NULL utf8 utf8_general_ci varchar(127) select Default Default @@ -161,11 +156,6 @@ NULL information_schema FALCON_SYSTEM_ME NULL information_schema FALCON_SYSTEM_MEMORY_SUMMARY BIG_HUNKS int NULL NULL NULL NULL int(4) NULL information_schema FALCON_SYSTEM_MEMORY_SUMMARY SMALL_HUNKS int NULL NULL NULL NULL int(4) NULL information_schema FALCON_SYSTEM_MEMORY_SUMMARY UNIQUE_SIZES int NULL NULL NULL NULL int(4) -4.0000 information_schema FALCON_TABLES SCHEMA_NAME varchar 127 508 utf8 utf8_general_ci varchar(127) -4.0000 information_schema FALCON_TABLES TABLE_NAME varchar 127 508 utf8 utf8_general_ci varchar(127) -4.0000 information_schema FALCON_TABLES PARTITION varchar 127 508 utf8 utf8_general_ci varchar(127) -4.0000 information_schema FALCON_TABLES TABLESPACE varchar 127 508 utf8 utf8_general_ci varchar(127) -4.0000 information_schema FALCON_TABLES INTERNAL_NAME varchar 127 508 utf8 utf8_general_ci varchar(127) 4.0000 information_schema FALCON_TABLESPACES TABLESPACE_NAME varchar 127 508 utf8 utf8_general_ci varchar(127) 4.0000 information_schema FALCON_TABLESPACES TYPE varchar 127 508 utf8 utf8_general_ci varchar(127) 4.0000 information_schema FALCON_TABLESPACES COMMENT varchar 127 508 utf8 utf8_general_ci varchar(127) === 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-06-19 18:56:48 +0000 +++ b/mysql-test/suite/funcs_1/r/is_tables_is_falcon.result 2008-07-29 10:45:39 +0000 @@ -153,29 +153,6 @@ user_comment Separator ----------------------------------------------------- TABLE_CATALOG NULL TABLE_SCHEMA information_schema -TABLE_NAME FALCON_TABLES -TABLE_TYPE SYSTEM VIEW -ENGINE MEMORY -VERSION 10 -ROW_FORMAT Fixed -TABLE_ROWS #TBLR# -AVG_ROW_LENGTH #ARL# -DATA_LENGTH #DL# -MAX_DATA_LENGTH #MDL# -INDEX_LENGTH #IL# -DATA_FREE #DF# -AUTO_INCREMENT NULL -CREATE_TIME #CRT# -UPDATE_TIME #UT# -CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci -CHECKSUM NULL -CREATE_OPTIONS #CO# -TABLE_COMMENT #TC# -user_comment -Separator ----------------------------------------------------- -TABLE_CATALOG NULL -TABLE_SCHEMA information_schema TABLE_NAME FALCON_TABLESPACES TABLE_TYPE SYSTEM VIEW ENGINE MEMORY @@ -469,29 +446,6 @@ user_comment Separator ----------------------------------------------------- TABLE_CATALOG NULL TABLE_SCHEMA information_schema -TABLE_NAME FALCON_TABLES -TABLE_TYPE SYSTEM VIEW -ENGINE MEMORY -VERSION 10 -ROW_FORMAT Fixed -TABLE_ROWS #TBLR# -AVG_ROW_LENGTH #ARL# -DATA_LENGTH #DL# -MAX_DATA_LENGTH #MDL# -INDEX_LENGTH #IL# -DATA_FREE #DF# -AUTO_INCREMENT NULL -CREATE_TIME #CRT# -UPDATE_TIME #UT# -CHECK_TIME #CT# -TABLE_COLLATION utf8_general_ci -CHECKSUM NULL -CREATE_OPTIONS #CO# -TABLE_COMMENT #TC# -user_comment -Separator ----------------------------------------------------- -TABLE_CATALOG NULL -TABLE_SCHEMA information_schema TABLE_NAME FALCON_TABLESPACES TABLE_TYPE SYSTEM VIEW ENGINE MEMORY === modified file 'mysql-test/t/information_schema-master.opt' --- a/mysql-test/t/information_schema-master.opt 2007-11-30 03:26:57 +0000 +++ b/mysql-test/t/information_schema-master.opt 2008-07-29 10:45:39 +0000 @@ -6,7 +6,6 @@ --loose-skip-plugin-falcon_syncobjects --loose-skip-plugin-falcon_system_memory_detail --loose-skip-plugin-falcon_system_memory_summary ---loose-skip-plugin-falcon_tables --loose-skip-plugin-falcon_transaction_summary --loose-skip-plugin-falcon_transactions --loose-skip-plugin-falcon_version === modified file 'mysql-test/t/information_schema_db-master.opt' --- a/mysql-test/t/information_schema_db-master.opt 2007-11-30 03:26:57 +0000 +++ b/mysql-test/t/information_schema_db-master.opt 2008-07-29 10:45:39 +0000 @@ -6,7 +6,6 @@ --loose-skip-plugin-falcon_syncobjects --loose-skip-plugin-falcon_system_memory_detail --loose-skip-plugin-falcon_system_memory_summary ---loose-skip-plugin-falcon_tables --loose-skip-plugin-falcon_transaction_summary --loose-skip-plugin-falcon_transactions --loose-skip-plugin-falcon_version === modified file 'mysql-test/t/mysqlshow-master.opt' --- a/mysql-test/t/mysqlshow-master.opt 2007-11-30 03:26:57 +0000 +++ b/mysql-test/t/mysqlshow-master.opt 2008-07-29 10:45:39 +0000 @@ -6,7 +6,6 @@ --loose-skip-plugin-falcon_syncobjects --loose-skip-plugin-falcon_system_memory_detail --loose-skip-plugin-falcon_system_memory_summary ---loose-skip-plugin-falcon_tables --loose-skip-plugin-falcon_transaction_summary --loose-skip-plugin-falcon_transactions --loose-skip-plugin-falcon_version === modified file 'mysql-test/t/variables-master.opt' --- a/mysql-test/t/variables-master.opt 2007-09-28 19:51:23 +0000 +++ b/mysql-test/t/variables-master.opt 2008-07-29 10:45:39 +0000 @@ -6,6 +6,5 @@ --loose-skip-plugin-falcon_syncobjects --loose-skip-plugin-falcon_system_memory_detail --loose-skip-plugin-falcon_system_memory_summary ---loose-skip-plugin-falcon_tables --loose-skip-plugin-falcon_transaction_summary --loose-skip-plugin-falcon_transactions === modified file 'storage/falcon/StorageHandler.cpp' --- a/storage/falcon/StorageHandler.cpp 2008-07-24 08:45:03 +0000 +++ b/storage/falcon/StorageHandler.cpp 2008-07-31 08:52:32 +0000 @@ -1041,67 +1041,6 @@ void StorageHandler::dropTempTables(void statement->close(); } -void StorageHandler::getTablesInfo(InfoTable* infoTable) -{ - if (!defaultDatabase) - initialize(); - - if (!dictionaryConnection) - return; - - try - { - PStatement statement = dictionaryConnection->prepareStatement( - "select schema,tablename,tablespace from system.tables where tablespace <> ''"); - RSet resultSet = statement->executeQuery(); - - while (resultSet->next()) - { - - // Parse table and partition name - - const char *pStr = resultSet->getString(2); - char *pTable = NULL; - char *pPart = NULL; - - if (pStr) - { - const int max_buf = 1024; - char buffer[max_buf+1]; - - pTable = buffer; - *pTable = 0; - strncpy(buffer, pStr, (size_t)max_buf); - - char *pBuf = strchr(buffer, '#'); - - if (pBuf) - { - *pBuf = 0; - if ((pPart = strrchr(++pBuf, '#')) != NULL) - pPart++; - } - } - - infoTable->putString(0, resultSet->getString(1)); // database - infoTable->putString(1, (pTable ? pTable : pStr)); // table - infoTable->putString(2, (pPart ? pPart : "")); // partition - infoTable->putString(3, resultSet->getString(3)); // tablespace - infoTable->putString(4, resultSet->getString(2)); // internal name - - //for (int n = 0; n < 3; ++n) - // infoTable->putString(n, resultSet->getString(n + 1)); - - infoTable->putRecord(); - } - - dictionaryConnection->commit(); - } - catch(...) - { - } -} - void StorageHandler::setRecordMemoryMax(uint64 value) { if (dictionaryConnection) === modified file 'storage/falcon/StorageHandler.h' --- a/storage/falcon/StorageHandler.h 2008-07-17 13:52:17 +0000 +++ b/storage/falcon/StorageHandler.h 2008-07-29 10:45:39 +0000 @@ -103,7 +103,6 @@ public: virtual void getTransactionSummaryInfo(InfoTable* infoTable); virtual void getTableSpaceInfo(InfoTable* infoTable); virtual void getTableSpaceFilesInfo(InfoTable* infoTable); - virtual void getTablesInfo(InfoTable* infoTable); virtual void setIndexChillThreshold(uint value); virtual void setRecordChillThreshold(uint value); === modified file 'storage/falcon/ha_falcon.cpp' --- a/storage/falcon/ha_falcon.cpp 2008-07-21 09:56:25 +0000 +++ b/storage/falcon/ha_falcon.cpp 2008-07-29 10:45:39 +0000 @@ -3243,48 +3243,6 @@ int NfsPluginHandler::deinitTableSpaceFi //***************************************************************************** // -// FALCON_TABLES -// -//***************************************************************************** - -int NfsPluginHandler::getTablesInfo(THD *thd, TABLE_LIST *tables, COND *cond) -{ - InfoTableImpl infoTable(thd, tables, system_charset_info); - - if (storageHandler) - storageHandler->getTablesInfo(&infoTable); - - return infoTable.error; -} - -ST_FIELD_INFO tablesFieldInfo[]= -{ - {"SCHEMA_NAME", 127, MYSQL_TYPE_STRING, 0, 0, "Schema Name", SKIP_OPEN_TABLE}, - {"TABLE_NAME", 127, MYSQL_TYPE_STRING, 0, 0, "Table Name", SKIP_OPEN_TABLE}, - {"PARTITION", 127, MYSQL_TYPE_STRING, 0, 0, "Partition Name", SKIP_OPEN_TABLE}, - {"TABLESPACE", 127, MYSQL_TYPE_STRING, 0, 0, "Tablespace", SKIP_OPEN_TABLE}, - {"INTERNAL_NAME", 127, MYSQL_TYPE_STRING, 0, 0, "Internal Name", SKIP_OPEN_TABLE}, - {0, 0, MYSQL_TYPE_STRING, 0, 0, 0, SKIP_OPEN_TABLE} -}; - -int NfsPluginHandler::initTablesInfo(void *p) -{ - DBUG_ENTER("initTablesInfo"); - ST_SCHEMA_TABLE *schema = (ST_SCHEMA_TABLE *)p; - schema->fields_info = tablesFieldInfo; - schema->fill_table = NfsPluginHandler::getTablesInfo; - - DBUG_RETURN(0); -} - -int NfsPluginHandler::deinitTablesInfo(void *p) -{ - DBUG_ENTER("deinitTablesInfo"); - DBUG_RETURN(0); -} - -//***************************************************************************** -// // FALCON_TRANSACTIONS // //***************************************************************************** @@ -3691,7 +3649,6 @@ static st_mysql_information_schema falco static st_mysql_information_schema falcon_serial_log_info = { MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION}; static st_mysql_information_schema falcon_tablespaces = { MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION}; static st_mysql_information_schema falcon_tablespace_files = { MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION}; -static st_mysql_information_schema falcon_tables = { MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION}; static st_mysql_information_schema falcon_version = { MYSQL_INFORMATION_SCHEMA_INTERFACE_VERSION}; mysql_declare_plugin(falcon) @@ -3888,21 +3845,6 @@ mysql_declare_plugin(falcon) NULL, /* status variables */ NULL, /* system variables */ NULL /* config options */ - }, - - { - MYSQL_INFORMATION_SCHEMA_PLUGIN, - &falcon_tables, - "FALCON_TABLES", - "MySQL AB", - "Falcon Tables.", - PLUGIN_LICENSE_GPL, - NfsPluginHandler::initTablesInfo, /* plugin init */ - NfsPluginHandler::deinitTablesInfo, /* plugin deinit */ - 0x0005, - NULL, /* status variables */ - NULL, /* system variables */ - NULL /* config options */ } mysql_declare_plugin_end; === modified file 'storage/falcon/ha_falcon.h' --- a/storage/falcon/ha_falcon.h 2008-07-09 04:38:02 +0000 +++ b/storage/falcon/ha_falcon.h 2008-07-29 10:45:39 +0000 @@ -253,8 +253,4 @@ public: static int getTableSpaceFilesInfo(THD *thd, TABLE_LIST *tables, COND *cond); static int initTableSpaceFilesInfo(void *p); static int deinitTableSpaceFilesInfo(void *p); - - static int getTablesInfo(THD *thd, TABLE_LIST *tables, COND *cond); - static int initTablesInfo(void *p); - static int deinitTablesInfo(void *p); };