Commit 45945b84 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/alexi/bugs/mysql-5.0-15868
parents a67450b7 e9ea2961

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -5531,7 +5531,7 @@ log and this option does nothing anymore.", 
   "Sets the maximum number of threads allowed inside InnoDB. Value 0"

   " will disable the thread throttling.",

   (gptr*) &srv_thread_concurrency, (gptr*) &srv_thread_concurrency,

   0, GET_LONG, REQUIRED_ARG, 0, 0, 1000, 0, 1, 0},

   0, GET_LONG, REQUIRED_ARG, 8, 0, 1000, 0, 1, 0},

  {"innodb_thread_sleep_delay", OPT_INNODB_THREAD_SLEEP_DELAY,

   "Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0"

    " disable a sleep",