diff options
| author | unknown <kaa@polly.(none)> | 2007-10-02 11:32:33 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-10-02 11:32:33 +0400 |
| commit | 73cb92767d4e4b4e16c56dfe3d82304472274933 (patch) | |
| tree | 214763ff02015cbe872f8e196b15703bece7bd9b /sql/mysqld.cc | |
| parent | e25e0979b47cdf9178025e54e2fa0ab9a8207f65 (diff) | |
| parent | 05055a45b39067e69a6e560765ee8b7f4be22694 (diff) | |
| download | mariadb-git-73cb92767d4e4b4e16c56dfe3d82304472274933.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
into polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
sql/mysqld.cc:
Auto merged
include/keycache.h:
Manual merge.
include/my_global.h:
Manual merge.
include/my_sys.h:
Manual merge.
mysys/mf_keycache.c:
Manual merge.
mysys/my_largepage.c:
Manual merge.
mysys/my_malloc.c:
Manual merge.
mysys/safemalloc.c:
Manual merge.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2b7867b4e88..bc52af5609a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6244,7 +6244,7 @@ The minimum value for this variable is 4096.", "Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value.", (uchar**) &global_system_variables.read_buff_size, (uchar**) &max_system_variables.read_buff_size,0, GET_ULONG, REQUIRED_ARG, - 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, SSIZE_MAX, MALLOC_OVERHEAD, IO_SIZE, + 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, INT_MAX32, MALLOC_OVERHEAD, IO_SIZE, 0}, {"read_only", OPT_READONLY, "Make all non-temporary tables read-only, with the exception for replication (slave) threads and users with the SUPER privilege", @@ -6256,12 +6256,12 @@ The minimum value for this variable is 4096.", (uchar**) &global_system_variables.read_rnd_buff_size, (uchar**) &max_system_variables.read_rnd_buff_size, 0, GET_ULONG, REQUIRED_ARG, 256*1024L, IO_SIZE*2+MALLOC_OVERHEAD, - SSIZE_MAX, MALLOC_OVERHEAD, IO_SIZE, 0}, + INT_MAX32, MALLOC_OVERHEAD, IO_SIZE, 0}, {"record_buffer", OPT_RECORD_BUFFER, "Alias for read_buffer_size", (uchar**) &global_system_variables.read_buff_size, (uchar**) &max_system_variables.read_buff_size,0, GET_ULONG, REQUIRED_ARG, - 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, SSIZE_MAX, MALLOC_OVERHEAD, IO_SIZE, 0}, + 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, INT_MAX32, MALLOC_OVERHEAD, IO_SIZE, 0}, #ifdef HAVE_REPLICATION {"relay_log_purge", OPT_RELAY_LOG_PURGE, "0 = do not purge relay logs. 1 = purge them as soon as they are no more needed.", |