Merge lp:~longbow/percona-server/fix_for_kill_idle_trx_test into lp:percona-server/5.1

[Valentine Gostev]

Added missing include for innodb_kill_idle_transaction.patch's tests

[Valentine Gostev (longbow)]

http://jenkins.percona.com/job/percona-server-5.1-param/166/

[Oleg Tsarev (tsarev)]

https://code.launchpad.net/~tsarev/percona-server/fix_for_kill_idle_trx_test

review: Needs Fixing

=== modified file 'patches/innodb_kill_idle_transaction.patch'
--- patches/innodb_kill_idle_transaction.patch	2011-09-11 21:53:35 +0000
+++ patches/innodb_kill_idle_transaction.patch	2011-10-07 17:27:23 +0000
@@ -60,7 +60,7 @@
    Implementation of Drop_table_error_handler::handle_error().
 --- a/storage/innodb_plugin/handler/ha_innodb.cc
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
-@@ -2511,6 +2511,10 @@
+@@ -2515,6 +2515,10 @@
  
  	innobase_commit_concurrency_init_default();
  
@@ -71,7 +71,7 @@
  	/* Since we in this module access directly the fields of a trx
  	struct, and due to different headers and flags it might happen that
  	mutex_t has a different size in this module and in InnoDB
-@@ -11237,6 +11241,48 @@
+@@ -11241,6 +11245,48 @@
  	return(false);
  }
  
@@ -120,7 +120,7 @@
  static SHOW_VAR innodb_status_variables_export[]= {
    {"Innodb",                   (char*) &show_innodb_vars, SHOW_FUNC},
    {NullS, NullS, SHOW_LONG}
-@@ -11480,6 +11526,15 @@
+@@ -11484,6 +11530,15 @@
    "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",
    NULL, NULL, 500L, 1L, ~0L, 0);
  
@@ -136,7 +136,7 @@
  static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
    PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,
    "Number of file I/O threads in InnoDB.",
-@@ -11762,6 +11817,7 @@
+@@ -11772,6 +11827,7 @@
    MYSQL_SYSVAR(fast_checksum),
    MYSQL_SYSVAR(commit_concurrency),
    MYSQL_SYSVAR(concurrency_tickets),
@@ -189,7 +189,7 @@
  /* How much data manipulation language (DML) statements need to be delayed,
  in microseconds, in order to reduce the lagging of the purge thread. */
  UNIV_INTERN ulint	srv_dml_needed_delay = 0;
-@@ -2549,6 +2557,36 @@
+@@ -2552,6 +2560,36 @@
  		old_sema = sema;
  	}
  
@@ -395,3 +395,8 @@
 +DROP TABLE t1;
 +SET GLOBAL innodb_kill_idle_transaction=0;
 +--source include/percona_innodb_kill_idle_trx_show.inc
+--- /dev/null
++++ b/mysql-test/include/percona_innodb_kill_idle_trx_show.inc
+@@ -0,0 +1,2 @@
++SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';