Commit 38e717ea authored by unknown's avatar unknown
Browse files

Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0 

into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/mysqld.cc:
  Auto merged
parents 09da504c 5dfa8d85

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ bk@admin.bk 
brian@brian-akers-computer.local

carsten@tsort.bitbybit.dk

davida@isil.mysql.com

dellis@goetia.(none)

dlenev@brandersnatch.localdomain

dlenev@build.mysql.com

dlenev@mysql.com

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -4149,7 +4149,7 @@ replicating a LOAD DATA INFILE command", 
  {"key_buffer_size", OPT_KEY_BUFFER_SIZE,

   "The size of the buffer used for index blocks. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford; 64M on a 256M machine that mainly runs MySQL is quite common.",

   (gptr*) &keybuff_size, (gptr*) &keybuff_size, 0, GET_ULL,

   REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, (long) ~0, MALLOC_OVERHEAD,

   REQUIRED_ARG, KEY_CACHE_SIZE, MALLOC_OVERHEAD, UINT_MAX32, MALLOC_OVERHEAD,

   IO_SIZE, 0},

  {"long_query_time", OPT_LONG_QUERY_TIME,

   "Log all queries that have taken more than long_query_time seconds to execute to file.",