Commit 40e08db4 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-release 

into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new


mysql-test/r/innodb.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 6848d07f 81467f2b

mysql-test/r/innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -1822,7 +1822,7 @@ Variable_name Value 
innodb_sync_spin_loops	20

show variables like "innodb_thread_concurrency";

Variable_name	Value

innodb_thread_concurrency	20

innodb_thread_concurrency	8

set global innodb_thread_concurrency=1001;

show variables like "innodb_thread_concurrency";

Variable_name	Value

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -5842,7 +5842,7 @@ log and this option does nothing anymore.", 
  {"innodb_thread_concurrency", OPT_INNODB_THREAD_CONCURRENCY,

   "Helps in performance tuning in heavily concurrent environments.",

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

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

   0, GET_LONG, REQUIRED_ARG, 8, 1, 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",