diff options
| author | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2007-03-29 12:25:28 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2007-03-29 12:25:28 +0200 |
| commit | e420488ee6e3b38a0524b391a96638af7edc06ce (patch) | |
| tree | 1e6d9e2f685ac0edc110cb4b215d1c1d82f25289 /sql/mysqld.cc | |
| parent | 8e1d4f725663d60b7efa7d5ec4271cbd924cad80 (diff) | |
| parent | ee0475bf5d5b9256d599aa6b9dcc641d4857d301 (diff) | |
| download | mariadb-git-e420488ee6e3b38a0524b391a96638af7edc06ce.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
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 99d66134405..aba46261dc8 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6126,12 +6126,12 @@ The minimum value for this variable is 4096.", (gptr*) &max_system_variables.tmp_table_size, 0, GET_ULL, REQUIRED_ARG, 32*1024*1024L, 1024, MAX_MEM_TABLE_SIZE, 0, 1, 0}, {"transaction_alloc_block_size", OPT_TRANS_ALLOC_BLOCK_SIZE, - "Allocation block size for transactions to be stored in binary log", + "Allocation block size for various transaction-related structures", (gptr*) &global_system_variables.trans_alloc_block_size, (gptr*) &max_system_variables.trans_alloc_block_size, 0, GET_ULONG, REQUIRED_ARG, QUERY_ALLOC_BLOCK_SIZE, 1024, ~0L, 0, 1024, 0}, {"transaction_prealloc_size", OPT_TRANS_PREALLOC_SIZE, - "Persistent buffer for transactions to be stored in binary log", + "Persistent buffer for various transaction-related structures", (gptr*) &global_system_variables.trans_prealloc_size, (gptr*) &max_system_variables.trans_prealloc_size, 0, GET_ULONG, REQUIRED_ARG, TRANS_ALLOC_PREALLOC_SIZE, 1024, ~0L, 0, 1024, 0}, |