diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-06 22:31:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-06 22:31:30 +0200 |
| commit | b838d081ad346e52787753b1799c627922c4a6c7 (patch) | |
| tree | dc8f1e21e6b40d5b72668571c570c9a3214fbf32 /mysql-test/include/default_mysqld.cnf | |
| parent | 824db55ce53963a64fcf648b54500df22c57e9b2 (diff) | |
| parent | 72c36f4415815d55ddb82b23682f3c549906c00e (diff) | |
| download | mariadb-git-b838d081ad346e52787753b1799c627922c4a6c7.tar.gz | |
mysql-5.5.33 merge
Diffstat (limited to 'mysql-test/include/default_mysqld.cnf')
| -rw-r--r-- | mysql-test/include/default_mysqld.cnf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf index 8f2f96f3320..96848c39f11 100644 --- a/mysql-test/include/default_mysqld.cnf +++ b/mysql-test/include/default_mysqld.cnf @@ -1,4 +1,4 @@ -# Copyright (c) 2007, 2010, Oracle and/or its affiliates +# Copyright (c) 2007, 2013, Oracle and/or its affiliates # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ port-open-timeout=10 log-bin-trust-function-creators=1 key_buffer_size= 1M -sort_buffer= 256K +sort_buffer_size= 256K max_heap_table_size= 1M loose-aria-pagecache-buffer-size=8M |