Merge XtraDB 10 into MariaDB.

2 files changed, 24 insertions, 10 deletions

diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 749c528931b..c63b2d99cd8 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -65,6 +65,8 @@ INNODB_INDEX_STATS
 INNODB_LOCKS
 INNODB_LOCK_WAITS
 INNODB_RSEG
+INNODB_SYS_INDEXES
+INNODB_SYS_TABLES
 INNODB_TABLE_STATS
 INNODB_TRX
 KEY_COLUMN_USAGE
diff --git a/mysql-test/r/information_schema_all_engines.result b/mysql-test/r/information_schema_all_engines.result
index 189efedec60..2e7b219d4d3 100644
--- a/mysql-test/r/information_schema_all_engines.result
+++ b/mysql-test/r/information_schema_all_engines.result
@@ -37,12 +37,14 @@ XTRADB_ENHANCEMENTS
 INNODB_BUFFER_POOL_PAGES_INDEX
 XTRADB_ADMIN_COMMAND
 INNODB_TRX
-INNODB_CMP_RESET
+INNODB_SYS_TABLES
 INNODB_LOCK_WAITS
 INNODB_CMPMEM_RESET
 INNODB_LOCKS
 INNODB_CMPMEM
 INNODB_TABLE_STATS
+INNODB_SYS_INDEXES
+INNODB_CMP_RESET
 INNODB_BUFFER_POOL_PAGES_BLOB
 INNODB_INDEX_STATS
 SELECT t.table_name, c1.column_name
@@ -96,14 +98,16 @@ XTRADB_ENHANCEMENTS	name
 INNODB_BUFFER_POOL_PAGES_INDEX	schema_name
 XTRADB_ADMIN_COMMAND	result_message
 INNODB_TRX	trx_id
-INNODB_CMP_RESET	page_size
+INNODB_SYS_TABLES	NAME
 INNODB_LOCK_WAITS	requesting_trx_id
 INNODB_CMPMEM_RESET	page_size
 INNODB_LOCKS	lock_id
 INNODB_CMPMEM	page_size
-INNODB_TABLE_STATS	table_name
+INNODB_TABLE_STATS	table_schema
+INNODB_SYS_INDEXES	TABLE_ID
+INNODB_CMP_RESET	page_size
 INNODB_BUFFER_POOL_PAGES_BLOB	space_id
-INNODB_INDEX_STATS	table_name
+INNODB_INDEX_STATS	table_schema
 SELECT t.table_name, c1.column_name
 FROM information_schema.tables t
 INNER JOIN
@@ -155,14 +159,16 @@ XTRADB_ENHANCEMENTS	name
 INNODB_BUFFER_POOL_PAGES_INDEX	schema_name
 XTRADB_ADMIN_COMMAND	result_message
 INNODB_TRX	trx_id
-INNODB_CMP_RESET	page_size
+INNODB_SYS_TABLES	NAME
 INNODB_LOCK_WAITS	requesting_trx_id
 INNODB_CMPMEM_RESET	page_size
 INNODB_LOCKS	lock_id
 INNODB_CMPMEM	page_size
-INNODB_TABLE_STATS	table_name
+INNODB_TABLE_STATS	table_schema
+INNODB_SYS_INDEXES	TABLE_ID
+INNODB_CMP_RESET	page_size
 INNODB_BUFFER_POOL_PAGES_BLOB	space_id
-INNODB_INDEX_STATS	table_name
+INNODB_INDEX_STATS	table_schema
 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;
@@ -205,6 +211,8 @@ INNODB_INDEX_STATS	information_schema.INNODB_INDEX_STATS	1
 INNODB_LOCKS	information_schema.INNODB_LOCKS	1
 INNODB_LOCK_WAITS	information_schema.INNODB_LOCK_WAITS	1
 INNODB_RSEG	information_schema.INNODB_RSEG	1
+INNODB_SYS_INDEXES	information_schema.INNODB_SYS_INDEXES	1
+INNODB_SYS_TABLES	information_schema.INNODB_SYS_TABLES	1
 INNODB_TABLE_STATS	information_schema.INNODB_TABLE_STATS	1
 INNODB_TRX	information_schema.INNODB_TRX	1
 KEY_COLUMN_USAGE	information_schema.KEY_COLUMN_USAGE	1
@@ -267,12 +275,14 @@ Database: information_schema
 | INNODB_BUFFER_POOL_PAGES_INDEX        |
 | XTRADB_ADMIN_COMMAND                  |
 | INNODB_TRX                            |
-| INNODB_CMP_RESET                      |
+| INNODB_SYS_TABLES                     |
 | INNODB_LOCK_WAITS                     |
 | INNODB_CMPMEM_RESET                   |
 | INNODB_LOCKS                          |
 | INNODB_CMPMEM                         |
 | INNODB_TABLE_STATS                    |
+| INNODB_SYS_INDEXES                    |
+| INNODB_CMP_RESET                      |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
 | INNODB_INDEX_STATS                    |
 +---------------------------------------+
@@ -316,12 +326,14 @@ Database: INFORMATION_SCHEMA
 | INNODB_BUFFER_POOL_PAGES_INDEX        |
 | XTRADB_ADMIN_COMMAND                  |
 | INNODB_TRX                            |
-| INNODB_CMP_RESET                      |
+| INNODB_SYS_TABLES                     |
 | INNODB_LOCK_WAITS                     |
 | INNODB_CMPMEM_RESET                   |
 | INNODB_LOCKS                          |
 | INNODB_CMPMEM                         |
 | INNODB_TABLE_STATS                    |
+| INNODB_SYS_INDEXES                    |
+| INNODB_CMP_RESET                      |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
 | INNODB_INDEX_STATS                    |
 +---------------------------------------+
@@ -333,5 +345,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	44
+information_schema	46
 mysql	22