Skip to content

Commit 67d0e7e

Browse files
author
unknown
committed
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".
1 parent bf66185 commit 67d0e7e

File tree

5 files changed

+444
-248
lines changed

5 files changed

+444
-248
lines changed

‎mysql-test/r/information_schema_all_engines.result

Lines changed: 81 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,26 @@ FILES
1313
GLOBAL_STATUS
1414
GLOBAL_VARIABLES
1515
INDEX_STATISTICS
16+
INNODB_BUFFER_PAGE
17+
INNODB_BUFFER_PAGE_LRU
18+
INNODB_BUFFER_POOL_PAGES
19+
INNODB_BUFFER_POOL_PAGES_BLOB
20+
INNODB_BUFFER_POOL_PAGES_INDEX
21+
INNODB_BUFFER_POOL_STATS
22+
INNODB_CHANGED_PAGES
23+
INNODB_CMP
24+
INNODB_CMPMEM
25+
INNODB_CMPMEM_RESET
26+
INNODB_CMP_RESET
27+
INNODB_INDEX_STATS
28+
INNODB_LOCKS
29+
INNODB_LOCK_WAITS
30+
INNODB_RSEG
31+
INNODB_SYS_INDEXES
32+
INNODB_SYS_STATS
33+
INNODB_SYS_TABLES
34+
INNODB_TABLE_STATS
35+
INNODB_TRX
1636
KEY_CACHES
1737
KEY_COLUMN_USAGE
1838
PARTITIONS
@@ -34,28 +54,7 @@ TRIGGERS
3454
USER_PRIVILEGES
3555
USER_STATISTICS
3656
VIEWS
37-
INNODB_BUFFER_POOL_PAGES
38-
PBXT_STATISTICS
39-
INNODB_CMP
40-
INNODB_RSEG
41-
INNODB_INDEX_STATS
42-
INNODB_BUFFER_POOL_PAGES_INDEX
4357
XTRADB_ADMIN_COMMAND
44-
INNODB_TRX
45-
INNODB_SYS_TABLES
46-
INNODB_LOCK_WAITS
47-
INNODB_BUFFER_POOL_STATS
48-
INNODB_LOCKS
49-
INNODB_CMPMEM
50-
INNODB_TABLE_STATS
51-
INNODB_SYS_INDEXES
52-
INNODB_CMP_RESET
53-
INNODB_BUFFER_POOL_PAGES_BLOB
54-
INNODB_CMPMEM_RESET
55-
INNODB_BUFFER_PAGE
56-
INNODB_CHANGED_PAGES
57-
INNODB_SYS_STATS
58-
INNODB_BUFFER_PAGE_LRU
5958
SELECT t.table_name, c1.column_name
6059
FROM information_schema.tables t
6160
INNER JOIN
@@ -83,6 +82,26 @@ FILES TABLE_SCHEMA
8382
GLOBAL_STATUS VARIABLE_NAME
8483
GLOBAL_VARIABLES VARIABLE_NAME
8584
INDEX_STATISTICS TABLE_SCHEMA
85+
INNODB_BUFFER_PAGE BLOCK_ID
86+
INNODB_BUFFER_PAGE_LRU LRU_POSITION
87+
INNODB_BUFFER_POOL_PAGES page_type
88+
INNODB_BUFFER_POOL_PAGES_BLOB space_id
89+
INNODB_BUFFER_POOL_PAGES_INDEX index_id
90+
INNODB_BUFFER_POOL_STATS POOL_SIZE
91+
INNODB_CHANGED_PAGES space_id
92+
INNODB_CMP page_size
93+
INNODB_CMPMEM page_size
94+
INNODB_CMPMEM_RESET page_size
95+
INNODB_CMP_RESET page_size
96+
INNODB_INDEX_STATS table_schema
97+
INNODB_LOCKS lock_id
98+
INNODB_LOCK_WAITS requesting_trx_id
99+
INNODB_RSEG rseg_id
100+
INNODB_SYS_INDEXES TABLE_ID
101+
INNODB_SYS_STATS INDEX_ID
102+
INNODB_SYS_TABLES SCHEMA
103+
INNODB_TABLE_STATS table_schema
104+
INNODB_TRX trx_id
86105
KEY_CACHES KEY_CACHE_NAME
87106
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
88107
PARTITIONS TABLE_SCHEMA
@@ -104,28 +123,7 @@ TRIGGERS TRIGGER_SCHEMA
104123
USER_PRIVILEGES GRANTEE
105124
USER_STATISTICS USER
106125
VIEWS TABLE_SCHEMA
107-
INNODB_BUFFER_POOL_PAGES page_type
108-
PBXT_STATISTICS ID
109-
INNODB_CMP page_size
110-
INNODB_RSEG rseg_id
111-
INNODB_INDEX_STATS table_schema
112-
INNODB_BUFFER_POOL_PAGES_INDEX index_id
113126
XTRADB_ADMIN_COMMAND result_message
114-
INNODB_TRX trx_id
115-
INNODB_SYS_TABLES SCHEMA
116-
INNODB_LOCK_WAITS requesting_trx_id
117-
INNODB_BUFFER_POOL_STATS POOL_SIZE
118-
INNODB_LOCKS lock_id
119-
INNODB_CMPMEM page_size
120-
INNODB_TABLE_STATS table_schema
121-
INNODB_SYS_INDEXES TABLE_ID
122-
INNODB_CMP_RESET page_size
123-
INNODB_BUFFER_POOL_PAGES_BLOB space_id
124-
INNODB_CMPMEM_RESET page_size
125-
INNODB_BUFFER_PAGE BLOCK_ID
126-
INNODB_CHANGED_PAGES space_id
127-
INNODB_SYS_STATS INDEX_ID
128-
INNODB_BUFFER_PAGE_LRU LRU_POSITION
129127
SELECT t.table_name, c1.column_name
130128
FROM information_schema.tables t
131129
INNER JOIN
@@ -153,6 +151,26 @@ FILES TABLE_SCHEMA
153151
GLOBAL_STATUS VARIABLE_NAME
154152
GLOBAL_VARIABLES VARIABLE_NAME
155153
INDEX_STATISTICS TABLE_SCHEMA
154+
INNODB_BUFFER_PAGE BLOCK_ID
155+
INNODB_BUFFER_PAGE_LRU LRU_POSITION
156+
INNODB_BUFFER_POOL_PAGES page_type
157+
INNODB_BUFFER_POOL_PAGES_BLOB space_id
158+
INNODB_BUFFER_POOL_PAGES_INDEX index_id
159+
INNODB_BUFFER_POOL_STATS POOL_SIZE
160+
INNODB_CHANGED_PAGES space_id
161+
INNODB_CMP page_size
162+
INNODB_CMPMEM page_size
163+
INNODB_CMPMEM_RESET page_size
164+
INNODB_CMP_RESET page_size
165+
INNODB_INDEX_STATS table_schema
166+
INNODB_LOCKS lock_id
167+
INNODB_LOCK_WAITS requesting_trx_id
168+
INNODB_RSEG rseg_id
169+
INNODB_SYS_INDEXES TABLE_ID
170+
INNODB_SYS_STATS INDEX_ID
171+
INNODB_SYS_TABLES SCHEMA
172+
INNODB_TABLE_STATS table_schema
173+
INNODB_TRX trx_id
156174
KEY_CACHES KEY_CACHE_NAME
157175
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
158176
PARTITIONS TABLE_SCHEMA
@@ -174,28 +192,7 @@ TRIGGERS TRIGGER_SCHEMA
174192
USER_PRIVILEGES GRANTEE
175193
USER_STATISTICS USER
176194
VIEWS TABLE_SCHEMA
177-
INNODB_BUFFER_POOL_PAGES page_type
178-
PBXT_STATISTICS ID
179-
INNODB_CMP page_size
180-
INNODB_RSEG rseg_id
181-
INNODB_INDEX_STATS table_schema
182-
INNODB_BUFFER_POOL_PAGES_INDEX index_id
183195
XTRADB_ADMIN_COMMAND result_message
184-
INNODB_TRX trx_id
185-
INNODB_SYS_TABLES SCHEMA
186-
INNODB_LOCK_WAITS requesting_trx_id
187-
INNODB_BUFFER_POOL_STATS POOL_SIZE
188-
INNODB_LOCKS lock_id
189-
INNODB_CMPMEM page_size
190-
INNODB_TABLE_STATS table_schema
191-
INNODB_SYS_INDEXES TABLE_ID
192-
INNODB_CMP_RESET page_size
193-
INNODB_BUFFER_POOL_PAGES_BLOB space_id
194-
INNODB_CMPMEM_RESET page_size
195-
INNODB_BUFFER_PAGE BLOCK_ID
196-
INNODB_CHANGED_PAGES space_id
197-
INNODB_SYS_STATS INDEX_ID
198-
INNODB_BUFFER_PAGE_LRU LRU_POSITION
199196
select 1 as f1 from information_schema.tables where "CHARACTER_SETS"=
200197
(select cast(table_name as char) from information_schema.tables
201198
order by table_name limit 1) limit 1;
@@ -252,7 +249,6 @@ INNODB_TRX information_schema.INNODB_TRX 1
252249
KEY_CACHES information_schema.KEY_CACHES 1
253250
KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1
254251
PARTITIONS information_schema.PARTITIONS 1
255-
PBXT_STATISTICS information_schema.PBXT_STATISTICS 1
256252
PLUGINS information_schema.PLUGINS 1
257253
PROCESSLIST information_schema.PROCESSLIST 1
258254
PROFILING information_schema.PROFILING 1
@@ -308,26 +304,25 @@ Database: information_schema
308304
| USER_PRIVILEGES |
309305
| USER_STATISTICS |
310306
| VIEWS |
311-
| INNODB_BUFFER_POOL_PAGES |
312-
| PBXT_STATISTICS |
313-
| INNODB_CMP |
314-
| INNODB_RSEG |
315-
| INNODB_INDEX_STATS |
316307
| INNODB_BUFFER_POOL_PAGES_INDEX |
317-
| XTRADB_ADMIN_COMMAND |
308+
| INNODB_RSEG |
309+
| INNODB_CHANGED_PAGES |
310+
| INNODB_BUFFER_POOL_PAGES |
311+
| INNODB_TABLE_STATS |
318312
| INNODB_TRX |
319-
| INNODB_SYS_TABLES |
313+
| XTRADB_ADMIN_COMMAND |
320314
| INNODB_LOCK_WAITS |
315+
| INNODB_SYS_TABLES |
316+
| INNODB_CMP |
321317
| INNODB_BUFFER_POOL_STATS |
322-
| INNODB_LOCKS |
318+
| INNODB_CMP_RESET |
323319
| INNODB_CMPMEM |
324-
| INNODB_TABLE_STATS |
320+
| INNODB_INDEX_STATS |
325321
| INNODB_SYS_INDEXES |
326-
| INNODB_CMP_RESET |
327322
| INNODB_BUFFER_POOL_PAGES_BLOB |
328323
| INNODB_CMPMEM_RESET |
324+
| INNODB_LOCKS |
329325
| INNODB_BUFFER_PAGE |
330-
| INNODB_CHANGED_PAGES |
331326
| INNODB_SYS_STATS |
332327
| INNODB_BUFFER_PAGE_LRU |
333328
+---------------------------------------+
@@ -368,26 +363,25 @@ Database: INFORMATION_SCHEMA
368363
| USER_PRIVILEGES |
369364
| USER_STATISTICS |
370365
| VIEWS |
371-
| INNODB_BUFFER_POOL_PAGES |
372-
| PBXT_STATISTICS |
373-
| INNODB_CMP |
374-
| INNODB_RSEG |
375-
| INNODB_INDEX_STATS |
376366
| INNODB_BUFFER_POOL_PAGES_INDEX |
377-
| XTRADB_ADMIN_COMMAND |
367+
| INNODB_RSEG |
368+
| INNODB_CHANGED_PAGES |
369+
| INNODB_BUFFER_POOL_PAGES |
370+
| INNODB_TABLE_STATS |
378371
| INNODB_TRX |
379-
| INNODB_SYS_TABLES |
372+
| XTRADB_ADMIN_COMMAND |
380373
| INNODB_LOCK_WAITS |
374+
| INNODB_SYS_TABLES |
375+
| INNODB_CMP |
381376
| INNODB_BUFFER_POOL_STATS |
382-
| INNODB_LOCKS |
377+
| INNODB_CMP_RESET |
383378
| INNODB_CMPMEM |
384-
| INNODB_TABLE_STATS |
379+
| INNODB_INDEX_STATS |
385380
| INNODB_SYS_INDEXES |
386-
| INNODB_CMP_RESET |
387381
| INNODB_BUFFER_POOL_PAGES_BLOB |
388382
| INNODB_CMPMEM_RESET |
383+
| INNODB_LOCKS |
389384
| INNODB_BUFFER_PAGE |
390-
| INNODB_CHANGED_PAGES |
391385
| INNODB_SYS_STATS |
392386
| INNODB_BUFFER_PAGE_LRU |
393387
+---------------------------------------+
@@ -399,5 +393,5 @@ Wildcard: inf_rmation_schema
399393
+--------------------+
400394
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;
401395
table_schema count(*)
402-
information_schema 55
396+
information_schema 54
403397
mysql 22

