Removed the dependency on PBXT from tests information_schema_all_engines, and is_columns_is.

Made information_schema_all_engines stable by adding "sorted_result".

Removed the dependency on PBXT from tests information_schema_all_engines, and is_columns_is.
Made information_schema_all_engines stable by adding "sorted_result".
67d0e7ef · unknown · bf66185e · 67d0e7ef · 67d0e7ef · 67d0e7ef
Commit 67d0e7ef authored Nov 09, 2012 by unknown
5 changed files
--- a/mysql-test/r/information_schema_all_engines.result
+++ b/mysql-test/r/information_schema_all_engines.result
@@ -13,6 +13,26 @@ FILES
 GLOBAL_STATUS
 GLOBAL_VARIABLES
 INDEX_STATISTICS
+INNODB_BUFFER_PAGE
+INNODB_BUFFER_PAGE_LRU
+INNODB_BUFFER_POOL_PAGES
+INNODB_BUFFER_POOL_PAGES_BLOB
+INNODB_BUFFER_POOL_PAGES_INDEX
+INNODB_BUFFER_POOL_STATS
+INNODB_CHANGED_PAGES
+INNODB_CMP
+INNODB_CMPMEM
+INNODB_CMPMEM_RESET
+INNODB_CMP_RESET
+INNODB_INDEX_STATS
+INNODB_LOCKS
+INNODB_LOCK_WAITS
+INNODB_RSEG
+INNODB_SYS_INDEXES
+INNODB_SYS_STATS
+INNODB_SYS_TABLES
+INNODB_TABLE_STATS
+INNODB_TRX
 KEY_CACHES
 KEY_COLUMN_USAGE
 PARTITIONS
@@ -34,28 +54,7 @@ TRIGGERS
 USER_PRIVILEGES
 USER_STATISTICS
 VIEWS
-INNODB_BUFFER_POOL_PAGES
-PBXT_STATISTICS
-INNODB_CMP
-INNODB_RSEG
-INNODB_INDEX_STATS
-INNODB_BUFFER_POOL_PAGES_INDEX
 XTRADB_ADMIN_COMMAND
-INNODB_TRX
-INNODB_SYS_TABLES
-INNODB_LOCK_WAITS
-INNODB_BUFFER_POOL_STATS
-INNODB_LOCKS
-INNODB_CMPMEM
-INNODB_TABLE_STATS
-INNODB_SYS_INDEXES
-INNODB_CMP_RESET
-INNODB_BUFFER_POOL_PAGES_BLOB
-INNODB_CMPMEM_RESET
-INNODB_BUFFER_PAGE
-INNODB_CHANGED_PAGES
-INNODB_SYS_STATS
-INNODB_BUFFER_PAGE_LRU
 SELECT t.table_name, c1.column_name
 FROM information_schema.tables t
 INNER JOIN
@@ -83,6 +82,26 @@ FILES	TABLE_SCHEMA
 GLOBAL_STATUS	VARIABLE_NAME
 GLOBAL_VARIABLES	VARIABLE_NAME
 INDEX_STATISTICS	TABLE_SCHEMA
+INNODB_BUFFER_PAGE	BLOCK_ID
+INNODB_BUFFER_PAGE_LRU	LRU_POSITION
+INNODB_BUFFER_POOL_PAGES	page_type
+INNODB_BUFFER_POOL_PAGES_BLOB	space_id
+INNODB_BUFFER_POOL_PAGES_INDEX	index_id
+INNODB_BUFFER_POOL_STATS	POOL_SIZE
+INNODB_CHANGED_PAGES	space_id
+INNODB_CMP	page_size
+INNODB_CMPMEM	page_size
+INNODB_CMPMEM_RESET	page_size
+INNODB_CMP_RESET	page_size
+INNODB_INDEX_STATS	table_schema
+INNODB_LOCKS	lock_id
+INNODB_LOCK_WAITS	requesting_trx_id
+INNODB_RSEG	rseg_id
+INNODB_SYS_INDEXES	TABLE_ID
+INNODB_SYS_STATS	INDEX_ID
+INNODB_SYS_TABLES	SCHEMA
+INNODB_TABLE_STATS	table_schema
+INNODB_TRX	trx_id
 KEY_CACHES	KEY_CACHE_NAME
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
 PARTITIONS	TABLE_SCHEMA
