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

[Guilhem Bichot]

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

 2868 Guilhem Bichot	2009-08-12
      several tests fail with --mem --parallel because the InnoDB files fill /dev/shm;
      fix is to run the testsuite with the same InnoDB options (buffer pool size,
      log file size etc) as we always ran it for the InnoDB builtin in 5.1.

    modified:
      mysql-test/include/default_mysqld.cnf
=== modified file 'mysql-test/include/default_mysqld.cnf'
--- a/mysql-test/include/default_mysqld.cnf	2009-08-11 16:35:22 +0000
+++ b/mysql-test/include/default_mysqld.cnf	2009-08-12 13:48:47 +0000
@@ -13,12 +13,14 @@ key_buffer_size=            1M
 sort_buffer=                256K
 max_heap_table_size=        1M
 
-loose-innodb_data_file_path=      ibdata1:10M:autoextend
-loose-innodb_buffer_pool_size=    64M
+loose-innodb_data_file_path=      ibdata1:8M:autoextend
+loose-innodb_buffer_pool_size=    8M
 loose-innodb_write_io_threads=    2
 loose-innodb_read_io_threads=     2
-loose-innodb_log_buffer_size=     4M
-loose-innodb_log_file_size=       32M
+loose-innodb_log_buffer_size=     1M
+loose-innodb_log_file_size=       5M
+loose-innodb_additional_mem_pool_size= 1M
+loose-innodb_log_files_in_group=  2
 
 slave-net-timeout=120
 


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