diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-31 11:54:36 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-31 11:54:36 +0200 |
| commit | 5f6b100ed0eaacd644352972939a77f0a964c1af (patch) | |
| tree | db7782f75178512900e6e862142d57d3d0d96cf4 /support-files | |
| parent | 6de8b295a7dd53b47f7e0d4ebc109dabb07c6397 (diff) | |
| parent | a006453fad260a35df973a8785f0d9a8977c1cac (diff) | |
| download | mariadb-git-5f6b100ed0eaacd644352972939a77f0a964c1af.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
client/mysqlimport.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/gis.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_geofunc.cc:
Auto merged
sql/spatial.cc:
Auto merged
sql/spatial.h:
Auto merged
support-files/my-huge.cnf.sh:
Auto merged
support-files/my-innodb-heavy-4G.cnf.sh:
Auto merged
support-files/my-large.cnf.sh:
Auto merged
mysql-test/mysql-test-run.sh:
Merged from 4.1.
mysql-test/r/mysqldump.result:
Merged from 4.1.
mysql-test/t/gis.test:
Merged from 4.1.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/my-huge.cnf.sh | 2 | ||||
| -rw-r--r-- | support-files/my-innodb-heavy-4G.cnf.sh | 2 | ||||
| -rw-r--r-- | support-files/my-large.cnf.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index f7a47054658..5dc3e5a1900 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -33,7 +33,7 @@ sort_buffer_size = 2M read_buffer_size = 2M read_rnd_buffer_size = 8M myisam_sort_buffer_size = 64M -thread_cache = 8 +thread_cache_size = 8 query_cache_size = 32M # Try number of CPU's*2 for thread_concurrency thread_concurrency = 8 diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh index b3f43272a7d..77c6cea56d5 100644 --- a/support-files/my-innodb-heavy-4G.cnf.sh +++ b/support-files/my-innodb-heavy-4G.cnf.sh @@ -128,7 +128,7 @@ join_buffer_size = 8M # the amount of thread creations needed if you have a lot of new # connections. (Normally this doesn't give a notable performance # improvement if you have a good thread implementation.) -thread_cache = 8 +thread_cache_size = 8 # This permits the application to give the threads system a hint for the # desired number of threads that should be run at the same time. This diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh index 1e7d9f7aade..4dc3f929c48 100644 --- a/support-files/my-large.cnf.sh +++ b/support-files/my-large.cnf.sh @@ -33,7 +33,7 @@ sort_buffer_size = 1M read_buffer_size = 1M read_rnd_buffer_size = 4M myisam_sort_buffer_size = 64M -thread_cache = 8 +thread_cache_size = 8 query_cache_size= 16M # Try number of CPU's*2 for thread_concurrency thread_concurrency = 8 |