@@ -104,28 +123,7 @@ TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES	GRANTEE
 USER_STATISTICS	USER
 VIEWS	TABLE_SCHEMA
-INNODB_BUFFER_POOL_PAGES	page_type
-PBXT_STATISTICS	ID
-INNODB_CMP	page_size
-INNODB_RSEG	rseg_id
-INNODB_INDEX_STATS	table_schema
-INNODB_BUFFER_POOL_PAGES_INDEX	index_id
 XTRADB_ADMIN_COMMAND	result_message
-INNODB_TRX	trx_id
-INNODB_SYS_TABLES	SCHEMA
-INNODB_LOCK_WAITS	requesting_trx_id
-INNODB_BUFFER_POOL_STATS	POOL_SIZE
-INNODB_LOCKS	lock_id
-INNODB_CMPMEM	page_size
-INNODB_TABLE_STATS	table_schema
-INNODB_SYS_INDEXES	TABLE_ID
-INNODB_CMP_RESET	page_size
-INNODB_BUFFER_POOL_PAGES_BLOB	space_id
-INNODB_CMPMEM_RESET	page_size
-INNODB_BUFFER_PAGE	BLOCK_ID
-INNODB_CHANGED_PAGES	space_id
-INNODB_SYS_STATS	INDEX_ID
-INNODB_BUFFER_PAGE_LRU	LRU_POSITION
 SELECT t.table_name, c1.column_name
 FROM information_schema.tables t
 INNER JOIN
@@ -153,6 +151,26 @@ FILES	TABLE_SCHEMA
 GLOBAL_STATUS	VARIABLE_NAME
 GLOBAL_VARIABLES	VARIABLE_NAME
 INDEX_STATISTICS	TABLE_SCHEMA
+INNODB_BUFFER_PAGE	BLOCK_ID
+INNODB_BUFFER_PAGE_LRU	LRU_POSITION
+INNODB_BUFFER_POOL_PAGES	page_type
+INNODB_BUFFER_POOL_PAGES_BLOB	space_id
+INNODB_BUFFER_POOL_PAGES_INDEX	index_id
+INNODB_BUFFER_POOL_STATS	POOL_SIZE
+INNODB_CHANGED_PAGES	space_id
+INNODB_CMP	page_size
+INNODB_CMPMEM	page_size
+INNODB_CMPMEM_RESET	page_size
+INNODB_CMP_RESET	page_size
+INNODB_INDEX_STATS	table_schema
+INNODB_LOCKS	lock_id
+INNODB_LOCK_WAITS	requesting_trx_id
+INNODB_RSEG	rseg_id
+INNODB_SYS_INDEXES	TABLE_ID
+INNODB_SYS_STATS	INDEX_ID
+INNODB_SYS_TABLES	SCHEMA
+INNODB_TABLE_STATS	table_schema
+INNODB_TRX	trx_id
 KEY_CACHES	KEY_CACHE_NAME
 KEY_COLUMN_USAGE	CONSTRAINT_SCHEMA
 PARTITIONS	TABLE_SCHEMA
@@ -174,28 +192,7 @@ TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES	GRANTEE
 USER_STATISTICS	USER
 VIEWS	TABLE_SCHEMA
-INNODB_BUFFER_POOL_PAGES	page_type
-PBXT_STATISTICS	ID
-INNODB_CMP	page_size
-INNODB_RSEG	rseg_id
-INNODB_INDEX_STATS	table_schema
-INNODB_BUFFER_POOL_PAGES_INDEX	index_id
 XTRADB_ADMIN_COMMAND	result_message
-INNODB_TRX	trx_id
-INNODB_SYS_TABLES	SCHEMA
-INNODB_LOCK_WAITS	requesting_trx_id
-INNODB_BUFFER_POOL_STATS	POOL_SIZE
-INNODB_LOCKS	lock_id
-INNODB_CMPMEM	page_size
-INNODB_TABLE_STATS	table_schema
-INNODB_SYS_INDEXES	TABLE_ID
-INNODB_CMP_RESET	page_size
-INNODB_BUFFER_POOL_PAGES_BLOB	space_id
-INNODB_CMPMEM_RESET	page_size
-INNODB_BUFFER_PAGE	BLOCK_ID
-INNODB_CHANGED_PAGES	space_id
-INNODB_SYS_STATS	INDEX_ID
-INNODB_BUFFER_PAGE_LRU	LRU_POSITION
 select 1 as f1 from information_schema.tables  where "CHARACTER_SETS"=
 (select cast(table_name as char)  from information_schema.tables
 order by table_name limit 1) limit 1;
@@ -252,7 +249,6 @@ INNODB_TRX	information_schema.INNODB_TRX	1
 KEY_CACHES	information_schema.KEY_CACHES	1
 KEY_COLUMN_USAGE	information_schema.KEY_COLUMN_USAGE	1
 PARTITIONS	information_schema.PARTITIONS	1
-PBXT_STATISTICS	information_schema.PBXT_STATISTICS	1
 PLUGINS	information_schema.PLUGINS	1
 PROCESSLIST	information_schema.PROCESSLIST	1
 PROFILING	information_schema.PROFILING	1
@@ -308,26 +304,25 @@ Database: information_schema
 | USER_PRIVILEGES                       |
 | USER_STATISTICS                       |
 | VIEWS                                 |
-| INNODB_BUFFER_POOL_PAGES              |
-| PBXT_STATISTICS                       |
-| INNODB_CMP                            |
-| INNODB_RSEG                           |
-| INNODB_INDEX_STATS                    |
 | INNODB_BUFFER_POOL_PAGES_INDEX        |
-| XTRADB_ADMIN_COMMAND                  |
+| INNODB_RSEG                           |
+| INNODB_CHANGED_PAGES                  |
+| INNODB_BUFFER_POOL_PAGES              |
+| INNODB_TABLE_STATS                    |
 | INNODB_TRX                            |
-| INNODB_SYS_TABLES                     |
+| XTRADB_ADMIN_COMMAND                  |
 | INNODB_LOCK_WAITS                     |
+| INNODB_SYS_TABLES                     |
+| INNODB_CMP                            |
 | INNODB_BUFFER_POOL_STATS              |
-| INNODB_LOCKS                          |
+| INNODB_CMP_RESET                      |
 | INNODB_CMPMEM                         |
-| INNODB_TABLE_STATS                    |
+| INNODB_INDEX_STATS                    |
 | INNODB_SYS_INDEXES                    |
-| INNODB_CMP_RESET                      |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
 | INNODB_CMPMEM_RESET                   |
+| INNODB_LOCKS                          |
 | INNODB_BUFFER_PAGE                    |
-| INNODB_CHANGED_PAGES                  |
 | INNODB_SYS_STATS                      |
 | INNODB_BUFFER_PAGE_LRU                |
 +---------------------------------------+
@@ -368,26 +363,25 @@ Database: INFORMATION_SCHEMA
 | USER_PRIVILEGES                       |
 | USER_STATISTICS                       |
 | VIEWS                                 |
-| INNODB_BUFFER_POOL_PAGES              |
-| PBXT_STATISTICS                       |
-| INNODB_CMP                            |
-| INNODB_RSEG                           |
-| INNODB_INDEX_STATS                    |
 | INNODB_BUFFER_POOL_PAGES_INDEX        |
-| XTRADB_ADMIN_COMMAND                  |
+| INNODB_RSEG                           |
+| INNODB_CHANGED_PAGES                  |
+| INNODB_BUFFER_POOL_PAGES              |
+| INNODB_TABLE_STATS                    |
 | INNODB_TRX                            |
-| INNODB_SYS_TABLES                     |
+| XTRADB_ADMIN_COMMAND                  |
 | INNODB_LOCK_WAITS                     |
+| INNODB_SYS_TABLES                     |
+| INNODB_CMP                            |
 | INNODB_BUFFER_POOL_STATS              |
-| INNODB_LOCKS                          |
+| INNODB_CMP_RESET                      |
 | INNODB_CMPMEM                         |
-| INNODB_TABLE_STATS                    |
+| INNODB_INDEX_STATS                    |
 | INNODB_SYS_INDEXES                    |
-| INNODB_CMP_RESET                      |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
 | INNODB_CMPMEM_RESET                   |
+| INNODB_LOCKS                          |
 | INNODB_BUFFER_PAGE                    |
-| INNODB_CHANGED_PAGES                  |
 | INNODB_SYS_STATS                      |
 | INNODB_BUFFER_PAGE_LRU                |
 +---------------------------------------+
