Automatic merge with 5.2

This commit is contained in:
Michael Widenius 2011-10-05 16:56:17 +03:00
commit 47d5a20b14
3 changed files with 10 additions and 28 deletions

View file

@ -7797,7 +7797,7 @@ each time the SQL thread starts.",
"Define threads usage for handling queries: "
"one-thread-per-connection"
#if HAVE_POOL_OF_THREADS == 1
", pool-of-threads"
", pool-of-threads "
#endif
"or no-threads.",
&opt_thread_handling, &opt_thread_handling,