Commit e646f8f2 authored by unknown's avatar unknown
Browse files

Merge with 4.0 


BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87:
  Auto merged
innobase/include/trx0sys.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
innobase/trx/trx0rseg.c:
  Auto merged
mysql-test/r/innodb-lock.result:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/mysqld.cc:
  Use local version during merge
parents 55833fb4 3bdd7e77

innobase/include/srv0srv.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ extern ibool srv_use_doublewrite_buf; 
extern ibool    srv_set_thread_priorities;

extern int      srv_query_thread_priority;



extern ulint	srv_max_purge_lag;

extern ibool	srv_use_awe;

extern ibool	srv_use_adaptive_hash_indexes;

innobase/srv/srv0srv.c

+2 −0
Original line number Diff line number Diff line
@@ -881,6 +881,8 @@ srv_general_init(void) 


/*======================= InnoDB Server FIFO queue =======================*/



/* Maximum allowable purge history length.  <=0 means 'infinite'. */

ulint	srv_max_purge_lag		= 0;



/*************************************************************************

Puts an OS thread to wait if there are too many concurrent threads

innobase/trx/trx0purge.c

+24 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,30 @@ trx_purge(void) 
		}

	}



	/* Determine how much data manipulation language (DML) statements

	need to be delayed in order to reduce the lagging of the purge

	thread. */

	srv_dml_needed_delay = 0; /* in microseconds; default: no delay */



	/* If we cannot advance the 'purge view' because of an old

	'consistent read view', then the DML statements cannot be delayed.

	Also, srv_max_purge_lag <= 0 means 'infinity'. */

	if (srv_max_purge_lag > 0

			&& !UT_LIST_GET_LAST(trx_sys->view_list)) {

		float	ratio = (float) trx_sys->rseg_history_len

				/ srv_max_purge_lag;

		if (ratio > ULINT_MAX / 10000) {

			/* Avoid overflow: maximum delay is 4295 seconds */

			srv_dml_needed_delay = ULINT_MAX;

		} else if (ratio > 1) {

			/* If the history list length exceeds the

			innodb_max_purge_lag, the

			data manipulation statements are delayed

			by at least 5000 microseconds. */

			srv_dml_needed_delay = (ulint) ((ratio - .5) * 10000);

		}

	}



	purge_sys->view = read_view_oldest_copy_or_open_new(NULL,

							purge_sys->heap);

	mutex_exit(&kernel_mutex);

mysql-test/r/query_cache.result

+13 −0
Original line number Diff line number Diff line
@@ -791,6 +791,19 @@ Qcache_queries_in_cache 1 
unlock table;

drop table t1,t2;

set query_cache_wlock_invalidate=default;

CREATE TABLE t1 (id INT PRIMARY KEY);

insert into t1 values (1),(2),(3);

select * from t1;

id

1

2

3

create temporary table t1 (a int not null auto_increment

primary key);

select * from t1;

a

drop table t1;

drop table t1;

SET NAMES koi8r;

CREATE TABLE t1 (a char(1) character set koi8r);

INSERT INTO t1 VALUES (_koi8r''),(_koi8r'');

mysql-test/t/query_cache.test

+11 −0
Original line number Diff line number Diff line
@@ -561,6 +561,17 @@ unlock table; 
drop table t1,t2;

set query_cache_wlock_invalidate=default;



#

# hiding real table stored in query cache by temporary table

#

CREATE TABLE t1 (id INT PRIMARY KEY);

insert into t1 values (1),(2),(3);

select * from t1;

create temporary table t1 (a int not null auto_increment

primary key);

select * from t1;

drop table t1;

drop table t1;



#

# Test character set related variables: