Percona Server moved to https://jira.percona.com/projects/PS

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

  1. fix_for_kill_idle_trx_test
  2. Merge into 5.1
Proposed by Valentine Gostev
Status: Superseded
Proposed branch: lp:~longbow/percona-server/fix_for_kill_idle_trx_test
Merge into: lp:percona-server/5.1
Diff against target: 57 lines (+10/-5)
1 file modified
patches/innodb_kill_idle_transaction.patch (+10/-5)
To merge this branch: bzr merge lp:~longbow/percona-server/fix_for_kill_idle_trx_test
Reviewer Review Type Date Requested Status
Oleg Tsarev (community) Needs Fixing
Review via email: mp+78644@code.launchpad.net

This proposal has been superseded by a proposal from 2011-10-07.

Description of the change

Added missing include for innodb_kill_idle_transaction.patch's tests

To post a comment you must log in.
Revision history for this message
Valentine Gostev (longbow) wrote :

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

Revision history for this message
Oleg Tsarev (tsarev) wrote :

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

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
60 Implementation of Drop_table_error_handler::handle_error().60 Implementation of Drop_table_error_handler::handle_error().
61--- a/storage/innodb_plugin/handler/ha_innodb.cc61--- a/storage/innodb_plugin/handler/ha_innodb.cc
62+++ b/storage/innodb_plugin/handler/ha_innodb.cc62+++ b/storage/innodb_plugin/handler/ha_innodb.cc
63@@ -2511,6 +2511,10 @@63@@ -2515,6 +2515,10 @@
64 64
65 innobase_commit_concurrency_init_default();65 innobase_commit_concurrency_init_default();
66 66
@@ -71,7 +71,7 @@
71 /* Since we in this module access directly the fields of a trx71 /* Since we in this module access directly the fields of a trx
72 struct, and due to different headers and flags it might happen that72 struct, and due to different headers and flags it might happen that
73 mutex_t has a different size in this module and in InnoDB73 mutex_t has a different size in this module and in InnoDB
74@@ -11237,6 +11241,48 @@74@@ -11241,6 +11245,48 @@
75 return(false);75 return(false);
76 }76 }
77 77
@@ -120,7 +120,7 @@
120 static SHOW_VAR innodb_status_variables_export[]= {120 static SHOW_VAR innodb_status_variables_export[]= {
121 {"Innodb", (char*) &show_innodb_vars, SHOW_FUNC},121 {"Innodb", (char*) &show_innodb_vars, SHOW_FUNC},
122 {NullS, NullS, SHOW_LONG}122 {NullS, NullS, SHOW_LONG}
123@@ -11480,6 +11526,15 @@123@@ -11484,6 +11530,15 @@
124 "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",124 "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",
125 NULL, NULL, 500L, 1L, ~0L, 0);125 NULL, NULL, 500L, 1L, ~0L, 0);
126 126
@@ -136,7 +136,7 @@
136 static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,136 static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
137 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,137 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,
138 "Number of file I/O threads in InnoDB.",138 "Number of file I/O threads in InnoDB.",
139@@ -11762,6 +11817,7 @@139@@ -11772,6 +11827,7 @@
140 MYSQL_SYSVAR(fast_checksum),140 MYSQL_SYSVAR(fast_checksum),
141 MYSQL_SYSVAR(commit_concurrency),141 MYSQL_SYSVAR(commit_concurrency),
142 MYSQL_SYSVAR(concurrency_tickets),142 MYSQL_SYSVAR(concurrency_tickets),
@@ -189,7 +189,7 @@
189 /* How much data manipulation language (DML) statements need to be delayed,189 /* How much data manipulation language (DML) statements need to be delayed,
190 in microseconds, in order to reduce the lagging of the purge thread. */190 in microseconds, in order to reduce the lagging of the purge thread. */
191 UNIV_INTERN ulint srv_dml_needed_delay = 0;191 UNIV_INTERN ulint srv_dml_needed_delay = 0;
192@@ -2549,6 +2557,36 @@192@@ -2552,6 +2560,36 @@
193 old_sema = sema;193 old_sema = sema;
194 }194 }
195 195
@@ -395,3 +395,8 @@
395+DROP TABLE t1;395+DROP TABLE t1;
396+SET GLOBAL innodb_kill_idle_transaction=0;396+SET GLOBAL innodb_kill_idle_transaction=0;
397+--source include/percona_innodb_kill_idle_trx_show.inc397+--source include/percona_innodb_kill_idle_trx_show.inc
398--- /dev/null
399+++ b/mysql-test/include/percona_innodb_kill_idle_trx_show.inc
400@@ -0,0 +1,2 @@
401+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
402+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';

Subscribers

People subscribed via source and target branches