[Commits] Rev 3594: merge test case adjustments from 5.2 in file:///home/tsk/mprog/src/5.3-merge-new/

timour at askmonty.org timour at askmonty.org
Fri Nov 9 12:55:08 EET 2012


At file:///home/tsk/mprog/src/5.3-merge-new/

------------------------------------------------------------
revno: 3594 [merge]
revision-id: timour at askmonty.org-20121109105448-u68qtgrabfwl6qws
parent: timour at askmonty.org-20121109084733-cws9d6t7ukgp3q82
parent: timour at askmonty.org-20121109095627-emrl27myu3e996t4
committer: timour at askmonty.org
branch nick: 5.3-merge-new
timestamp: Fri 2012-11-09 12:54:48 +0200
message:
  merge test case adjustments from 5.2
modified:
  mysql-test/r/information_schema_all_engines.result information_schema_a-20090408133348-au36idguotknighe-2
  mysql-test/suite/funcs_1/r/is_columns_is.result sp1f-is_columns_is.result-20080307163304-7bd6seaxklddmff6f3bb54inlyw6unpw
  mysql-test/suite/funcs_1/r/is_columns_is_embedded.result is_columns_is_embedd-20080616171935-sl04j972o55obadv-5
  mysql-test/suite/funcs_1/t/is_columns_is.test sp1f-is_columns_is.test-20080307163303-projhl5aviz6wflvnkcoukmxy6nra32g
  mysql-test/t/information_schema_all_engines.test information_schema_a-20090408133348-au36idguotknighe-3
-------------- next part --------------
=== modified file 'mysql-test/r/information_schema_all_engines.result'
--- a/mysql-test/r/information_schema_all_engines.result	2012-11-09 08:11:20 +0000
+++ b/mysql-test/r/information_schema_all_engines.result	2012-11-09 10:54:48 +0000
@@ -13,9 +13,13 @@ FILES
 GLOBAL_STATUS
 GLOBAL_VARIABLES
 INDEX_STATISTICS
+INNODB_BUFFER_PAGE
+INNODB_BUFFER_PAGE_LRU
 INNODB_BUFFER_POOL_PAGES
 INNODB_BUFFER_POOL_PAGES_BLOB
 INNODB_BUFFER_POOL_PAGES_INDEX
+INNODB_BUFFER_POOL_STATS
+INNODB_CHANGED_PAGES
 INNODB_CMP
 INNODB_CMPMEM
 INNODB_CMPMEM_RESET
@@ -32,7 +36,6 @@ INNODB_TRX
 KEY_CACHES
 KEY_COLUMN_USAGE
 PARTITIONS
-PBXT_STATISTICS
 PLUGINS
 PROCESSLIST
 PROFILING
@@ -51,28 +54,7 @@ TRIGGERS
 USER_PRIVILEGES
 USER_STATISTICS
 VIEWS
-INNODB_BUFFER_POOL_PAGES
-PBXT_STATISTICS
-INNODB_CMP
-INNODB_RSEG
-INNODB_INDEX_STATS
-INNODB_BUFFER_POOL_PAGES_INDEX
 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
 FROM information_schema.tables t
 INNER JOIN
@@ -100,9 +82,13 @@ FILES	TABLE_SCHEMA
 GLOBAL_STATUS   VARIABLE_NAME
 GLOBAL_VARIABLES        VARIABLE_NAME
 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_BLOB   space_id
 INNODB_BUFFER_POOL_PAGES_INDEX  index_id
+INNODB_BUFFER_POOL_STATS        POOL_SIZE
+INNODB_CHANGED_PAGES    space_id
 INNODB_CMP      page_size
 INNODB_CMPMEM   page_size
 INNODB_CMPMEM_RESET     page_size
@@ -119,7 +105,6 @@ INNODB_TRX	trx_id
 KEY_CACHES      KEY_CACHE_NAME
 KEY_COLUMN_USAGE        CONSTRAINT_SCHEMA
 PARTITIONS      TABLE_SCHEMA
-PBXT_STATISTICS ID
 PLUGINS PLUGIN_NAME
 PROCESSLIST     ID
 PROFILING       QUERY_ID
@@ -138,28 +123,7 @@ TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES GRANTEE
 USER_STATISTICS USER
 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
-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
 FROM information_schema.tables t
 INNER JOIN
@@ -187,9 +151,13 @@ FILES	TABLE_SCHEMA
 GLOBAL_STATUS   VARIABLE_NAME
 GLOBAL_VARIABLES        VARIABLE_NAME
 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_BLOB   space_id
 INNODB_BUFFER_POOL_PAGES_INDEX  index_id
+INNODB_BUFFER_POOL_STATS        POOL_SIZE
+INNODB_CHANGED_PAGES    space_id
 INNODB_CMP      page_size
 INNODB_CMPMEM   page_size
 INNODB_CMPMEM_RESET     page_size
@@ -206,7 +174,6 @@ INNODB_TRX	trx_id
 KEY_CACHES      KEY_CACHE_NAME
 KEY_COLUMN_USAGE        CONSTRAINT_SCHEMA
 PARTITIONS      TABLE_SCHEMA
-PBXT_STATISTICS ID
 PLUGINS PLUGIN_NAME
 PROCESSLIST     ID
 PROFILING       QUERY_ID
@@ -225,28 +192,7 @@ TRIGGERS	TRIGGER_SCHEMA
 USER_PRIVILEGES GRANTEE
 USER_STATISTICS USER
 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
-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 cast(table_name as char)  from information_schema.tables
 order by table_name limit 1) limit 1;
@@ -303,7 +249,6 @@ INNODB_TRX	information_schema.INNODB_TRX
 KEY_CACHES      information_schema.KEY_CACHES   1
 KEY_COLUMN_USAGE        information_schema.KEY_COLUMN_USAGE     1
 PARTITIONS      information_schema.PARTITIONS   1
