bk commit into 5.0 tree (marko:1.1908)

[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.1908 05/07/12 13:47:58 marko@stripped +4 -0
  InnoDB: Set innodb_thread_concurrency=0 by default and make the
  value 0 disable the concurrency checks.

  sql/mysqld.cc
    1.480 05/07/12 13:47:48 marko@stripped +4 -2
    Set innodb_thread_concurrency=0 by default.

  sql/ha_innodb.cc
    1.227 05/07/12 13:47:47 marko@stripped +2 -2
    Remove SRV_CONCURRENCY_THRESHOLD.  0 will disable the checks now.

  innobase/srv/srv0srv.c
    1.92 05/07/12 13:47:47 marko@stripped +5 -4
    Remove SRV_CONCURRENCY_THRESHOLD.  0 will disable the checks now.

  innobase/include/srv0srv.h
    1.56 05/07/12 13:47:47 marko@stripped +0 -1
    Remove SRV_CONCURRENCY_THRESHOLD.

# 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-current

--- 1.479/sql/mysqld.cc	2005-07-12 11:56:26 +03:00
+++ 1.480/sql/mysqld.cc	2005-07-12 13:47:48 +03:00
@@ -5236,9 +5236,11 @@
    (gptr*) &srv_n_spin_wait_rounds,
    0, GET_LONG, REQUIRED_ARG, 20L, 0L, ~0L, 0, 1L, 0},
   {"innodb_thread_concurrency", OPT_INNODB_THREAD_CONCURRENCY,
-   "Helps in performance tuning in heavily concurrent environments.",
+   "Helps in performance tuning in heavily concurrent environments. "
+   "Sets the maximum number of threads allowed inside InnoDB. Value 0"
+   " will disable the thread throttling.",
    (gptr*) &srv_thread_concurrency, (gptr*) &srv_thread_concurrency,
-   0, GET_LONG, REQUIRED_ARG, 20, 1, 1000, 0, 1, 0},
+   0, GET_LONG, REQUIRED_ARG, 0, 0, 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.55/innobase/include/srv0srv.h	2005-07-06 09:38:21 +03:00
+++ 1.56/innobase/include/srv0srv.h	2005-07-12 13:47:47 +03:00
@@ -182,7 +182,6 @@
 #define kernel_mutex (*kernel_mutex_temp)
 
 #define SRV_MAX_N_IO_THREADS	100
-#define SRV_CONCURRENCY_THRESHOLD	20
 				
 /* Array of English strings describing the current state of an
 i/o handler thread */

--- 1.91/innobase/srv/srv0srv.c	2005-07-12 11:56:26 +03:00
+++ 1.92/innobase/srv/srv0srv.c	2005-07-12 13:47:47 +03:00
@@ -258,9 +258,10 @@
 we could get a deadlock. MySQL creates a thread for each user session, and
 semaphore contention and convoy problems can occur withput this restriction.
 Value 10 should be good if there are less than 4 processors + 4 disks in the
-computer. Bigger computers need bigger values. */
+computer. Bigger computers need bigger values. Value 0 will disable the
+concurrency check. */
 
-ulong	srv_thread_concurrency	= SRV_CONCURRENCY_THRESHOLD;
+ulong	srv_thread_concurrency	= 0;
 
 os_fast_mutex_t	srv_conc_mutex;		/* this mutex protects srv_conc data
 					structures */
@@ -1128,7 +1129,7 @@
 	trx_t*	trx)	/* in: transaction object associated with the
 			thread */
 {
-	if (srv_thread_concurrency >= SRV_CONCURRENCY_THRESHOLD) {
+	if (UNIV_LIKELY(!srv_thread_concurrency)) {
 	
 		return;
 	}
@@ -1154,7 +1155,7 @@
 {
 	srv_conc_slot_t*	slot	= NULL;
 
-	if (srv_thread_concurrency >= SRV_CONCURRENCY_THRESHOLD) {
+	if (UNIV_LIKELY(!srv_thread_concurrency)) {
 	
 		return;
 	}

--- 1.226/sql/ha_innodb.cc	2005-07-12 11:56:26 +03:00
+++ 1.227/sql/ha_innodb.cc	2005-07-12 13:47:47 +03:00
@@ -325,7 +325,7 @@
 /*=========================*/
 	trx_t*	trx)	/* in: transaction handle */
 {
-	if (UNIV_LIKELY(srv_thread_concurrency >= SRV_CONCURRENCY_THRESHOLD)) {
+	if (UNIV_LIKELY(!srv_thread_concurrency)) {
 
 		return;
 	}
@@ -342,7 +342,7 @@
 /*========================*/
 	trx_t*	trx)	/* in: transaction handle */
 {
-	if (UNIV_LIKELY(srv_thread_concurrency >= SRV_CONCURRENCY_THRESHOLD)) {
+	if (UNIV_LIKELY(!srv_thread_concurrency)) {
 
 		return;
 	}