bzr commit into mysql-5.1 branch (guilhem:2869)

[Guilhem Bichot]

#At file:///home/mysql_src/bzrrepos/mysql-trunk2-merge-from-5.1-main/ based on revid:guilhem@stripped

 2869 Guilhem Bichot	2009-08-12
      8M was too small for the InnoDB data file, needs 10M.
      Updating test for smaller InnoDB buffer pool size used by the testsuite.

    modified:
      mysql-test/include/default_mysqld.cnf
      mysql-test/r/innodb.result
      mysql-test/t/innodb.test
=== modified file 'mysql-test/include/default_mysqld.cnf'
--- a/mysql-test/include/default_mysqld.cnf	2009-08-12 13:48:47 +0000
+++ b/mysql-test/include/default_mysqld.cnf	2009-08-12 14:39:50 +0000
@@ -13,7 +13,7 @@ key_buffer_size=            1M
 sort_buffer=                256K
 max_heap_table_size=        1M
 
-loose-innodb_data_file_path=      ibdata1:8M:autoextend
+loose-innodb_data_file_path=      ibdata1:10M:autoextend
 loose-innodb_buffer_pool_size=    8M
 loose-innodb_write_io_threads=    2
 loose-innodb_read_io_threads=     2

=== modified file 'mysql-test/r/innodb.result'
--- a/mysql-test/r/innodb.result	2009-08-07 20:04:53 +0000
+++ b/mysql-test/r/innodb.result	2009-08-12 14:39:50 +0000
@@ -1738,7 +1738,7 @@ count(*)
 drop table t1;
 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
 variable_value
-4095
+512
 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size';
 variable_value
 16384

=== modified file 'mysql-test/t/innodb.test'
--- a/mysql-test/t/innodb.test	2009-08-07 20:04:53 +0000
+++ b/mysql-test/t/innodb.test	2009-08-12 14:39:50 +0000
@@ -1317,8 +1317,8 @@ drop table t1;
 
 # Test for testable InnoDB status variables. This test
 # uses previous ones(pages_created, rows_deleted, ...).
-# We get one of 4095 or 4096 randomly
---replace_result 4096 4095
+# We get one of 511 or 512 randomly
+--replace_result 511 512
 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';


Attachment: [text/bzr-bundle] bzr/[e-mail]