diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-11 18:35:22 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-11 18:35:22 +0200 |
| commit | 8fa10c00699dae2b41a4d75500db245735a7b6cf (patch) | |
| tree | f0a6d77f5bdd6be6f4eb0e98e8df98ef89609e36 /mysql-test/include/default_mysqld.cnf | |
| parent | 667ab3664a7421cd441128fafd7546293b1471c7 (diff) | |
| download | mariadb-git-8fa10c00699dae2b41a4d75500db245735a7b6cf.tar.gz | |
importing Vlad's fix which should eliminate many Windows test failures.
Putting back Summit defaults (removing them didn't seem to have a good effect on pushbuild2).
Diffstat (limited to 'mysql-test/include/default_mysqld.cnf')
| -rw-r--r-- | mysql-test/include/default_mysqld.cnf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index 6eeec679383..f7a3b7a17f3 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -13,12 +13,12 @@ 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_write_io_threads= 2 -#loose-innodb_read_io_threads= 2 -#loose-innodb_log_buffer_size= 4M -#loose-innodb_log_file_size= 32M +loose-innodb_data_file_path= ibdata1:10M:autoextend +loose-innodb_buffer_pool_size= 64M +loose-innodb_write_io_threads= 2 +loose-innodb_read_io_threads= 2 +loose-innodb_log_buffer_size= 4M +loose-innodb_log_file_size= 32M slave-net-timeout=120 |