-PBXT_STATISTICS information_schema.PBXT_STATISTICS      1
 PLUGINS information_schema.PLUGINS      1
 PROCESSLIST     information_schema.PROCESSLIST  1
 PROFILING       information_schema.PROFILING    1
@@ -322,6 +267,9 @@ TRIGGERS	information_schema.TRIGGERS	1
 USER_PRIVILEGES information_schema.USER_PRIVILEGES      1
 USER_STATISTICS information_schema.USER_STATISTICS      1
 VIEWS   information_schema.VIEWS        1
++---------------------------------------+
++---------------------------------------+
++---------------------------------------+
 Database: information_schema
 |                Tables                 |
 | CHARACTER_SETS                        |
@@ -336,9 +284,13 @@ Database: information_schema
 | GLOBAL_STATUS                         |
 | GLOBAL_VARIABLES                      |
 | INDEX_STATISTICS                      |
+| INNODB_BUFFER_PAGE                    |
+| INNODB_BUFFER_PAGE_LRU                |
 | INNODB_BUFFER_POOL_PAGES              |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
 | INNODB_BUFFER_POOL_PAGES_INDEX        |
+| INNODB_BUFFER_POOL_STATS              |
+| INNODB_CHANGED_PAGES                  |
 | INNODB_CMP                            |
 | INNODB_CMPMEM                         |
 | INNODB_CMPMEM_RESET                   |
@@ -355,7 +307,6 @@ Database: information_schema
 | KEY_CACHES                            |
 | KEY_COLUMN_USAGE                      |
 | PARTITIONS                            |
-| PBXT_STATISTICS                       |
 | PLUGINS                               |
 | PROCESSLIST                           |
 | PROFILING                             |
@@ -374,28 +325,9 @@ Database: information_schema
 | USER_PRIVILEGES                       |
 | USER_STATISTICS                       |
 | VIEWS                                 |
-| INNODB_BUFFER_POOL_PAGES              |
-| PBXT_STATISTICS                       |
-| INNODB_CMP                            |
-| INNODB_RSEG                           |
-| INNODB_INDEX_STATS                    |
-| INNODB_BUFFER_POOL_PAGES_INDEX        |
 | 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
 |                Tables                 |
@@ -411,9 +343,13 @@ Database: INFORMATION_SCHEMA
 | GLOBAL_STATUS                         |
 | GLOBAL_VARIABLES                      |
 | INDEX_STATISTICS                      |
+| INNODB_BUFFER_PAGE                    |
+| INNODB_BUFFER_PAGE_LRU                |
 | INNODB_BUFFER_POOL_PAGES              |
 | INNODB_BUFFER_POOL_PAGES_BLOB         |
 | INNODB_BUFFER_POOL_PAGES_INDEX        |
+| INNODB_BUFFER_POOL_STATS              |
+| INNODB_CHANGED_PAGES                  |
 | INNODB_CMP                            |
 | INNODB_CMPMEM                         |
 | INNODB_CMPMEM_RESET                   |
@@ -430,7 +366,6 @@ Database: INFORMATION_SCHEMA
 | KEY_CACHES                            |
 | KEY_COLUMN_USAGE                      |
 | PARTITIONS                            |
-| PBXT_STATISTICS                       |
 | PLUGINS                               |
 | PROCESSLIST                           |
 | PROFILING                             |
@@ -449,33 +384,14 @@ Database: INFORMATION_SCHEMA
 | USER_PRIVILEGES                       |
 | USER_STATISTICS                       |
 | VIEWS                                 |
-| INNODB_BUFFER_POOL_PAGES              |
-| PBXT_STATISTICS                       |
-| INNODB_CMP                            |
-| INNODB_RSEG                           |
-| INNODB_INDEX_STATS                    |
-| INNODB_BUFFER_POOL_PAGES_INDEX        |
 | 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
 |     Databases      |
 | 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;
 table_schema    count(*)
-information_schema      50
+information_schema      54
 mysql   22

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_is.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_is.result	2012-11-09 08:11:20 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_is.result	2012-11-09 10:54:48 +0000
@@ -141,6 +141,44 @@ NULL	information_schema	INDEX_STATISTICS
 NULL    information_schema      INDEX_STATISTICS        ROWS_READ       4       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    NULL    bigint(21)                      select  
 NULL    information_schema      INDEX_STATISTICS        TABLE_NAME      2               NO      varchar 192     576     NULL    NULL    NULL    utf8    utf8_general_ci varchar(192)                    select  
 NULL    information_schema      INDEX_STATISTICS        TABLE_SCHEMA    1               NO      varchar 192     576     NULL    NULL    NULL    utf8    utf8_general_ci varchar(192)                    select  
