diff options
| author | unknown <svoj@may.pils.ru> | 2006-06-19 19:58:55 +0500 |
|---|---|---|
| committer | unknown <svoj@may.pils.ru> | 2006-06-19 19:58:55 +0500 |
| commit | b7326b1b874e8de7296dcff3063ccc889097deab (patch) | |
| tree | 272421979306cea7d8ad161444665ddb5d4f9b8c /sql/mysqld.cc | |
| parent | d575fc039f097d7d9943823cf9541890c5c3898a (diff) | |
| parent | 64b82dfdb756e13b887078151e1a576b9eb9698c (diff) | |
| download | mariadb-git-b7326b1b874e8de7296dcff3063ccc889097deab.tar.gz | |
Merge april:devel/BitKeeper/mysql-5.0-engines
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f2d7191f130..75e2720c13a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6156,7 +6156,8 @@ 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.", (gptr*) &global_system_variables.read_buff_size, (gptr*) &max_system_variables.read_buff_size,0, GET_ULONG, REQUIRED_ARG, - 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD, IO_SIZE, 0}, + 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, SSIZE_MAX, 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", (gptr*) &opt_readonly, @@ -6167,12 +6168,12 @@ The minimum value for this variable is 4096.", (gptr*) &global_system_variables.read_rnd_buff_size, (gptr*) &max_system_variables.read_rnd_buff_size, 0, GET_ULONG, REQUIRED_ARG, 256*1024L, IO_SIZE*2+MALLOC_OVERHEAD, - ~0L, MALLOC_OVERHEAD, IO_SIZE, 0}, + SSIZE_MAX, MALLOC_OVERHEAD, IO_SIZE, 0}, {"record_buffer", OPT_RECORD_BUFFER, "Alias for read_buffer_size", (gptr*) &global_system_variables.read_buff_size, (gptr*) &max_system_variables.read_buff_size,0, GET_ULONG, REQUIRED_ARG, - 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD, IO_SIZE, 0}, + 128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, SSIZE_MAX, 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.", |