#At lp:maria/5.2 based on revid:igor@askmonty.org-20100329211612-d7f7utiqasfk0ups 2744 Igor Babaev 2010-03-31 Adjusted results modified: mysql-test/r/key_cache.result mysql-test/suite/pbxt/r/mysqlshow.result mysql-test/t/key_cache.test === modified file 'mysql-test/r/key_cache.result' --- a/mysql-test/r/key_cache.result 2010-02-16 16:41:11 +0000 +++ b/mysql-test/r/key_cache.result 2010-03-31 18:45:41 +0000 @@ -467,18 +467,18 @@ Key_write_requests 26 Key_writes 6 select * from information_schema.key_caches; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES -default 2 1 1048576 1024 3 # 0 10 0 13 4 -default 2 2 1048576 1024 1 # 0 12 0 13 2 -default 2 NULL 2097152 1024 4 # 0 22 0 26 6 -small NULL NULL 1048576 1024 1 # 0 1 0 2 1 +default 2 1 1048576 1024 # # 0 10 0 13 4 +default 2 2 1048576 1024 # # 0 12 0 13 2 +default 2 NULL 2097152 1024 # # 0 22 0 26 6 +small NULL NULL 1048576 1024 # # 0 1 0 2 1 delete from t1; delete from t2; select * from information_schema.key_caches; KEY_CACHE_NAME PARTITIONS PARTITION_NUMBER FULL_SIZE BLOCK_SIZE USED_BLOCKS UNUSED_BLOCKS DIRTY_BLOCKS READ_REQUESTS READS WRITE_REQUESTS WRITES -default 2 1 1048576 1024 3 # 0 10 0 13 4 -default 2 2 1048576 1024 1 # 0 12 0 13 2 -default 2 NULL 2097152 1024 4 # 0 22 0 26 6 -small NULL NULL 1048576 1024 1 # 0 1 0 2 1 +default 2 1 1048576 1024 # # 0 10 0 13 4 +default 2 2 1048576 1024 # # 0 12 0 13 2 +default 2 NULL 2097152 1024 # # 0 22 0 26 6 +small NULL NULL 1048576 1024 # # 0 1 0 2 1 set global key_cache_partitions=1; select @@key_cache_partitions; @@key_cache_partitions === modified file 'mysql-test/suite/pbxt/r/mysqlshow.result' --- a/mysql-test/suite/pbxt/r/mysqlshow.result 2010-02-01 06:14:12 +0000 +++ b/mysql-test/suite/pbxt/r/mysqlshow.result 2010-03-31 18:45:41 +0000 @@ -91,6 +91,7 @@ Database: information_schema | GLOBAL_STATUS | | GLOBAL_VARIABLES | | INDEX_STATISTICS | +| KEY_CACHES | | KEY_COLUMN_USAGE | | PARTITIONS | | PLUGINS | @@ -144,6 +145,7 @@ Database: INFORMATION_SCHEMA | GLOBAL_STATUS | | GLOBAL_VARIABLES | | INDEX_STATISTICS | +| KEY_CACHES | | KEY_COLUMN_USAGE | | PARTITIONS | | PLUGINS | === modified file 'mysql-test/t/key_cache.test' --- a/mysql-test/t/key_cache.test 2010-02-16 16:41:11 +0000 +++ b/mysql-test/t/key_cache.test 2010-03-31 18:45:41 +0000 @@ -316,12 +316,12 @@ update t2 set i=2 where i=1; --replace_result 1808 KEY_BLOCKS_UNUSED 1670 KEY_BLOCKS_UNUSED show status like 'key_%'; ---replace_column 7 # +--replace_column 6 # 7 # select * from information_schema.key_caches; delete from t1; delete from t2; ---replace_column 7 # +--replace_column 6 # 7 # select * from information_schema.key_caches; # Check that we can work with one partition with the same results