+NULL    information_schema      INNODB_BUFFER_PAGE      ACCESS_TIME     10      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      BLOCK_ID        1       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      COMPRESSED_SIZE 15      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      DATA_SIZE       14      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      FIX_COUNT       6       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      FLUSH_TYPE      5       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      FREE_PAGE_CLOCK 19      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      INDEX_NAME      12      NULL    YES     varchar 1024    3072    NULL    NULL    NULL    utf8    utf8_general_ci varchar(1024)                   select  
+NULL    information_schema      INNODB_BUFFER_PAGE      IO_FIX  17      NULL    YES     varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      IS_HASHED       7       NULL    YES     varchar 3       9       NULL    NULL    NULL    utf8    utf8_general_ci varchar(3)                      select  
+NULL    information_schema      INNODB_BUFFER_PAGE      IS_OLD  18      NULL    YES     varchar 3       9       NULL    NULL    NULL    utf8    utf8_general_ci varchar(3)                      select  
+NULL    information_schema      INNODB_BUFFER_PAGE      NEWEST_MODIFICATION     8       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      NUMBER_RECORDS  13      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      OLDEST_MODIFICATION     9       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      PAGE_NUMBER     3       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      PAGE_STATE      16      NULL    YES     varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      PAGE_TYPE       4       NULL    YES     varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      SPACE   2       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE      TABLE_NAME      11      NULL    YES     varchar 1024    3072    NULL    NULL    NULL    utf8    utf8_general_ci varchar(1024)                   select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  ACCESS_TIME     10      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  COMPRESSED      16      NULL    YES     varchar 3       9       NULL    NULL    NULL    utf8    utf8_general_ci varchar(3)                      select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  COMPRESSED_SIZE 15      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  DATA_SIZE       14      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  FIX_COUNT       6       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  FLUSH_TYPE      5       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  FREE_PAGE_CLOCK 19      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  INDEX_NAME      12      NULL    YES     varchar 1024    3072    NULL    NULL    NULL    utf8    utf8_general_ci varchar(1024)                   select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  IO_FIX  17      NULL    YES     varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  IS_HASHED       7       NULL    YES     varchar 3       9       NULL    NULL    NULL    utf8    utf8_general_ci varchar(3)                      select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  IS_OLD  18      NULL    YES     varchar 3       9       NULL    NULL    NULL    utf8    utf8_general_ci varchar(3)                      select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  LRU_POSITION    1       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  NEWEST_MODIFICATION     8       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  NUMBER_RECORDS  13      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  OLDEST_MODIFICATION     9       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  PAGE_NUMBER     3       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  PAGE_TYPE       4       NULL    YES     varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  SPACE   2       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  TABLE_NAME      11      NULL    YES     varchar 1024    3072    NULL    NULL    NULL    utf8    utf8_general_ci varchar(1024)                   select  
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        fix_count       5       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        flush_type      6       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        lru_position    4       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
@@ -168,6 +206,41 @@ NULL	information_schema	INNODB_BUFFER_PO
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES_INDEX  old     10      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES_INDEX  page_no 3       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES_INDEX  space_id        2       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        DATABASE_PAGES  3       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        FREE_BUFFERS    2       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        HIT_RATE        21      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        LRU_IO_CURRENT  29      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        LRU_IO_TOTAL    28      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        MODIFIED_DATABASE_PAGES 5       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NOT_YOUNG_MAKE_PER_THOUSAND_GETS        23      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_CREATED    15      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_GET        20      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_READ       14      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_READ_AHEAD 24      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_WRITTEN    16      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_READ_AHEAD_EVICTED       25      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        OLD_DATABASE_PAGES      4       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_CREATE_RATE       18      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                  select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_MADE_NOT_YOUNG_RATE       13      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                  select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_MADE_YOUNG        10      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_MADE_YOUNG_RATE   12      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                  select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_NOT_MADE_YOUNG    11      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_READ_RATE 17      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                  select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_WRITTEN_RATE      19      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                  select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_DECOMPRESS      6       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_FLUSH_LIST      9       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_FLUSH_LRU       8       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_READS   7       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        POOL_SIZE       1       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        READ_AHEAD_EVICTED_RATE 27      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                  select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        READ_AHEAD_RATE 26      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                  select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        UNCOMPRESS_CURRENT      31      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        UNCOMPRESS_TOTAL        30      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        YOUNG_MAKE_PER_THOUSAND_GETS    22      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_CHANGED_PAGES    end_lsn 4       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
+NULL    information_schema      INNODB_CHANGED_PAGES    page_id 2       0       NO      int     NULL    NULL    10      0       NULL    NULL    NULL    int(11) unsigned                        select  
+NULL    information_schema      INNODB_CHANGED_PAGES    space_id        1       0       NO      int     NULL    NULL    10      0       NULL    NULL    NULL    int(11) unsigned                        select  
+NULL    information_schema      INNODB_CHANGED_PAGES    start_lsn       3       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
 NULL    information_schema      INNODB_CMP      compress_ops    2       0       NO      int     NULL    NULL    10      0       NULL    NULL    NULL    int(11)                 select  
 NULL    information_schema      INNODB_CMP      compress_ops_ok 3       0       NO      int     NULL    NULL    10      0       NULL    NULL    NULL    int(11)                 select  
 NULL    information_schema      INNODB_CMP      compress_time   4       0       NO      int     NULL    NULL    10      0       NULL    NULL    NULL    int(11)                 select  
@@ -300,9 +373,6 @@ NULL	information_schema	PARTITIONS	TABLE
 NULL    information_schema      PARTITIONS      TABLE_ROWS      13      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                     select  
 NULL    information_schema      PARTITIONS      TABLE_SCHEMA    2               NO      varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
 NULL    information_schema      PARTITIONS      UPDATE_TIME     20      NULL    YES     datetime        NULL    NULL    NULL    NULL    0       NULL    NULL    datetime                        select  
-NULL    information_schema      PBXT_STATISTICS ID      1       0       NO      int     NULL    NULL    10      0       NULL    NULL    NULL    int(4)                  select  
-NULL    information_schema      PBXT_STATISTICS Name    2               NO      varchar 40      120     NULL    NULL    NULL    utf8    utf8_general_ci varchar(40)                     select  
-NULL    information_schema      PBXT_STATISTICS Value   3       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    NULL    bigint(8)                       select  
 NULL    information_schema      PLUGINS PLUGIN_AUTHOR   8       NULL    YES     varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
 NULL    information_schema      PLUGINS PLUGIN_AUTH_VERSION     12      NULL    YES     varchar 80      240     NULL    NULL    NULL    utf8    utf8_general_ci varchar(80)                     select  
 NULL    information_schema      PLUGINS PLUGIN_DESCRIPTION      9       NULL    YES     longtext        4294967295      4294967295      NULL    NULL    NULL    utf8    utf8_general_ci longtext                        select  
