From 18ef367e5167180857fc51db3706f46589208248 Mon Sep 17 00:00:00 2001 From: Vasil Dimov <vasil.dimov@oracle.com> Date: Wed, 12 May 2010 12:13:50 +0300 Subject: [PATCH] Fix the failing innodb.innodb test. Support returning 512 and 511 pages for the buffer pool size, this is undeterministic and probably depends on alignment issues. The default buffer pool size is 8M (512) pages, which is set in include/default_mysqld.cnf. So the previous "replace_result 8192 8191" had no effect. --- mysql-test/suite/innodb/r/innodb.result | 2 +- mysql-test/suite/innodb/t/innodb.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result index b8b6624f83c..427df076eaf 100644 --- a/mysql-test/suite/innodb/r/innodb.result +++ b/mysql-test/suite/innodb/r/innodb.result @@ -1661,7 +1661,7 @@ count(*) drop table t1; SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; variable_value -512 +511 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; variable_value 16384 diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test index 44850ff0131..f15d9747ee4 100644 --- a/mysql-test/suite/innodb/t/innodb.test +++ b/mysql-test/suite/innodb/t/innodb.test @@ -1302,7 +1302,7 @@ drop table t1; # Test for testable InnoDB status variables. This test # uses previous ones(pages_created, rows_deleted, ...). ---replace_result 8192 8191 +--replace_result 512 511 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total'; SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; SELECT variable_value - @innodb_rows_deleted_orig FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_rows_deleted'; -- 2.30.9