bk commit into 5.0 tree (marko:1.1866)

[Marko Mäkelä]

Below is the list of changes that have just been committed into a local
5.0 repository of marko. When marko 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.1866 05/05/03 10:41:40 marko@stripped +2 -0
  InnoDB: Set innodb_thread_concurrency=1000 by default.

  sql/mysqld.cc
    1.457 05/05/03 10:41:31 marko@stripped +1 -1
    innodb_thread_concurrency: Set default value to 1000.

  sql/ha_innodb.cc
    1.199 05/05/03 10:41:30 marko@stripped +2 -2
    Add UNIV_LIKELY hints to srv_thread_concurrency tests.

# 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:	marko
# Host:	hundin.mysql.fi
# Root:	/home/marko/mysql-5.0

--- 1.456/sql/mysqld.cc	Sat Apr 16 04:35:46 2005
+++ 1.457/sql/mysqld.cc	Tue May  3 10:41:31 2005
@@ -5170,7 +5170,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, 8, 1, 1000, 0, 1, 0},
+   0, GET_LONG, REQUIRED_ARG, 1000, 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.198/sql/ha_innodb.cc	Fri Apr 22 14:07:34 2005
+++ 1.199/sql/ha_innodb.cc	Tue May  3 10:41:30 2005
@@ -279,7 +279,7 @@
 /*=========================*/
 	trx_t*	trx)	/* in: transaction handle */
 {
-	if (srv_thread_concurrency >= 500) {
+	if (UNIV_LIKELY(srv_thread_concurrency >= 500)) {
 
 		return;
 	}
@@ -296,7 +296,7 @@
 /*========================*/
 	trx_t*	trx)	/* in: transaction handle */
 {
-	if (srv_thread_concurrency >= 500) {
+	if (UNIV_LIKELY(srv_thread_concurrency >= 500)) {
 
 		return;
 	}