@@ -488,10 +558,6 @@ NULL	information_schema	VIEWS	TABLE_NAME
 NULL    information_schema      VIEWS   TABLE_SCHEMA    2               NO      varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                     select  
 NULL    information_schema      VIEWS   VIEW_DEFINITION 4       NULL    NO      longtext        4294967295      4294967295      NULL    NULL    NULL    utf8    utf8_general_ci longtext                        select  
 NULL    information_schema      XTRADB_ADMIN_COMMAND    result_message  1               NO      varchar 1024    3072    NULL    NULL    NULL    utf8    utf8_general_ci varchar(1024)                   select  
-NULL    information_schema      XTRADB_ENHANCEMENTS     comment 3               NO      varchar 100     300     NULL    NULL    NULL    utf8    utf8_general_ci varchar(100)                    select  
-NULL    information_schema      XTRADB_ENHANCEMENTS     description     2               NO      varchar 255     765     NULL    NULL    NULL    utf8    utf8_general_ci varchar(255)                    select  
-NULL    information_schema      XTRADB_ENHANCEMENTS     link    4               NO      varchar 255     765     NULL    NULL    NULL    utf8    utf8_general_ci varchar(255)                    select  
-NULL    information_schema      XTRADB_ENHANCEMENTS     name    1               NO      varchar 255     765     NULL    NULL    NULL    utf8    utf8_general_ci varchar(255)                    select  
 ##########################################################################
 # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH
 ##########################################################################
@@ -691,6 +757,44 @@ NULL	information_schema	FILES	CHECKSUM	b
 3.0000  information_schema      INDEX_STATISTICS        TABLE_NAME      varchar 192     576     utf8    utf8_general_ci varchar(192)
 3.0000  information_schema      INDEX_STATISTICS        INDEX_NAME      varchar 192     576     utf8    utf8_general_ci varchar(192)
 NULL    information_schema      INDEX_STATISTICS        ROWS_READ       bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      INNODB_BUFFER_PAGE      BLOCK_ID        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      SPACE   bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      PAGE_NUMBER     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE      PAGE_TYPE       varchar 64      192     utf8    utf8_general_ci varchar(64)
+NULL    information_schema      INNODB_BUFFER_PAGE      FLUSH_TYPE      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      FIX_COUNT       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE      IS_HASHED       varchar 3       9       utf8    utf8_general_ci varchar(3)
+NULL    information_schema      INNODB_BUFFER_PAGE      NEWEST_MODIFICATION     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      OLDEST_MODIFICATION     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      ACCESS_TIME     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE      TABLE_NAME      varchar 1024    3072    utf8    utf8_general_ci varchar(1024)
+3.0000  information_schema      INNODB_BUFFER_PAGE      INDEX_NAME      varchar 1024    3072    utf8    utf8_general_ci varchar(1024)
+NULL    information_schema      INNODB_BUFFER_PAGE      NUMBER_RECORDS  bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      DATA_SIZE       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      COMPRESSED_SIZE bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE      PAGE_STATE      varchar 64      192     utf8    utf8_general_ci varchar(64)
+3.0000  information_schema      INNODB_BUFFER_PAGE      IO_FIX  varchar 64      192     utf8    utf8_general_ci varchar(64)
+3.0000  information_schema      INNODB_BUFFER_PAGE      IS_OLD  varchar 3       9       utf8    utf8_general_ci varchar(3)
+NULL    information_schema      INNODB_BUFFER_PAGE      FREE_PAGE_CLOCK bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  LRU_POSITION    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  SPACE   bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  PAGE_NUMBER     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  PAGE_TYPE       varchar 64      192     utf8    utf8_general_ci varchar(64)
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  FLUSH_TYPE      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  FIX_COUNT       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  IS_HASHED       varchar 3       9       utf8    utf8_general_ci varchar(3)
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  NEWEST_MODIFICATION     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  OLDEST_MODIFICATION     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  ACCESS_TIME     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  TABLE_NAME      varchar 1024    3072    utf8    utf8_general_ci varchar(1024)
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  INDEX_NAME      varchar 1024    3072    utf8    utf8_general_ci varchar(1024)
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  NUMBER_RECORDS  bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  DATA_SIZE       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  COMPRESSED_SIZE bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  COMPRESSED      varchar 3       9       utf8    utf8_general_ci varchar(3)
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  IO_FIX  varchar 64      192     utf8    utf8_general_ci varchar(64)
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  IS_OLD  varchar 3       9       utf8    utf8_general_ci varchar(3)
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  FREE_PAGE_CLOCK bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
 3.0000  information_schema      INNODB_BUFFER_POOL_PAGES        page_type       varchar 64      192     utf8    utf8_general_ci varchar(64)
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        space_id        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        page_no bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
@@ -718,6 +822,41 @@ NULL	information_schema	INNODB_BUFFER_PO
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES_INDEX  lru_position    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES_INDEX  fix_count       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES_INDEX  flush_type      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        POOL_SIZE       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        FREE_BUFFERS    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        DATABASE_PAGES  bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        OLD_DATABASE_PAGES      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        MODIFIED_DATABASE_PAGES bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_DECOMPRESS      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_READS   bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_FLUSH_LRU       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_FLUSH_LIST      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_MADE_YOUNG        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_NOT_MADE_YOUNG    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_MADE_YOUNG_RATE   double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_MADE_NOT_YOUNG_RATE       double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_READ       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_CREATED    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_WRITTEN    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_READ_RATE double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_CREATE_RATE       double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_WRITTEN_RATE      double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_GET        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        HIT_RATE        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        YOUNG_MAKE_PER_THOUSAND_GETS    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NOT_YOUNG_MAKE_PER_THOUSAND_GETS        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_READ_AHEAD bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_READ_AHEAD_EVICTED       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        READ_AHEAD_RATE double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        READ_AHEAD_EVICTED_RATE double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        LRU_IO_TOTAL    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        LRU_IO_CURRENT  bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        UNCOMPRESS_TOTAL        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        UNCOMPRESS_CURRENT      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_CHANGED_PAGES    space_id        int     NULL    NULL    NULL    NULL    int(11) unsigned
+NULL    information_schema      INNODB_CHANGED_PAGES    page_id int     NULL    NULL    NULL    NULL    int(11) unsigned
+NULL    information_schema      INNODB_CHANGED_PAGES    start_lsn       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_CHANGED_PAGES    end_lsn bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
 NULL    information_schema      INNODB_CMP      page_size       int     NULL    NULL    NULL    NULL    int(5)
 NULL    information_schema      INNODB_CMP      compress_ops    int     NULL    NULL    NULL    NULL    int(11)
 NULL    information_schema      INNODB_CMP      compress_ops_ok int     NULL    NULL    NULL    NULL    int(11)
