diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-11 12:38:23 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-11 12:38:23 +0200 |
| commit | 667ab3664a7421cd441128fafd7546293b1471c7 (patch) | |
| tree | 65a51c7be6a231c297cdce75a99ed7ef09f57682 /mysql-test/include/default_mysqld.cnf | |
| parent | ff7a9ceadfaafd407b6bfaa26106b704ed76c767 (diff) | |
| download | mariadb-git-667ab3664a7421cd441128fafd7546293b1471c7.tar.gz | |
temporarily remove Summit defaults of InnoDB options, to see if it influences pushbuild2
sql/sql_insert.cc:
fix wrong merge
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 f7a3b7a17f3..6eeec679383 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 |