diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-12 15:48:47 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-12 15:48:47 +0200 |
| commit | f3ec486f8249b74035b34dab998107f27d65bed5 (patch) | |
| tree | 1766eb25d21f5f0e184a8ec434ec548b0ad3e08e /mysql-test/include/default_mysqld.cnf | |
| parent | eceba8912c9af415f9704bb671ddb4022eb8d9fc (diff) | |
| download | mariadb-git-f3ec486f8249b74035b34dab998107f27d65bed5.tar.gz | |
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.
Diffstat (limited to 'mysql-test/include/default_mysqld.cnf')
| -rw-r--r-- | mysql-test/include/default_mysqld.cnf | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index f7a3b7a17f3..350a5bb39ce 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -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 |