@@ -399,5 +393,5 @@ Wildcard: inf_rmation_schema
 +--------------------+
 SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA;
 table_schema	count(*)
-information_schema	55
+information_schema	54
 mysql	22
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result
@@ -372,9 +372,6 @@ NULL	information_schema	PARTITIONS	TABLE_NAME	3		NO	varchar	64	192	NULL	NULL	utf
 NULL	information_schema	PARTITIONS	TABLE_ROWS	13	0	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(21) unsigned			select	
 NULL	information_schema	PARTITIONS	TABLE_SCHEMA	2		NO	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PARTITIONS	UPDATE_TIME	20	NULL	YES	datetime	NULL	NULL	NULL	NULL	NULL	NULL	datetime			select	
-NULL	information_schema	PBXT_STATISTICS	ID	1	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(4)			select	
-NULL	information_schema	PBXT_STATISTICS	Name	2		NO	varchar	40	120	NULL	NULL	utf8	utf8_general_ci	varchar(40)			select	
-NULL	information_schema	PBXT_STATISTICS	Value	3	0	NO	bigint	NULL	NULL	19	0	NULL	NULL	bigint(8)			select	
 NULL	information_schema	PLUGINS	PLUGIN_AUTHOR	8	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select	
 NULL	information_schema	PLUGINS	PLUGIN_AUTH_VERSION	12	NULL	YES	varchar	80	240	NULL	NULL	utf8	utf8_general_ci	varchar(80)			select	
 NULL	information_schema	PLUGINS	PLUGIN_DESCRIPTION	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select	
@@ -986,9 +983,6 @@ NULL	information_schema	PARTITIONS	CHECKSUM	bigint	NULL	NULL	NULL	NULL	bigint(21
 3.0000	information_schema	PARTITIONS	PARTITION_COMMENT	varchar	80	240	utf8	utf8_general_ci	varchar(80)
 3.0000	information_schema	PARTITIONS	NODEGROUP	varchar	12	36	utf8	utf8_general_ci	varchar(12)
 3.0000	information_schema	PARTITIONS	TABLESPACE_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
-NULL	information_schema	PBXT_STATISTICS	ID	int	NULL	NULL	NULL	NULL	int(4)
-3.0000	information_schema	PBXT_STATISTICS	Name	varchar	40	120	utf8	utf8_general_ci	varchar(40)
-NULL	information_schema	PBXT_STATISTICS	Value	bigint	NULL	NULL	NULL	NULL	bigint(8)
 3.0000	information_schema	PLUGINS	PLUGIN_NAME	varchar	64	192	utf8	utf8_general_ci	varchar(64)
 3.0000	information_schema	PLUGINS	PLUGIN_VERSION	varchar	20	60	utf8	utf8_general_ci	varchar(20)
 3.0000	information_schema	PLUGINS	PLUGIN_STATUS	varchar	10	30	utf8	utf8_general_ci	varchar(10)

--- a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
--- a/mysql-test/suite/funcs_1/t/is_columns_is.test
+++ b/mysql-test/suite/funcs_1/t/is_columns_is.test
@@ -16,8 +16,6 @@
 #

 --source include/not_embedded.inc
-# This test depends on having the PBXT information_schema stuff.
--source include/have_pbxt.inc
 --source include/have_innodb.inc
 --source include/have_xtradb.inc


--- a/mysql-test/t/information_schema_all_engines.test
+++ b/mysql-test/t/information_schema_all_engines.test
@@ -3,18 +3,19 @@
 # available (since these engines inject tables into INFORMATION_SCHEMA).

 --source include/not_embedded.inc
--source include/have_pbxt.inc
 --source include/have_innodb.inc
 --source include/not_staging.inc

 use INFORMATION_SCHEMA;
 --replace_result Tables_in_INFORMATION_SCHEMA Tables_in_information_schema
+--sorted_result
 show tables;

 #
 # Bug#18925: subqueries with MIN/MAX functions on INFORMATION_SCHEMA 
 #

+--sorted_result
 SELECT t.table_name, c1.column_name
  FROM information_schema.tables t
       INNER JOIN
@@ -29,6 +30,7 @@ SELECT t.table_name, c1.column_name
                  c2.table_name = t.table_name AND
                  c2.column_name LIKE '%SCHEMA%'
        );
+--sorted_result
 SELECT t.table_name, c1.column_name
  FROM information_schema.tables t
       INNER JOIN