bk commit into 5.1 tree (elliot:1.2170)

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
5.1 repository of emurphy. When emurphy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2170 06/05/26 17:18:20 elliot@stripped +2 -0
  Merge mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-release
  into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new

  sql/mysqld.cc
    1.550 06/05/26 17:18:16 elliot@stripped +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.178 06/05/26 17:18:15 elliot@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	elliot
# Host:	scared.(none)
# Root:	/home/emurphy/src/bk-clean/mysql-5.1-new/RESYNC

--- 1.549/sql/mysqld.cc	2006-05-24 08:57:37 -04:00
+++ 1.550/sql/mysqld.cc	2006-05-26 17:18:16 -04:00
@@ -5842,7 +5842,7 @@
   {"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",

--- 1.177/mysql-test/r/innodb.result	2006-05-10 03:54:03 -04:00
+++ 1.178/mysql-test/r/innodb.result	2006-05-26 17:18:15 -04:00
@@ -1822,7 +1822,7 @@
 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