diff options
| author | unknown <svoj@may.pils.ru> | 2006-06-19 16:11:23 +0500 |
|---|---|---|
| committer | unknown <svoj@may.pils.ru> | 2006-06-19 16:11:23 +0500 |
| commit | eeb29b5f70a4a6eeb143a2921d4dcc2b65bba013 (patch) | |
| tree | f601cdd1e2ff164cd0adb1c61b96df802335e7ff | |
| parent | e2097100f864d88df644237c79e27081b53b79ee (diff) | |
| parent | 64b82dfdb756e13b887078151e1a576b9eb9698c (diff) | |
| download | mariadb-git-eeb29b5f70a4a6eeb143a2921d4dcc2b65bba013.tar.gz | |
Merge april:devel/BitKeeper/mysql-5.0-engines
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
| -rw-r--r-- | include/my_global.h | 3 | ||||
| -rw-r--r-- | sql/mysqld.cc | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/my_global.h b/include/my_global.h index e7205c94c18..c9f27e0031e 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -735,6 +735,9 @@ typedef SOCKET_SIZE_TYPE size_socket; #define DBL_MAX 1.79769313486231470e+308 #define FLT_MAX ((float)3.40282346638528860e+38) #endif +#ifndef SSIZE_MAX +#define SSIZE_MAX ((~((size_t) 0)) / 2) +#endif #if !defined(HAVE_ISINF) && !defined(isinf) #define isinf(X) 0 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ae5e85ca15f..d7a38d6b715 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5872,7 +5872,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, @@ -5883,12 +5884,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.", |