diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-16 20:16:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-16 20:16:35 +0100 |
| commit | 38e3ae155db08ab2e9e5c267f05f89bec0542b33 (patch) | |
| tree | 7289bbef1ba3f495aa5c7cdb7d0a3f993a5bbc80 /mysql-test/suite/pbxt | |
| parent | c56483d972d023105fbcb0f47af0042ee092657c (diff) | |
| parent | ed1ba992c1d3c3ecbe6a2769c51ceb5d27606d3b (diff) | |
| download | mariadb-git-38e3ae155db08ab2e9e5c267f05f89bec0542b33.tar.gz | |
mysql-5.5 merge
Diffstat (limited to 'mysql-test/suite/pbxt')
| -rw-r--r-- | mysql-test/suite/pbxt/r/group_by.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/pbxt/r/mysqlshow.result | 98 |
2 files changed, 51 insertions, 51 deletions
diff --git a/mysql-test/suite/pbxt/r/group_by.result b/mysql-test/suite/pbxt/r/group_by.result index 034a95ecc71..e41c86e45e0 100644 --- a/mysql-test/suite/pbxt/r/group_by.result +++ b/mysql-test/suite/pbxt/r/group_by.result @@ -1176,7 +1176,7 @@ EXPLAIN SELECT 1 FROM t1 WHERE a IN id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 index PRIMARY,i2 PRIMARY 4 NULL 144 Using index 1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1 -2 SUBQUERY t1 ALL NULL NULL NULL NULL 144 +2 MATERIALIZED t1 ALL NULL NULL NULL NULL 144 CREATE TABLE t2 (a INT, b INT, KEY(a)); INSERT INTO t2 VALUES (1, 1), (2, 2), (3,3), (4,4); EXPLAIN SELECT a, SUM(b) FROM t2 GROUP BY a LIMIT 2; @@ -1190,5 +1190,5 @@ EXPLAIN SELECT 1 FROM t2 WHERE a IN id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t2 index a a 5 NULL 4 Using index 1 PRIMARY <subquery2> eq_ref distinct_key distinct_key 4 func 1 -2 SUBQUERY t1 ALL NULL NULL NULL NULL 144 +2 MATERIALIZED t1 ALL NULL NULL NULL NULL 144 DROP TABLE t1, t2; diff --git a/mysql-test/suite/pbxt/r/mysqlshow.result b/mysql-test/suite/pbxt/r/mysqlshow.result index a8bd5904600..b544b4d236b 100644 --- a/mysql-test/suite/pbxt/r/mysqlshow.result +++ b/mysql-test/suite/pbxt/r/mysqlshow.result @@ -75,10 +75,11 @@ Database: test 2 rows in set. DROP TABLE t1, t2; -Database: information_schema +---------------------------------------+ -| Tables | +---------------------------------------+ ++---------------------------------------+ +Database: information_schema +| Tables | | CHARACTER_SETS | | CLIENT_STATISTICS | | COLLATIONS | @@ -91,10 +92,32 @@ Database: information_schema | GLOBAL_STATUS | | GLOBAL_VARIABLES | | INDEX_STATISTICS | +| INNODB_BUFFER_POOL_PAGES | +| INNODB_BUFFER_POOL_PAGES_BLOB | +| INNODB_BUFFER_POOL_PAGES_INDEX | +| INNODB_CMP | +| INNODB_CMPMEM | +| INNODB_CMPMEM_RESET | +| INNODB_CMP_RESET | +| INNODB_INDEX_STATS | +| INNODB_LOCKS | +| INNODB_LOCK_WAITS | +| INNODB_RSEG | +| INNODB_SYS_COLUMNS | +| INNODB_SYS_FIELDS | +| INNODB_SYS_FOREIGN | +| INNODB_SYS_FOREIGN_COLS | +| INNODB_SYS_INDEXES | +| INNODB_SYS_STATS | +| INNODB_SYS_TABLES | +| INNODB_SYS_TABLESTATS | +| INNODB_TABLE_STATS | +| INNODB_TRX | | KEY_CACHES | | KEY_COLUMN_USAGE | | PARAMETERS | | PARTITIONS | +| PBXT_STATISTICS | | PLUGINS | | PROCESSLIST | | PROFILING | @@ -114,34 +137,12 @@ Database: information_schema | USER_PRIVILEGES | | USER_STATISTICS | | VIEWS | -| INNODB_CMPMEM_RESET | -| PBXT_STATISTICS | -| INNODB_CMPMEM | -| INNODB_RSEG | -| INNODB_SYS_TABLESTATS | -| INNODB_LOCK_WAITS | -| INNODB_INDEX_STATS | -| INNODB_CMP | -| INNODB_SYS_FOREIGN_COLS | -| INNODB_CMP_RESET | -| INNODB_BUFFER_POOL_PAGES | -| INNODB_TRX | -| INNODB_BUFFER_POOL_PAGES_INDEX | -| INNODB_LOCKS | -| INNODB_BUFFER_POOL_PAGES_BLOB | -| INNODB_SYS_TABLES | -| INNODB_SYS_FIELDS | -| INNODB_SYS_COLUMNS | -| INNODB_SYS_STATS | -| INNODB_SYS_FOREIGN | -| INNODB_SYS_INDEXES | | XTRADB_ADMIN_COMMAND | -| INNODB_TABLE_STATS | +---------------------------------------+ -Database: INFORMATION_SCHEMA +---------------------------------------+ -| Tables | +---------------------------------------+ +Database: INFORMATION_SCHEMA +| Tables | | CHARACTER_SETS | | CLIENT_STATISTICS | | COLLATIONS | @@ -154,10 +155,32 @@ Database: INFORMATION_SCHEMA | GLOBAL_STATUS | | GLOBAL_VARIABLES | | INDEX_STATISTICS | +| INNODB_BUFFER_POOL_PAGES | +| INNODB_BUFFER_POOL_PAGES_BLOB | +| INNODB_BUFFER_POOL_PAGES_INDEX | +| INNODB_CMP | +| INNODB_CMPMEM | +| INNODB_CMPMEM_RESET | +| INNODB_CMP_RESET | +| INNODB_INDEX_STATS | +| INNODB_LOCKS | +| INNODB_LOCK_WAITS | +| INNODB_RSEG | +| INNODB_SYS_COLUMNS | +| INNODB_SYS_FIELDS | +| INNODB_SYS_FOREIGN | +| INNODB_SYS_FOREIGN_COLS | +| INNODB_SYS_INDEXES | +| INNODB_SYS_STATS | +| INNODB_SYS_TABLES | +| INNODB_SYS_TABLESTATS | +| INNODB_TABLE_STATS | +| INNODB_TRX | | KEY_CACHES | | KEY_COLUMN_USAGE | | PARAMETERS | | PARTITIONS | +| PBXT_STATISTICS | | PLUGINS | | PROCESSLIST | | PROFILING | @@ -177,30 +200,7 @@ Database: INFORMATION_SCHEMA | USER_PRIVILEGES | | USER_STATISTICS | | VIEWS | -| INNODB_CMPMEM_RESET | -| PBXT_STATISTICS | -| INNODB_CMPMEM | -| INNODB_RSEG | -| INNODB_SYS_TABLESTATS | -| INNODB_LOCK_WAITS | -| INNODB_INDEX_STATS | -| INNODB_CMP | -| INNODB_SYS_FOREIGN_COLS | -| INNODB_CMP_RESET | -| INNODB_BUFFER_POOL_PAGES | -| INNODB_TRX | -| INNODB_BUFFER_POOL_PAGES_INDEX | -| INNODB_LOCKS | -| INNODB_BUFFER_POOL_PAGES_BLOB | -| INNODB_SYS_TABLES | -| INNODB_SYS_FIELDS | -| INNODB_SYS_COLUMNS | -| INNODB_SYS_STATS | -| INNODB_SYS_FOREIGN | -| INNODB_SYS_INDEXES | | XTRADB_ADMIN_COMMAND | -| INNODB_TABLE_STATS | -+---------------------------------------+ Wildcard: inf_rmation_schema +--------------------+ | Databases | |