diff options
| author | unknown <kaa@polly.(none)> | 2007-10-02 13:39:00 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-10-02 13:39:00 +0400 |
| commit | 309b7b1604896e2a18205c474def27a432f8ad04 (patch) | |
| tree | 717e314d66b77757c8ca777071d2b428ca468f29 | |
| parent | b76788a942d0cdc22dd7bd632ffc81dff645f6d8 (diff) | |
| parent | 79fcc28560292235b979faebb9eba12e8bd70e42 (diff) | |
| download | mariadb-git-309b7b1604896e2a18205c474def27a432f8ad04.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
| -rw-r--r-- | include/my_global.h | 4 | ||||
| -rw-r--r-- | sql/mysqld.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/my_global.h b/include/my_global.h index 12129523939..5979f6e5a3c 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -854,8 +854,8 @@ 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) +#ifndef SIZE_T_MAX +#define SIZE_T_MAX ~((size_t) 0) #endif #ifndef HAVE_FINITE diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b666261a762..a7a41496b88 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5988,7 +5988,7 @@ log and this option does nothing anymore.", (uchar**) &dflt_key_cache_var.param_buff_size, (uchar**) 0, 0, (GET_ULL | GET_ASK_ADDR), - REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, ~(ulong) 0, MALLOC_OVERHEAD, + REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, SIZE_T_MAX, MALLOC_OVERHEAD, IO_SIZE, 0}, {"key_cache_age_threshold", OPT_KEY_CACHE_AGE_THRESHOLD, "This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in key cache", @@ -6263,7 +6263,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", @@ -6275,12 +6275,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.", |