diff options
| author | unknown <dellis@goetia.(none)> | 2004-10-17 18:47:08 -0500 |
|---|---|---|
| committer | unknown <dellis@goetia.(none)> | 2004-10-17 18:47:08 -0500 |
| commit | 38e717ea13bafb1d63865b6b326e78732b6b988b (patch) | |
| tree | 3682568bcab37798317eac13f759dc77cf04613c /sql/mysqld.cc | |
| parent | 09da504c1c8a497cd73c43834c5d5ed0128d2521 (diff) | |
| parent | 5dfa8d859be85f14e60771fb31693c68d8eee26c (diff) | |
| download | mariadb-git-38e717ea13bafb1d63865b6b326e78732b6b988b.tar.gz | |
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
sql/mysqld.cc:
Auto merged
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 8b478882451..226d4c113a5 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4149,7 +4149,7 @@ replicating a LOAD DATA INFILE command", {"key_buffer_size", OPT_KEY_BUFFER_SIZE, "The size of the buffer used for index blocks. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford; 64M on a 256M machine that mainly runs MySQL is quite common.", (gptr*) &keybuff_size, (gptr*) &keybuff_size, 0, GET_ULL, - REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, (long) ~0, MALLOC_OVERHEAD, + REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, UINT_MAX32, MALLOC_OVERHEAD, IO_SIZE, 0}, {"long_query_time", OPT_LONG_QUERY_TIME, "Log all queries that have taken more than long_query_time seconds to execute to file.", |