@@ -850,9 +989,6 @@ NULL	information_schema	PARTITIONS	CHECK
 3.0000  information_schema      PARTITIONS      PARTITION_COMMENT       varchar 80      240     utf8    utf8_general_ci varchar(80)
 3.0000  information_schema      PARTITIONS      NODEGROUP       varchar 12      36      utf8    utf8_general_ci varchar(12)
 3.0000  information_schema      PARTITIONS      TABLESPACE_NAME varchar 64      192     utf8    utf8_general_ci varchar(64)
-NULL    information_schema      PBXT_STATISTICS ID      int     NULL    NULL    NULL    NULL    int(4)
-3.0000  information_schema      PBXT_STATISTICS Name    varchar 40      120     utf8    utf8_general_ci varchar(40)
-NULL    information_schema      PBXT_STATISTICS Value   bigint  NULL    NULL    NULL    NULL    bigint(8)
 3.0000  information_schema      PLUGINS PLUGIN_NAME     varchar 64      192     utf8    utf8_general_ci varchar(64)
 3.0000  information_schema      PLUGINS PLUGIN_VERSION  varchar 20      60      utf8    utf8_general_ci varchar(20)
 3.0000  information_schema      PLUGINS PLUGIN_STATUS   varchar 10      30      utf8    utf8_general_ci varchar(10)
@@ -1038,7 +1174,3 @@ NULL	information_schema	USER_STATISTICS
 3.0000  information_schema      VIEWS   CHARACTER_SET_CLIENT    varchar 32      96      utf8    utf8_general_ci varchar(32)
 3.0000  information_schema      VIEWS   COLLATION_CONNECTION    varchar 32      96      utf8    utf8_general_ci varchar(32)
 3.0000  information_schema      XTRADB_ADMIN_COMMAND    result_message  varchar 1024    3072    utf8    utf8_general_ci varchar(1024)
-3.0000  information_schema      XTRADB_ENHANCEMENTS     name    varchar 255     765     utf8    utf8_general_ci varchar(255)
-3.0000  information_schema      XTRADB_ENHANCEMENTS     description     varchar 255     765     utf8    utf8_general_ci varchar(255)
-3.0000  information_schema      XTRADB_ENHANCEMENTS     comment varchar 100     300     utf8    utf8_general_ci varchar(100)
-3.0000  information_schema      XTRADB_ENHANCEMENTS     link    varchar 255     765     utf8    utf8_general_ci varchar(255)

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_is_embedded.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result	2011-07-01 12:08:30 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_is_embedded.result	2012-11-09 10:54:48 +0000
@@ -141,6 +141,44 @@ NULL	information_schema	INDEX_STATISTICS
 NULL    information_schema      INDEX_STATISTICS        ROWS_READ       4       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    NULL    bigint(21)                              
 NULL    information_schema      INDEX_STATISTICS        TABLE_NAME      2               NO      varchar 192     576     NULL    NULL    NULL    utf8    utf8_general_ci varchar(192)                            
 NULL    information_schema      INDEX_STATISTICS        TABLE_SCHEMA    1               NO      varchar 192     576     NULL    NULL    NULL    utf8    utf8_general_ci varchar(192)                            