‎mysql-test/suite/funcs_1/r/is_columns_is.result

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,6 @@ NULL information_schema PARTITIONS TABLE_NAME 3 NO varchar 64 192 NULL NULL utf
372372
NULL information_schema PARTITIONS TABLE_ROWS 13 0 NO bigint NULL NULL 20 0 NULL NULL bigint(21) unsigned select
373373
NULL information_schema PARTITIONS TABLE_SCHEMA 2 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select
374374
NULL information_schema PARTITIONS UPDATE_TIME 20 NULL YES datetime NULL NULL NULL NULL NULL NULL datetime select
375-
NULL information_schema PBXT_STATISTICS ID 1 0 NO int NULL NULL 10 0 NULL NULL int(4) select
376-
NULL information_schema PBXT_STATISTICS Name 2 NO varchar 40 120 NULL NULL utf8 utf8_general_ci varchar(40) select
377-
NULL information_schema PBXT_STATISTICS Value 3 0 NO bigint NULL NULL 19 0 NULL NULL bigint(8) select
378375
NULL information_schema PLUGINS PLUGIN_AUTHOR 8 NULL YES varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select
379376
NULL information_schema PLUGINS PLUGIN_AUTH_VERSION 12 NULL YES varchar 80 240 NULL NULL utf8 utf8_general_ci varchar(80) select
380377
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
986983
3.0000 information_schema PARTITIONS PARTITION_COMMENT varchar 80 240 utf8 utf8_general_ci varchar(80)
987984
3.0000 information_schema PARTITIONS NODEGROUP varchar 12 36 utf8 utf8_general_ci varchar(12)
988985
3.0000 information_schema PARTITIONS TABLESPACE_NAME varchar 64 192 utf8 utf8_general_ci varchar(64)
989-
NULL information_schema PBXT_STATISTICS ID int NULL NULL NULL NULL int(4)
990-
3.0000 information_schema PBXT_STATISTICS Name varchar 40 120 utf8 utf8_general_ci varchar(40)
991-
NULL information_schema PBXT_STATISTICS Value bigint NULL NULL NULL NULL bigint(8)
992986
3.0000 information_schema PLUGINS PLUGIN_NAME varchar 64 192 utf8 utf8_general_ci varchar(64)
993987
3.0000 information_schema PLUGINS PLUGIN_VERSION varchar 20 60 utf8 utf8_general_ci varchar(20)
994988
3.0000 information_schema PLUGINS PLUGIN_STATUS varchar 10 30 utf8 utf8_general_ci varchar(10)

0 commit comments

Comments
 (0)