Commit d8d3698b authored by kaa@polly.(none)'s avatar kaa@polly.(none)
Browse files

Merge polly.(none):/home/kaa/src/maint/bug5731.old/my50-bug5731-read_buffer_size 

into  polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
parents cfb88e65 8da409ac

include/my_global.h

+0 −3
Original line number Diff line number Diff line
@@ -780,9 +780,6 @@ 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



#ifndef HAVE_FINITE

#define finite(x) (1.0 / fabs(x) > 0.0)

sql/mysqld.cc

+3 −3
Original line number Diff line number Diff line
@@ -6091,7 +6091,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.",

   (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, 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",
@@ -6103,12 +6103,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,

   SSIZE_MAX, MALLOC_OVERHEAD, IO_SIZE, 0},

   INT_MAX32, 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, 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.",