+NULL    information_schema      INNODB_BUFFER_PAGE      ACCESS_TIME     10      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE      BLOCK_ID        1       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE      COMPRESSED_SIZE 15      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE      DATA_SIZE       14      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE      FIX_COUNT       6       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE      FLUSH_TYPE      5       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE      FREE_PAGE_CLOCK 19      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE      INDEX_NAME      12      NULL    YES     varchar 1024    3072    NULL    NULL    NULL    utf8    utf8_general_ci varchar(1024)                           
+NULL    information_schema      INNODB_BUFFER_PAGE      IO_FIX  17      NULL    YES     varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                             
+NULL    information_schema      INNODB_BUFFER_PAGE      IS_HASHED       7       NULL    YES     varchar 3       9       NULL    NULL    NULL    utf8    utf8_general_ci varchar(3)                              
+NULL    information_schema      INNODB_BUFFER_PAGE      IS_OLD  18      NULL    YES     varchar 3       9       NULL    NULL    NULL    utf8    utf8_general_ci varchar(3)                              
+NULL    information_schema      INNODB_BUFFER_PAGE      NEWEST_MODIFICATION     8       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE      NUMBER_RECORDS  13      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE      OLDEST_MODIFICATION     9       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE      PAGE_NUMBER     3       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE      PAGE_STATE      16      NULL    YES     varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                             
+NULL    information_schema      INNODB_BUFFER_PAGE      PAGE_TYPE       4       NULL    YES     varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                             
+NULL    information_schema      INNODB_BUFFER_PAGE      SPACE   2       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE      TABLE_NAME      11      NULL    YES     varchar 1024    3072    NULL    NULL    NULL    utf8    utf8_general_ci varchar(1024)                           
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  ACCESS_TIME     10      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  COMPRESSED      16      NULL    YES     varchar 3       9       NULL    NULL    NULL    utf8    utf8_general_ci varchar(3)                              
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  COMPRESSED_SIZE 15      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  DATA_SIZE       14      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  FIX_COUNT       6       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  FLUSH_TYPE      5       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  FREE_PAGE_CLOCK 19      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  INDEX_NAME      12      NULL    YES     varchar 1024    3072    NULL    NULL    NULL    utf8    utf8_general_ci varchar(1024)                           
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  IO_FIX  17      NULL    YES     varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  IS_HASHED       7       NULL    YES     varchar 3       9       NULL    NULL    NULL    utf8    utf8_general_ci varchar(3)                              
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  IS_OLD  18      NULL    YES     varchar 3       9       NULL    NULL    NULL    utf8    utf8_general_ci varchar(3)                              
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  LRU_POSITION    1       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  NEWEST_MODIFICATION     8       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  NUMBER_RECORDS  13      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  OLDEST_MODIFICATION     9       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  PAGE_NUMBER     3       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  PAGE_TYPE       4       NULL    YES     varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  SPACE   2       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  TABLE_NAME      11      NULL    YES     varchar 1024    3072    NULL    NULL    NULL    utf8    utf8_general_ci varchar(1024)                           
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        fix_count       5       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        flush_type      6       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        lru_position    4       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
@@ -168,6 +206,41 @@ NULL	information_schema	INNODB_BUFFER_PO
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES_INDEX  old     10      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES_INDEX  page_no 3       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES_INDEX  space_id        2       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        DATABASE_PAGES  3       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        FREE_BUFFERS    2       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        HIT_RATE        21      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        LRU_IO_CURRENT  29      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        LRU_IO_TOTAL    28      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        MODIFIED_DATABASE_PAGES 5       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NOT_YOUNG_MAKE_PER_THOUSAND_GETS        23      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_CREATED    15      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_GET        20      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_READ       14      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_READ_AHEAD 24      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_WRITTEN    16      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_READ_AHEAD_EVICTED       25      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        OLD_DATABASE_PAGES      4       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_CREATE_RATE       18      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                          
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_MADE_NOT_YOUNG_RATE       13      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                          
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_MADE_YOUNG        10      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_MADE_YOUNG_RATE   12      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                          
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_NOT_MADE_YOUNG    11      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_READ_RATE 17      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                          
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_WRITTEN_RATE      19      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                          
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_DECOMPRESS      6       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_FLUSH_LIST      9       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_FLUSH_LRU       8       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_READS   7       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        POOL_SIZE       1       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        READ_AHEAD_EVICTED_RATE 27      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                          
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        READ_AHEAD_RATE 26      0       NO      double  NULL    NULL    12      NULL    NULL    NULL    NULL    double                          
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        UNCOMPRESS_CURRENT      31      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        UNCOMPRESS_TOTAL        30      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        YOUNG_MAKE_PER_THOUSAND_GETS    22      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_CHANGED_PAGES    end_lsn 4       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
+NULL    information_schema      INNODB_CHANGED_PAGES    page_id 2       0       NO      int     NULL    NULL    10      0       NULL    NULL    NULL    int(11) unsigned                                
+NULL    information_schema      INNODB_CHANGED_PAGES    space_id        1       0       NO      int     NULL    NULL    10      0       NULL    NULL    NULL    int(11) unsigned                                
+NULL    information_schema      INNODB_CHANGED_PAGES    start_lsn       3       0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
 NULL    information_schema      INNODB_CMP      compress_ops    2       0       NO      int     NULL    NULL    10      0       NULL    NULL    NULL    int(11)                         
 NULL    information_schema      INNODB_CMP      compress_ops_ok 3       0       NO      int     NULL    NULL    10      0       NULL    NULL    NULL    int(11)                         
 NULL    information_schema      INNODB_CMP      compress_time   4       0       NO      int     NULL    NULL    10      0       NULL    NULL    NULL    int(11)                         
@@ -300,9 +373,6 @@ NULL	information_schema	PARTITIONS	TABLE
 NULL    information_schema      PARTITIONS      TABLE_ROWS      13      0       NO      bigint  NULL    NULL    20      0       NULL    NULL    NULL    bigint(21) unsigned                             
 NULL    information_schema      PARTITIONS      TABLE_SCHEMA    2               NO      varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                             
 NULL    information_schema      PARTITIONS      UPDATE_TIME     20      NULL    YES     datetime        NULL    NULL    NULL    NULL    0       NULL    NULL    datetime                                
-NULL    information_schema      PBXT_STATISTICS ID      1       0       NO      int     NULL    NULL    10      0       NULL    NULL    NULL    int(4)                          
-NULL    information_schema      PBXT_STATISTICS Name    2               NO      varchar 40      120     NULL    NULL    NULL    utf8    utf8_general_ci varchar(40)                             
-NULL    information_schema      PBXT_STATISTICS Value   3       0       NO      bigint  NULL    NULL    19      0       NULL    NULL    NULL    bigint(8)                               
 NULL    information_schema      PLUGINS PLUGIN_AUTHOR   8       NULL    YES     varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                             
 NULL    information_schema      PLUGINS PLUGIN_AUTH_VERSION     12      NULL    YES     varchar 80      240     NULL    NULL    NULL    utf8    utf8_general_ci varchar(80)                             
 NULL    information_schema      PLUGINS PLUGIN_DESCRIPTION      9       NULL    YES     longtext        4294967295      4294967295      NULL    NULL    NULL    utf8    utf8_general_ci longtext                                
