Commit 496ffdc7 authored by unknown's avatar unknown
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into moonbone.local:/work/15028-bug-5.1-new-mysql
parents 3ddcb5d6 e74a1cb5

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -5770,7 +5770,7 @@ The minimum value for this variable is 4096.", 
   (gptr*) &max_system_variables.myisam_sort_buff_size, 0,

   GET_ULONG, REQUIRED_ARG, 8192*1024, 4, ~0L, 0, 1, 0},

  {"myisam_use_mmap", OPT_MYISAM_USE_MMAP,

   "Use memory mapping for read/write MyISAM tables",

   "Use memory mapping for reading and writing MyISAM tables",

   (gptr*) &opt_myisam_use_mmap,

   (gptr*) &opt_myisam_use_mmap, 0, GET_BOOL, NO_ARG, 0, 

    0, 0, 0, 0, 0},