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 15:55:53 marko@stripped +3 -0
  InnoDB: Disable throttling against thread thrashing by default.

  sql/mysqld.cc
    1.457 05/05/03 15:55:44 marko@stripped +1 -1
    Make innodb_thread_concurrency=20 by default (it was 8).

  sql/ha_innodb.h
    1.93 05/05/03 15:55:44 marko@stripped +1 -1
    Remove unused variable innobase_thread_concurrency.

  sql/ha_innodb.cc
    1.199 05/05/03 15:55:43 marko@stripped +3 -4
    Remove unused variable innobase_thread_concurrency.
    Add UNIV_LIKELY hints to srv_thread_concurrency tests
    and lower the limit from 500 to 20.

# 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 15:55:44 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, 20, 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 15:55:43 2005
@@ -98,8 +98,7 @@
      innobase_buffer_pool_awe_mem_mb,
      innobase_buffer_pool_size, innobase_additional_mem_pool_size,
      innobase_file_io_threads, innobase_lock_wait_timeout,
-     innobase_thread_concurrency, innobase_force_recovery,
-     innobase_open_files;
+     innobase_force_recovery, innobase_open_files;
 
 /* The default values for the following char* start-up parameters
 are determined in innobase_init below: */
@@ -279,7 +278,7 @@
 /*=========================*/
 	trx_t*	trx)	/* in: transaction handle */
 {
-	if (srv_thread_concurrency >= 500) {
+	if (UNIV_LIKELY(srv_thread_concurrency >= 20)) {
 
 		return;
 	}
@@ -296,7 +295,7 @@
 /*========================*/
 	trx_t*	trx)	/* in: transaction handle */
 {
-	if (srv_thread_concurrency >= 500) {
+	if (UNIV_LIKELY(srv_thread_concurrency >= 20)) {
 
 		return;
 	}

--- 1.92/sql/ha_innodb.h	Fri Apr 15 19:00:27 2005
+++ 1.93/sql/ha_innodb.h	Tue May  3 15:55:44 2005
@@ -219,7 +219,7 @@
 extern long innobase_buffer_pool_size, innobase_additional_mem_pool_size;
 extern long innobase_buffer_pool_awe_mem_mb;
 extern long innobase_file_io_threads, innobase_lock_wait_timeout;
-extern long innobase_force_recovery, innobase_thread_concurrency;
+extern long innobase_force_recovery;
 extern long innobase_open_files;
 extern char *innobase_data_home_dir, *innobase_data_file_path;
 extern char *innobase_log_group_home_dir, *innobase_log_arch_dir;