@@ -488,10 +558,6 @@ NULL	information_schema	VIEWS	TABLE_NAME
 NULL    information_schema      VIEWS   TABLE_SCHEMA    2               NO      varchar 64      192     NULL    NULL    NULL    utf8    utf8_general_ci varchar(64)                             
 NULL    information_schema      VIEWS   VIEW_DEFINITION 4       NULL    NO      longtext        4294967295      4294967295      NULL    NULL    NULL    utf8    utf8_general_ci longtext                                
 NULL    information_schema      XTRADB_ADMIN_COMMAND    result_message  1               NO      varchar 1024    3072    NULL    NULL    NULL    utf8    utf8_general_ci varchar(1024)                           
-NULL    information_schema      XTRADB_ENHANCEMENTS     comment 3               NO      varchar 100     300     NULL    NULL    NULL    utf8    utf8_general_ci varchar(100)                            
-NULL    information_schema      XTRADB_ENHANCEMENTS     description     2               NO      varchar 255     765     NULL    NULL    NULL    utf8    utf8_general_ci varchar(255)                            
-NULL    information_schema      XTRADB_ENHANCEMENTS     link    4               NO      varchar 255     765     NULL    NULL    NULL    utf8    utf8_general_ci varchar(255)                            
-NULL    information_schema      XTRADB_ENHANCEMENTS     name    1               NO      varchar 255     765     NULL    NULL    NULL    utf8    utf8_general_ci varchar(255)                            
 ##########################################################################
 # Show the quotient of CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH
 ##########################################################################
@@ -691,6 +757,44 @@ NULL	information_schema	FILES	CHECKSUM	b
 3.0000  information_schema      INDEX_STATISTICS        TABLE_NAME      varchar 192     576     utf8    utf8_general_ci varchar(192)
 3.0000  information_schema      INDEX_STATISTICS        INDEX_NAME      varchar 192     576     utf8    utf8_general_ci varchar(192)
 NULL    information_schema      INDEX_STATISTICS        ROWS_READ       bigint  NULL    NULL    NULL    NULL    bigint(21)
+NULL    information_schema      INNODB_BUFFER_PAGE      BLOCK_ID        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      SPACE   bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      PAGE_NUMBER     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE      PAGE_TYPE       varchar 64      192     utf8    utf8_general_ci varchar(64)
+NULL    information_schema      INNODB_BUFFER_PAGE      FLUSH_TYPE      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      FIX_COUNT       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE      IS_HASHED       varchar 3       9       utf8    utf8_general_ci varchar(3)
+NULL    information_schema      INNODB_BUFFER_PAGE      NEWEST_MODIFICATION     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      OLDEST_MODIFICATION     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      ACCESS_TIME     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE      TABLE_NAME      varchar 1024    3072    utf8    utf8_general_ci varchar(1024)
+3.0000  information_schema      INNODB_BUFFER_PAGE      INDEX_NAME      varchar 1024    3072    utf8    utf8_general_ci varchar(1024)
+NULL    information_schema      INNODB_BUFFER_PAGE      NUMBER_RECORDS  bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      DATA_SIZE       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE      COMPRESSED_SIZE bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE      PAGE_STATE      varchar 64      192     utf8    utf8_general_ci varchar(64)
+3.0000  information_schema      INNODB_BUFFER_PAGE      IO_FIX  varchar 64      192     utf8    utf8_general_ci varchar(64)
+3.0000  information_schema      INNODB_BUFFER_PAGE      IS_OLD  varchar 3       9       utf8    utf8_general_ci varchar(3)
+NULL    information_schema      INNODB_BUFFER_PAGE      FREE_PAGE_CLOCK bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  LRU_POSITION    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  SPACE   bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  PAGE_NUMBER     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  PAGE_TYPE       varchar 64      192     utf8    utf8_general_ci varchar(64)
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  FLUSH_TYPE      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  FIX_COUNT       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  IS_HASHED       varchar 3       9       utf8    utf8_general_ci varchar(3)
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  NEWEST_MODIFICATION     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  OLDEST_MODIFICATION     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  ACCESS_TIME     bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  TABLE_NAME      varchar 1024    3072    utf8    utf8_general_ci varchar(1024)
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  INDEX_NAME      varchar 1024    3072    utf8    utf8_general_ci varchar(1024)
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  NUMBER_RECORDS  bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  DATA_SIZE       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  COMPRESSED_SIZE bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  COMPRESSED      varchar 3       9       utf8    utf8_general_ci varchar(3)
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  IO_FIX  varchar 64      192     utf8    utf8_general_ci varchar(64)
+3.0000  information_schema      INNODB_BUFFER_PAGE_LRU  IS_OLD  varchar 3       9       utf8    utf8_general_ci varchar(3)
+NULL    information_schema      INNODB_BUFFER_PAGE_LRU  FREE_PAGE_CLOCK bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
 3.0000  information_schema      INNODB_BUFFER_POOL_PAGES        page_type       varchar 64      192     utf8    utf8_general_ci varchar(64)
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        space_id        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES        page_no bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
@@ -718,6 +822,41 @@ NULL	information_schema	INNODB_BUFFER_PO
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES_INDEX  lru_position    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES_INDEX  fix_count       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
 NULL    information_schema      INNODB_BUFFER_POOL_PAGES_INDEX  flush_type      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        POOL_SIZE       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        FREE_BUFFERS    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        DATABASE_PAGES  bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        OLD_DATABASE_PAGES      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        MODIFIED_DATABASE_PAGES bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_DECOMPRESS      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_READS   bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_FLUSH_LRU       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PENDING_FLUSH_LIST      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_MADE_YOUNG        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_NOT_MADE_YOUNG    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_MADE_YOUNG_RATE   double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_MADE_NOT_YOUNG_RATE       double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_READ       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_CREATED    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_WRITTEN    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_READ_RATE double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_CREATE_RATE       double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        PAGES_WRITTEN_RATE      double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_GET        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        HIT_RATE        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        YOUNG_MAKE_PER_THOUSAND_GETS    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NOT_YOUNG_MAKE_PER_THOUSAND_GETS        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_PAGES_READ_AHEAD bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        NUMBER_READ_AHEAD_EVICTED       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        READ_AHEAD_RATE double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        READ_AHEAD_EVICTED_RATE double  NULL    NULL    NULL    NULL    double
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        LRU_IO_TOTAL    bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        LRU_IO_CURRENT  bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        UNCOMPRESS_TOTAL        bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_BUFFER_POOL_STATS        UNCOMPRESS_CURRENT      bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_CHANGED_PAGES    space_id        int     NULL    NULL    NULL    NULL    int(11) unsigned
+NULL    information_schema      INNODB_CHANGED_PAGES    page_id int     NULL    NULL    NULL    NULL    int(11) unsigned
+NULL    information_schema      INNODB_CHANGED_PAGES    start_lsn       bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
+NULL    information_schema      INNODB_CHANGED_PAGES    end_lsn bigint  NULL    NULL    NULL    NULL    bigint(21) unsigned
 NULL    information_schema      INNODB_CMP      page_size       int     NULL    NULL    NULL    NULL    int(5)
 NULL    information_schema      INNODB_CMP      compress_ops    int     NULL    NULL    NULL    NULL    int(11)
 NULL    information_schema      INNODB_CMP      compress_ops_ok int     NULL    NULL    NULL    NULL    int(11)
