diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-08-14 09:53:18 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-08-14 09:53:18 -0400 |
| commit | 873a0a437047a7528fc13e9ae17b4791cb3f6d5c (patch) | |
| tree | d7027c3b000918e98081356a979073f2ce1542dd /sql/mysqld.cc | |
| parent | 7a1ccf90d4f2ad0b9593baa5fd36ac38ae1a4938 (diff) | |
| parent | 6e2c8bac4c339dd7f9c059f0f71d2ab3e2303b01 (diff) | |
| download | mariadb-git-873a0a437047a7528fc13e9ae17b4791cb3f6d5c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index dd924b22163..c013b550ec9 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6223,7 +6223,7 @@ The minimum value for this variable is 4096.", "If an in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM table.", (gptr*) &global_system_variables.tmp_table_size, (gptr*) &max_system_variables.tmp_table_size, 0, GET_ULONG, - REQUIRED_ARG, 32*1024*1024L, 1024, ~0L, 0, 1, 0}, + REQUIRED_ARG, 16*1024*1024L, 1024, ~0L, 0, 1, 0}, /* See max_heap_table_size . */ {"transaction_alloc_block_size", OPT_TRANS_ALLOC_BLOCK_SIZE, "Allocation block size for transactions to be stored in binary log", (gptr*) &global_system_variables.trans_alloc_block_size, |