diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-10-06 13:11:06 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-10-06 13:11:06 +0300 |
| commit | 00a2f36bbf22a4d8b2367724e7919c0603cf6f71 (patch) | |
| tree | 71973f36df84d2f49752b01d6d18df9ec76f710c /support-files | |
| parent | 7d66e48d129ea46ace7c0d5dd67e39b3bae749ba (diff) | |
| parent | ab428381ab27ffd04d44503a9dd0dd8d0ec3f27d (diff) | |
| download | mariadb-git-00a2f36bbf22a4d8b2367724e7919c0603cf6f71.tar.gz | |
Automatic merge with 5.1
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/my-huge.cnf.sh | 2 | ||||
| -rw-r--r-- | support-files/my-large.cnf.sh | 2 | ||||
| -rw-r--r-- | support-files/my-medium.cnf.sh | 2 | ||||
| -rw-r--r-- | support-files/my-small.cnf.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index 17a7ddb5855..27ef0e5cc07 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -25,7 +25,7 @@ socket = @MYSQL_UNIX_ADDR@ [mysqld] port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ -skip-locking +skip-external-locking key_buffer_size = 384M max_allowed_packet = 1M table_open_cache = 512 diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh index bbdfdb32a96..812009136f1 100644 --- a/support-files/my-large.cnf.sh +++ b/support-files/my-large.cnf.sh @@ -25,7 +25,7 @@ socket = @MYSQL_UNIX_ADDR@ [mysqld] port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ -skip-locking +skip-external-locking key_buffer_size = 256M max_allowed_packet = 1M table_open_cache = 256 diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh index 88113d0a8d4..8fd62eaf958 100644 --- a/support-files/my-medium.cnf.sh +++ b/support-files/my-medium.cnf.sh @@ -26,7 +26,7 @@ socket = @MYSQL_UNIX_ADDR@ [mysqld] port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ -skip-locking +skip-external-locking key_buffer_size = 16M max_allowed_packet = 1M table_open_cache = 64 diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh index 7dce9e60ed9..c0a86ae9671 100644 --- a/support-files/my-small.cnf.sh +++ b/support-files/my-small.cnf.sh @@ -26,7 +26,7 @@ socket = @MYSQL_UNIX_ADDR@ [mysqld] port = @MYSQL_TCP_PORT@ socket = @MYSQL_UNIX_ADDR@ -skip-locking +skip-external-locking key_buffer_size = 16K max_allowed_packet = 1M table_open_cache = 4 |