@@ -850,9 +989,6 @@ NULL	information_schema	PARTITIONS	CHECK
 3.0000  information_schema      PARTITIONS      PARTITION_COMMENT       varchar 80      240     utf8    utf8_general_ci varchar(80)
 3.0000  information_schema      PARTITIONS      NODEGROUP       varchar 12      36      utf8    utf8_general_ci varchar(12)
 3.0000  information_schema      PARTITIONS      TABLESPACE_NAME varchar 64      192     utf8    utf8_general_ci varchar(64)
-NULL    information_schema      PBXT_STATISTICS ID      int     NULL    NULL    NULL    NULL    int(4)
-3.0000  information_schema      PBXT_STATISTICS Name    varchar 40      120     utf8    utf8_general_ci varchar(40)
-NULL    information_schema      PBXT_STATISTICS Value   bigint  NULL    NULL    NULL    NULL    bigint(8)
 3.0000  information_schema      PLUGINS PLUGIN_NAME     varchar 64      192     utf8    utf8_general_ci varchar(64)
 3.0000  information_schema      PLUGINS PLUGIN_VERSION  varchar 20      60      utf8    utf8_general_ci varchar(20)
 3.0000  information_schema      PLUGINS PLUGIN_STATUS   varchar 10      30      utf8    utf8_general_ci varchar(10)
@@ -1038,7 +1174,3 @@ NULL	information_schema	USER_STATISTICS
 3.0000  information_schema      VIEWS   CHARACTER_SET_CLIENT    varchar 32      96      utf8    utf8_general_ci varchar(32)
 3.0000  information_schema      VIEWS   COLLATION_CONNECTION    varchar 32      96      utf8    utf8_general_ci varchar(32)
 3.0000  information_schema      XTRADB_ADMIN_COMMAND    result_message  varchar 1024    3072    utf8    utf8_general_ci varchar(1024)
-3.0000  information_schema      XTRADB_ENHANCEMENTS     name    varchar 255     765     utf8    utf8_general_ci varchar(255)
-3.0000  information_schema      XTRADB_ENHANCEMENTS     description     varchar 255     765     utf8    utf8_general_ci varchar(255)
-3.0000  information_schema      XTRADB_ENHANCEMENTS     comment varchar 100     300     utf8    utf8_general_ci varchar(100)
-3.0000  information_schema      XTRADB_ENHANCEMENTS     link    varchar 255     765     utf8    utf8_general_ci varchar(255)

=== modified file 'mysql-test/suite/funcs_1/t/is_columns_is.test'
--- a/mysql-test/suite/funcs_1/t/is_columns_is.test	2010-08-17 07:14:46 +0000
+++ b/mysql-test/suite/funcs_1/t/is_columns_is.test	2012-11-09 09:56:27 +0000
@@ -16,8 +16,6 @@
 #
 
 --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_xtradb.inc
 

=== modified file 'mysql-test/t/information_schema_all_engines.test'
--- a/mysql-test/t/information_schema_all_engines.test	2012-01-09 11:49:47 +0000
+++ b/mysql-test/t/information_schema_all_engines.test	2012-11-09 10:54:48 +0000
@@ -3,7 +3,6 @@
 # available (since these engines inject tables into INFORMATION_SCHEMA).
 
 --source include/not_embedded.inc
---source include/have_pbxt.inc
 --source include/have_innodb.inc
 --source include/not_staging.inc
 
@@ -16,6 +15,7 @@ show tables;
 # Bug#18925: subqueries with MIN/MAX functions on INFORMATION_SCHEMA 
 #
 
+--sorted_result
 SELECT t.table_name, c1.column_name
   FROM information_schema.tables t
        INNER JOIN
@@ -30,6 +30,7 @@ SELECT t.table_name, c1.column_name
                   c2.table_name = t.table_name AND
                   c2.column_name LIKE '%SCHEMA%'
         ) order by t.table_name;
+--sorted_result
 SELECT t.table_name, c1.column_name
   FROM information_schema.tables t
        INNER JOIN



More information about the commits mailing list