Skip to content

M
mariadb
Commit ab2e237b authored by unknown's avatar unknown
Browse files
Options

merge test case adjustments from 5.2

parents 5a0e962a 67d0e7ef
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 323 additions and 144 deletions
mysql-test/r/information_schema_all_engines.result
View file @ ab2e237b
...@@ -13,9 +13,13 @@ FILES ...@@ -13,9 +13,13 @@ FILES
GLOBAL_STATUS GLOBAL_STATUS
GLOBAL_VARIABLES GLOBAL_VARIABLES
INDEX_STATISTICS INDEX_STATISTICS
INNODB_BUFFER_PAGE
INNODB_BUFFER_PAGE_LRU
INNODB_BUFFER_POOL_PAGES INNODB_BUFFER_POOL_PAGES
INNODB_BUFFER_POOL_PAGES_BLOB INNODB_BUFFER_POOL_PAGES_BLOB
INNODB_BUFFER_POOL_PAGES_INDEX INNODB_BUFFER_POOL_PAGES_INDEX
INNODB_BUFFER_POOL_STATS
INNODB_CHANGED_PAGES
INNODB_CMP INNODB_CMP
INNODB_CMPMEM INNODB_CMPMEM
INNODB_CMPMEM_RESET INNODB_CMPMEM_RESET
...@@ -32,7 +36,6 @@ INNODB_TRX ...@@ -32,7 +36,6 @@ INNODB_TRX
KEY_CACHES KEY_CACHES
KEY_COLUMN_USAGE KEY_COLUMN_USAGE
PARTITIONS PARTITIONS
PBXT_STATISTICS
PLUGINS PLUGINS
PROCESSLIST PROCESSLIST
PROFILING PROFILING
...@@ -51,28 +54,7 @@ TRIGGERS ...@@ -51,28 +54,7 @@ TRIGGERS
USER_PRIVILEGES USER_PRIVILEGES
USER_STATISTICS USER_STATISTICS
VIEWS VIEWS
INNODB_BUFFER_POOL_PAGES
PBXT_STATISTICS
INNODB_CMP
INNODB_RSEG
INNODB_INDEX_STATS
INNODB_BUFFER_POOL_PAGES_INDEX
XTRADB_ADMIN_COMMAND 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 SELECT t.table_name, c1.column_name
FROM information_schema.tables t FROM information_schema.tables t
INNER JOIN INNER JOIN
...@@ -100,9 +82,13 @@ FILES TABLE_SCHEMA ...@@ -100,9 +82,13 @@ FILES TABLE_SCHEMA
GLOBAL_STATUS VARIABLE_NAME GLOBAL_STATUS VARIABLE_NAME
GLOBAL_VARIABLES VARIABLE_NAME GLOBAL_VARIABLES VARIABLE_NAME
INDEX_STATISTICS TABLE_SCHEMA 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 page_type
INNODB_BUFFER_POOL_PAGES_BLOB space_id INNODB_BUFFER_POOL_PAGES_BLOB space_id
INNODB_BUFFER_POOL_PAGES_INDEX index_id INNODB_BUFFER_POOL_PAGES_INDEX index_id
INNODB_BUFFER_POOL_STATS POOL_SIZE
INNODB_CHANGED_PAGES space_id
INNODB_CMP page_size INNODB_CMP page_size
INNODB_CMPMEM page_size INNODB_CMPMEM page_size
INNODB_CMPMEM_RESET page_size INNODB_CMPMEM_RESET page_size
...@@ -119,7 +105,6 @@ INNODB_TRX trx_id ...@@ -119,7 +105,6 @@ INNODB_TRX trx_id
KEY_CACHES KEY_CACHE_NAME KEY_CACHES KEY_CACHE_NAME
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
PARTITIONS TABLE_SCHEMA PARTITIONS TABLE_SCHEMA
PBXT_STATISTICS ID
PLUGINS PLUGIN_NAME PLUGINS PLUGIN_NAME
PROCESSLIST ID PROCESSLIST ID
PROFILING QUERY_ID PROFILING QUERY_ID
...@@ -138,28 +123,7 @@ TRIGGERS TRIGGER_SCHEMA ...@@ -138,28 +123,7 @@ TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE USER_PRIVILEGES GRANTEE
USER_STATISTICS USER USER_STATISTICS USER
VIEWS TABLE_SCHEMA 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 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 SELECT t.table_name, c1.column_name
FROM information_schema.tables t FROM information_schema.tables t
INNER JOIN INNER JOIN
...@@ -187,9 +151,13 @@ FILES TABLE_SCHEMA ...@@ -187,9 +151,13 @@ FILES TABLE_SCHEMA
GLOBAL_STATUS VARIABLE_NAME GLOBAL_STATUS VARIABLE_NAME
GLOBAL_VARIABLES VARIABLE_NAME GLOBAL_VARIABLES VARIABLE_NAME
INDEX_STATISTICS TABLE_SCHEMA 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 page_type
INNODB_BUFFER_POOL_PAGES_BLOB space_id INNODB_BUFFER_POOL_PAGES_BLOB space_id
INNODB_BUFFER_POOL_PAGES_INDEX index_id INNODB_BUFFER_POOL_PAGES_INDEX index_id
INNODB_BUFFER_POOL_STATS POOL_SIZE
INNODB_CHANGED_PAGES space_id
INNODB_CMP page_size INNODB_CMP page_size
INNODB_CMPMEM page_size INNODB_CMPMEM page_size
INNODB_CMPMEM_RESET page_size INNODB_CMPMEM_RESET page_size
...@@ -206,7 +174,6 @@ INNODB_TRX trx_id ...@@ -206,7 +174,6 @@ INNODB_TRX trx_id
KEY_CACHES KEY_CACHE_NAME KEY_CACHES KEY_CACHE_NAME
KEY_COLUMN_USAGE CONSTRAINT_SCHEMA KEY_COLUMN_USAGE CONSTRAINT_SCHEMA
PARTITIONS TABLE_SCHEMA PARTITIONS TABLE_SCHEMA
PBXT_STATISTICS ID
PLUGINS PLUGIN_NAME PLUGINS PLUGIN_NAME
PROCESSLIST ID PROCESSLIST ID
PROFILING QUERY_ID PROFILING QUERY_ID
...@@ -225,28 +192,7 @@ TRIGGERS TRIGGER_SCHEMA ...@@ -225,28 +192,7 @@ TRIGGERS TRIGGER_SCHEMA
USER_PRIVILEGES GRANTEE USER_PRIVILEGES GRANTEE
USER_STATISTICS USER USER_STATISTICS USER
VIEWS TABLE_SCHEMA 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 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 1 as f1 from information_schema.tables where "CHARACTER_SETS"=
(select cast(table_name as char) from information_schema.tables (select cast(table_name as char) from information_schema.tables
order by table_name limit 1) limit 1; order by table_name limit 1) limit 1;
...@@ -303,7 +249,6 @@ INNODB_TRX information_schema.INNODB_TRX 1 ...@@ -303,7 +249,6 @@ INNODB_TRX information_schema.INNODB_TRX 1
KEY_CACHES information_schema.KEY_CACHES 1 KEY_CACHES information_schema.KEY_CACHES 1
KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1 KEY_COLUMN_USAGE information_schema.KEY_COLUMN_USAGE 1
PARTITIONS information_schema.PARTITIONS 1 PARTITIONS information_schema.PARTITIONS 1
PBXT_STATISTICS information_schema.PBXT_STATISTICS 1
PLUGINS information_schema.PLUGINS 1 PLUGINS information_schema.PLUGINS 1
PROCESSLIST information_schema.PROCESSLIST 1 PROCESSLIST information_schema.PROCESSLIST 1
PROFILING information_schema.PROFILING 1 PROFILING information_schema.PROFILING 1
...@@ -322,6 +267,9 @@ TRIGGERS information_schema.TRIGGERS 1 ...@@ -322,6 +267,9 @@ TRIGGERS information_schema.TRIGGERS 1
USER_PRIVILEGES information_schema.USER_PRIVILEGES 1 USER_PRIVILEGES information_schema.USER_PRIVILEGES 1
USER_STATISTICS information_schema.USER_STATISTICS 1 USER_STATISTICS information_schema.USER_STATISTICS 1
VIEWS information_schema.VIEWS 1 VIEWS information_schema.VIEWS 1
+---------------------------------------+
+---------------------------------------+
+---------------------------------------+
Database: information_schema Database: information_schema
| Tables | | Tables |
| CHARACTER_SETS | | CHARACTER_SETS |
...@@ -336,9 +284,13 @@ Database: information_schema ...@@ -336,9 +284,13 @@ Database: information_schema
| GLOBAL_STATUS | | GLOBAL_STATUS |
| GLOBAL_VARIABLES | | GLOBAL_VARIABLES |
| INDEX_STATISTICS | | INDEX_STATISTICS |
| INNODB_BUFFER_PAGE |
| INNODB_BUFFER_PAGE_LRU |
| INNODB_BUFFER_POOL_PAGES | | INNODB_BUFFER_POOL_PAGES |
| INNODB_BUFFER_POOL_PAGES_BLOB | | INNODB_BUFFER_POOL_PAGES_BLOB |
| INNODB_BUFFER_POOL_PAGES_INDEX | | INNODB_BUFFER_POOL_PAGES_INDEX |
| INNODB_BUFFER_POOL_STATS |
| INNODB_CHANGED_PAGES |
| INNODB_CMP | | INNODB_CMP |
| INNODB_CMPMEM | | INNODB_CMPMEM |
| INNODB_CMPMEM_RESET | | INNODB_CMPMEM_RESET |
...@@ -355,7 +307,6 @@ Database: information_schema ...@@ -355,7 +307,6 @@ Database: information_schema
| KEY_CACHES | | KEY_CACHES |
| KEY_COLUMN_USAGE | | KEY_COLUMN_USAGE |
| PARTITIONS | | PARTITIONS |
| PBXT_STATISTICS |
| PLUGINS | | PLUGINS |
| PROCESSLIST | | PROCESSLIST |
| PROFILING | | PROFILING |
...@@ -374,28 +325,9 @@ Database: information_schema ...@@ -374,28 +325,9 @@ Database: information_schema
| USER_PRIVILEGES | | USER_PRIVILEGES |
| USER_STATISTICS | | USER_STATISTICS |
| VIEWS | | VIEWS |
| INNODB_BUFFER_POOL_PAGES |
| PBXT_STATISTICS |
| INNODB_CMP |
| INNODB_RSEG |
| INNODB_INDEX_STATS |
| INNODB_BUFFER_POOL_PAGES_INDEX |
| XTRADB_ADMIN_COMMAND | | 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 |
+---------------------------------------+ +---------------------------------------+
Database: INFORMATION_SCHEMA Database: INFORMATION_SCHEMA
| Tables | | Tables |
...@@ -411,9 +343,13 @@ Database: INFORMATION_SCHEMA ...@@ -411,9 +343,13 @@ Database: INFORMATION_SCHEMA
| GLOBAL_STATUS | | GLOBAL_STATUS |
| GLOBAL_VARIABLES | | GLOBAL_VARIABLES |
| INDEX_STATISTICS | | INDEX_STATISTICS |
| INNODB_BUFFER_PAGE |
| INNODB_BUFFER_PAGE_LRU |
| INNODB_BUFFER_POOL_PAGES | | INNODB_BUFFER_POOL_PAGES |
| INNODB_BUFFER_POOL_PAGES_BLOB | | INNODB_BUFFER_POOL_PAGES_BLOB |
| INNODB_BUFFER_POOL_PAGES_INDEX | | INNODB_BUFFER_POOL_PAGES_INDEX |
| INNODB_BUFFER_POOL_STATS |
| INNODB_CHANGED_PAGES |
| INNODB_CMP | | INNODB_CMP |
| INNODB_CMPMEM | | INNODB_CMPMEM |
| INNODB_CMPMEM_RESET | | INNODB_CMPMEM_RESET |
...@@ -430,7 +366,6 @@ Database: INFORMATION_SCHEMA ...@@ -430,7 +366,6 @@ Database: INFORMATION_SCHEMA
| KEY_CACHES | | KEY_CACHES |
| KEY_COLUMN_USAGE | | KEY_COLUMN_USAGE |
| PARTITIONS | | PARTITIONS |
| PBXT_STATISTICS |
| PLUGINS | | PLUGINS |
| PROCESSLIST | | PROCESSLIST |
| PROFILING | | PROFILING |
...@@ -449,33 +384,14 @@ Database: INFORMATION_SCHEMA ...@@ -449,33 +384,14 @@ Database: INFORMATION_SCHEMA
| USER_PRIVILEGES | | USER_PRIVILEGES |
| USER_STATISTICS | | USER_STATISTICS |
| VIEWS | | VIEWS |
| INNODB_BUFFER_POOL_PAGES |
| PBXT_STATISTICS |
| INNODB_CMP |
| INNODB_RSEG |
| INNODB_INDEX_STATS |
| INNODB_BUFFER_POOL_PAGES_INDEX |
| XTRADB_ADMIN_COMMAND | | 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 |
+---------------------------------------+
Wildcard: inf_rmation_schema Wildcard: inf_rmation_schema
| Databases | | Databases |
| information_schema | | information_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; 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(*) table_schema count(*)
information_schema 50 information_schema 54
mysql 22 mysql 22
mysql-test/suite/funcs_1/t/is_columns_is.test
View file @ ab2e237b
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
# #
--source include/not_embedded.inc --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_innodb.inc
--source include/have_xtradb.inc --source include/have_xtradb.inc
......
mysql-test/t/information_schema_all_engines.test
View file @ ab2e237b
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
# available (since these engines inject tables into INFORMATION_SCHEMA). # available (since these engines inject tables into INFORMATION_SCHEMA).
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_pbxt.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/not_staging.inc --source include/not_staging.inc
...@@ -16,6 +15,7 @@ show tables; ...@@ -16,6 +15,7 @@ show tables;
# Bug#18925: subqueries with MIN/MAX functions on INFORMATION_SCHEMA # Bug#18925: subqueries with MIN/MAX functions on INFORMATION_SCHEMA
# #
--sorted_result
SELECT t.table_name, c1.column_name SELECT t.table_name, c1.column_name
FROM information_schema.tables t FROM information_schema.tables t
INNER JOIN INNER JOIN
...@@ -30,6 +30,7 @@ SELECT t.table_name, c1.column_name ...@@ -30,6 +30,7 @@ SELECT t.table_name, c1.column_name
c2.table_name = t.table_name AND c2.table_name = t.table_name AND
c2.column_name LIKE '%SCHEMA%' c2.column_name LIKE '%SCHEMA%'
) order by t.table_name; ) order by t.table_name;
--sorted_result
SELECT t.table_name, c1.column_name SELECT t.table_name, c1.column_name
FROM information_schema.tables t FROM information_schema.tables t
INNER JOIN INNER JOIN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7