Commit 310c4705 authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
parents daa3ebb6 6dc280da

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ AC_PREREQ(2.58)dnl Minimum Autoconf version required. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# Don't forget to also update the NDB lines below.

AM_INIT_AUTOMAKE(mysql, 5.0.9-beta)

AM_INIT_AUTOMAKE(mysql, 5.0.10-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -17,7 +17,7 @@ SHARED_LIB_VERSION=14:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=9

NDB_VERSION_BUILD=10

NDB_VERSION_STATUS="beta"



# Set all version vars based on $VERSION. How do we do this more elegant ?

innobase/include/srv0srv.h

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ extern mutex_t* kernel_mutex_temp;/* mutex protecting the server, trx structs, 
#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 */

innobase/srv/srv0srv.c

+3 −14
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ 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. */



ulong	srv_thread_concurrency	= 8;

ulong	srv_thread_concurrency	= SRV_CONCURRENCY_THRESHOLD;



os_fast_mutex_t	srv_conc_mutex;		/* this mutex protects srv_conc data

					structures */
@@ -983,12 +983,6 @@ srv_conc_enter_innodb( 
	srv_conc_slot_t*	slot	  = NULL;

	ulint			i;



	if (srv_thread_concurrency >= 500) {

		/* Disable the concurrency check */

	

		return;

	}



	/* If trx has 'free tickets' to enter the engine left, then use one

	such ticket */
@@ -1134,7 +1128,7 @@ srv_conc_force_enter_innodb( 
	trx_t*	trx)	/* in: transaction object associated with the

			thread */

{

	if (srv_thread_concurrency >= 500) {

	if (srv_thread_concurrency >= SRV_CONCURRENCY_THRESHOLD) {

	

		return;

	}
@@ -1160,7 +1154,7 @@ srv_conc_force_exit_innodb( 
{

	srv_conc_slot_t*	slot	= NULL;



	if (srv_thread_concurrency >= 500) {

	if (srv_thread_concurrency >= SRV_CONCURRENCY_THRESHOLD) {

	

		return;

	}
@@ -1212,11 +1206,6 @@ srv_conc_exit_innodb( 
	trx_t*	trx)	/* in: transaction object associated with the

			thread */

{

	if (srv_thread_concurrency >= 500) {

	

		return;

	}



	if (trx->n_tickets_to_enter_innodb > 0) {

		/* We will pretend the thread is still inside InnoDB though it

		now leaves the InnoDB engine. In this way we save

sql/ha_innodb.cc

+2 −2
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ innodb_srv_conc_enter_innodb( 
/*=========================*/

	trx_t*	trx)	/* in: transaction handle */

{

	if (UNIV_LIKELY(srv_thread_concurrency >= 20)) {

	if (UNIV_LIKELY(srv_thread_concurrency >= SRV_CONCURRENCY_THRESHOLD)) {



		return;

	}
@@ -343,7 +343,7 @@ innodb_srv_conc_exit_innodb( 
/*========================*/

	trx_t*	trx)	/* in: transaction handle */

{

	if (UNIV_LIKELY(srv_thread_concurrency >= 20)) {

	if (UNIV_LIKELY(srv_thread_concurrency >= SRV_CONCURRENCY_THRESHOLD)) {



		return;

	}