Commit 3817ff00 authored by unknown's avatar unknown
Browse files

Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 

into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0


sql/mysqld.cc:
  Auto merged
parents fff8ff08 d9a0ab48

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -5374,7 +5374,7 @@ The minimum value for this variable is 4096.", 
   (gptr*) &myisam_data_pointer_size, 0, GET_ULONG, REQUIRED_ARG,

   6, 2, 8, 0, 1, 0},

  {"myisam_max_extra_sort_file_size", OPT_MYISAM_MAX_EXTRA_SORT_FILE_SIZE,

   "Depricated option",

   "Deprecated option",

   (gptr*) &global_system_variables.myisam_max_extra_sort_file_size,

   (gptr*) &max_system_variables.myisam_max_extra_sort_file_size,

   0, GET_ULL, REQUIRED_ARG, (ulonglong) MI_MAX_TEMP_LENGTH,