diff options
| author | monty@donna.mysql.fi <> | 2001-05-17 00:46:50 +0300 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-05-17 00:46:50 +0300 |
| commit | 2ba0846a60ac43e1ef477bdfd95c37901b6c7fe7 (patch) | |
| tree | bfa83a61c2689e0f64e7be02d414bcf366c068a1 /sql/mysqld.cc | |
| parent | b708df267d6fb180368f84405fbc06006a318f55 (diff) | |
| download | mariadb-git-2ba0846a60ac43e1ef477bdfd95c37901b6c7fe7.tar.gz | |
Fixed bug when using MERGE on files > 4G
Fixed bug in SELECT db1.table.* FROM db1.table,db2.table
Fixed bug in INSERT DELAYED when doing shutdown and a table was locked
Changed that tmp_table_size =4G-1 means unlimited.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c9e19b65a6c..7a0fb4ccddc 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2701,7 +2701,7 @@ CHANGEABLE_VAR changeable_vars[] = { 1024, 4, 8192*1024L, 0, 1 }, { "max_tmp_tables", (long*) &max_tmp_tables, 32, 1, ~0L, 0, 1 }, - { "max_user_connections", (long*) &max_user_connections, + { "max_user_connections", (long*) &max_user_connections, 0, 1, ~0L, 0, 1 }, { "max_write_lock_count", (long*) &max_write_lock_count, ~0L, 1, ~0L, 0, 1 }, @@ -2737,7 +2737,7 @@ CHANGEABLE_VAR changeable_vars[] = { { "thread_cache_size", (long*) &thread_cache_size, 0, 0, 16384, 0, 1 }, { "tmp_table_size", (long*) &tmp_table_size, - 1024*1024L, 1024, ~0L, MALLOC_OVERHEAD, 1 }, + 32*1024*1024L, 1024, ~0L, 0, 1 }, { "thread_stack", (long*) &thread_stack, DEFAULT_THREAD_STACK, 1024*32, ~0L, 0, 1024 }, { "wait_timeout", (long*) &net_wait_timeout, |