diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-12-15 10:34:14 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-12-15 10:34:14 +0100 |
| commit | a6c7c53b63384f0b58ff8e34798c0952ed6ac7a7 (patch) | |
| tree | 5d4eaafa051042a726cc5ad7376b13b96111f6cd /mysql-test/suite/pbxt | |
| parent | 79479ee97571e8023b0269ffddbf525d54955273 (diff) | |
| parent | 6afbf295f018e077be7c569ef8e433e510441bea (diff) | |
| download | mariadb-git-a6c7c53b63384f0b58ff8e34798c0952ed6ac7a7.tar.gz | |
Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5
Diffstat (limited to 'mysql-test/suite/pbxt')
| -rw-r--r-- | mysql-test/suite/pbxt/r/mysqlshow.result | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/mysql-test/suite/pbxt/r/mysqlshow.result b/mysql-test/suite/pbxt/r/mysqlshow.result index a8bd5904600..b378b972410 100644 --- a/mysql-test/suite/pbxt/r/mysqlshow.result +++ b/mysql-test/suite/pbxt/r/mysqlshow.result @@ -114,29 +114,29 @@ Database: information_schema | USER_PRIVILEGES | | USER_STATISTICS | | VIEWS | -| INNODB_CMPMEM_RESET | -| PBXT_STATISTICS | -| INNODB_CMPMEM | +| INNODB_SYS_COLUMNS | | INNODB_RSEG | +| INNODB_CMP | +| INNODB_TRX | | INNODB_SYS_TABLESTATS | | INNODB_LOCK_WAITS | -| INNODB_INDEX_STATS | -| INNODB_CMP | +| INNODB_BUFFER_POOL_PAGES_INDEX | +| INNODB_LOCKS | | 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 | +| PBXT_STATISTICS | +| INNODB_CMPMEM | +| INNODB_BUFFER_POOL_PAGES_BLOB | +| INNODB_CMPMEM_RESET | | INNODB_SYS_FIELDS | -| INNODB_SYS_COLUMNS | -| INNODB_SYS_STATS | +| INNODB_TABLE_STATS | | INNODB_SYS_FOREIGN | | INNODB_SYS_INDEXES | +| INNODB_INDEX_STATS | | XTRADB_ADMIN_COMMAND | -| INNODB_TABLE_STATS | +| INNODB_SYS_STATS | +---------------------------------------+ Database: INFORMATION_SCHEMA +---------------------------------------+ @@ -177,29 +177,29 @@ Database: INFORMATION_SCHEMA | USER_PRIVILEGES | | USER_STATISTICS | | VIEWS | -| INNODB_CMPMEM_RESET | -| PBXT_STATISTICS | -| INNODB_CMPMEM | +| INNODB_SYS_COLUMNS | | INNODB_RSEG | +| INNODB_CMP | +| INNODB_TRX | | INNODB_SYS_TABLESTATS | | INNODB_LOCK_WAITS | -| INNODB_INDEX_STATS | -| INNODB_CMP | +| INNODB_BUFFER_POOL_PAGES_INDEX | +| INNODB_LOCKS | | 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 | +| PBXT_STATISTICS | +| INNODB_CMPMEM | +| INNODB_BUFFER_POOL_PAGES_BLOB | +| INNODB_CMPMEM_RESET | | INNODB_SYS_FIELDS | -| INNODB_SYS_COLUMNS | -| INNODB_SYS_STATS | +| INNODB_TABLE_STATS | | INNODB_SYS_FOREIGN | | INNODB_SYS_INDEXES | +| INNODB_INDEX_STATS | | XTRADB_ADMIN_COMMAND | -| INNODB_TABLE_STATS | +| INNODB_SYS_STATS | +---------------------------------------+ Wildcard: inf_rmation_schema +--------------------+ |