Commit cd8a0833 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
parents 2e4b05d2 aeeb1992
...@@ -5531,7 +5531,7 @@ log and this option does nothing anymore.", ...@@ -5531,7 +5531,7 @@ log and this option does nothing anymore.",
"Sets the maximum number of threads allowed inside InnoDB. Value 0" "Sets the maximum number of threads allowed inside InnoDB. Value 0"
" will disable the thread throttling.", " will disable the thread throttling.",
(gptr*) &srv_thread_concurrency, (gptr*) &srv_thread_concurrency, (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, {"innodb_thread_sleep_delay", OPT_INNODB_THREAD_SLEEP_DELAY,
"Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0" "Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0"
" disable a sleep", " disable a sleep",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment