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

Merge lp:~longbow/percona-server/ps55_kill_idle_trx into lp:percona-server/5.5

  1. ps55_kill_idle_trx
  2. Merge into 5.5
Proposed by Valentine Gostev
Status: Rejected
Rejected by: Stewart Smith
Proposed branch: lp:~longbow/percona-server/ps55_kill_idle_trx
Merge into: lp:percona-server/5.5
Diff against target: 386 lines (+197/-40)
5 files modified
mysql-test/percona_server_variables_debug.result (+1/-0)
mysql-test/percona_server_variables_release.result (+1/-0)
patches/innodb_kill_idle_transaction.patch (+191/-39)
patches/mysql-test.diff (+3/-1)
patches/series (+1/-0)
To merge this branch: bzr merge lp:~longbow/percona-server/ps55_kill_idle_trx
Reviewer Review Type Date Requested Status
Stewart Smith (community) Needs Resubmitting
Oleg Tsarev (community) Approve
Review via email: mp+72361@code.launchpad.net

Description of the change

Tests for innodb_kill_idle_transaction.patch

http://jenkins.percona.com/view/Percona%20Server%205.5/job/percona-server-5.5-param/93/

PS sporadic fails on centos5 and debian6 discovered.

To post a comment you must log in.
Revision history for this message
Oleg Tsarev (tsarev) wrote :

Looks fine for me, except sleep(3) - but in current situation (timeout) this is reasonable.

review: Approve
Revision history for this message
Stewart Smith (stewart) wrote :

So, to me it looks like the test failures show an actual bug that should be fixed before we enable this. So, I'm marking as resubmit, for when we have this bug fixed.

i.e. please file a bug and point Yasufumi at it.

review: Needs Resubmitting
Revision history for this message
Stewart Smith (stewart) wrote :

merged in other merge reqs

Unmerged revisions

153. By longbow <longbow@mil-nb>

Added tests for innodb_kill_idle_transaction.patch and added patch to series

152. By Stewart Smith

merge 5.5.15 rebase

151. By Stewart Smith

use S3 download site

150. By Stewart Smith

merge a few quilt related fixes to misc scripts we use

149. By Stewart Smith

merge atomic_cas_64 fix

148. By Stewart Smith

merge compiler warning fix for innodb comparison of unsigned expression always true

147. By Stewart Smith

merge fix of innodb_bug60049 test failure. The master thread should purge if purge_thread seems already exited in shutdown state.

146. By Stewart Smith

update percona_server_variables_debug.result for disabled INNODB_FAKE_CHANGES and KILL_IDLE_TRANSACTION

145. By Stewart Smith

fix all_vars test for removal of INNODB FAKE_CHANGES and KILL_IDLE_TRANSACTION

144. By Stewart Smith

move valgrind_zlib_suppression patch into patches/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mysql-test/percona_server_variables_debug.result'
--- mysql-test/percona_server_variables_debug.result 2011-08-04 23:23:45 +0000
+++ mysql-test/percona_server_variables_debug.result 2011-08-21 21:29:24 +0000
@@ -115,6 +115,7 @@
115INNODB_IBUF_MAX_SIZE115INNODB_IBUF_MAX_SIZE
116INNODB_IMPORT_TABLE_FROM_XTRABACKUP116INNODB_IMPORT_TABLE_FROM_XTRABACKUP
117INNODB_IO_CAPACITY117INNODB_IO_CAPACITY
118INNODB_KILL_IDLE_TRANSACTION
118INNODB_LARGE_PREFIX119INNODB_LARGE_PREFIX
119INNODB_LAZY_DROP_TABLE120INNODB_LAZY_DROP_TABLE
120INNODB_LOCKS_UNSAFE_FOR_BINLOG121INNODB_LOCKS_UNSAFE_FOR_BINLOG
121122
=== modified file 'mysql-test/percona_server_variables_release.result'
--- mysql-test/percona_server_variables_release.result 2011-08-04 19:16:18 +0000
+++ mysql-test/percona_server_variables_release.result 2011-08-21 21:29:24 +0000
@@ -112,6 +112,7 @@
112INNODB_IBUF_MAX_SIZE112INNODB_IBUF_MAX_SIZE
113INNODB_IMPORT_TABLE_FROM_XTRABACKUP113INNODB_IMPORT_TABLE_FROM_XTRABACKUP
114INNODB_IO_CAPACITY114INNODB_IO_CAPACITY
115INNODB_KILL_IDLE_TRANSACTION
115INNODB_LARGE_PREFIX116INNODB_LARGE_PREFIX
116INNODB_LAZY_DROP_TABLE117INNODB_LAZY_DROP_TABLE
117INNODB_LOCKS_UNSAFE_FOR_BINLOG118INNODB_LOCKS_UNSAFE_FOR_BINLOG
118119
=== renamed file 'innodb_kill_idle_transaction.patch' => 'patches/innodb_kill_idle_transaction.patch'
--- innodb_kill_idle_transaction.patch 2011-07-12 15:59:46 +0000
+++ patches/innodb_kill_idle_transaction.patch 2011-08-21 21:29:24 +0000
@@ -5,10 +5,9 @@
5#!!! notice !!!5#!!! notice !!!
6# Any small change to this file in the main branch6# Any small change to this file in the main branch
7# should be done or reviewed by the maintainer!7# should be done or reviewed by the maintainer!
8diff -ruN a/include/mysql/plugin.h b/include/mysql/plugin.h8--- a/include/mysql/plugin.h
9--- a/include/mysql/plugin.h 2011-06-22 01:42:39.000000000 +09009+++ b/include/mysql/plugin.h
10+++ b/include/mysql/plugin.h 2011-07-12 22:19:58.000000000 +090010@@ -639,6 +639,12 @@
11@@ -625,6 +625,12 @@
12 */11 */
13 void thd_set_ha_data(MYSQL_THD thd, const struct handlerton *hton,12 void thd_set_ha_data(MYSQL_THD thd, const struct handlerton *hton,
14 const void *ha_data);13 const void *ha_data);
@@ -21,10 +20,9 @@
21 #ifdef __cplusplus20 #ifdef __cplusplus
22 }21 }
23 #endif22 #endif
24diff -ruN a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp23--- a/include/mysql/plugin_audit.h.pp
25--- a/include/mysql/plugin_audit.h.pp 2011-06-22 01:42:39.000000000 +090024+++ b/include/mysql/plugin_audit.h.pp
26+++ b/include/mysql/plugin_audit.h.pp 2011-07-13 00:53:06.000000000 +090025@@ -205,6 +205,9 @@
27@@ -195,6 +195,9 @@
28 void *thd_get_ha_data(const void* thd, const struct handlerton *hton);26 void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
29 void thd_set_ha_data(void* thd, const struct handlerton *hton,27 void thd_set_ha_data(void* thd, const struct handlerton *hton,
30 const void *ha_data);28 const void *ha_data);
@@ -34,10 +32,9 @@
34 struct mysql_event_general32 struct mysql_event_general
35 {33 {
36 unsigned int event_subclass;34 unsigned int event_subclass;
37diff -ruN a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp35--- a/include/mysql/plugin_auth.h.pp
38--- a/include/mysql/plugin_auth.h.pp 2011-06-22 01:42:39.000000000 +090036+++ b/include/mysql/plugin_auth.h.pp
39+++ b/include/mysql/plugin_auth.h.pp 2011-07-13 00:53:06.000000000 +090037@@ -205,6 +205,9 @@
40@@ -195,6 +195,9 @@
41 void *thd_get_ha_data(const void* thd, const struct handlerton *hton);38 void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
42 void thd_set_ha_data(void* thd, const struct handlerton *hton,39 void thd_set_ha_data(void* thd, const struct handlerton *hton,
43 const void *ha_data);40 const void *ha_data);
@@ -47,10 +44,9 @@
47 #include <mysql/plugin_auth_common.h>44 #include <mysql/plugin_auth_common.h>
48 typedef struct st_plugin_vio_info45 typedef struct st_plugin_vio_info
49 {46 {
50diff -ruN a/include/mysql/plugin_ftparser.h.pp b/include/mysql/plugin_ftparser.h.pp47--- a/include/mysql/plugin_ftparser.h.pp
51--- a/include/mysql/plugin_ftparser.h.pp 2011-06-22 01:42:39.000000000 +090048+++ b/include/mysql/plugin_ftparser.h.pp
52+++ b/include/mysql/plugin_ftparser.h.pp 2011-07-13 00:53:06.000000000 +090049@@ -158,6 +158,9 @@
53@@ -148,6 +148,9 @@
54 void *thd_get_ha_data(const void* thd, const struct handlerton *hton);50 void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
55 void thd_set_ha_data(void* thd, const struct handlerton *hton,51 void thd_set_ha_data(void* thd, const struct handlerton *hton,
56 const void *ha_data);52 const void *ha_data);
@@ -60,10 +56,9 @@
60 enum enum_ftparser_mode56 enum enum_ftparser_mode
61 {57 {
62 MYSQL_FTPARSER_SIMPLE_MODE= 0,58 MYSQL_FTPARSER_SIMPLE_MODE= 0,
63diff -ruN a/sql/sql_class.cc b/sql/sql_class.cc59--- a/sql/sql_class.cc
64--- a/sql/sql_class.cc 2011-06-22 01:42:40.000000000 +090060+++ b/sql/sql_class.cc
65+++ b/sql/sql_class.cc 2011-07-12 22:23:35.000000000 +090061@@ -744,6 +744,26 @@
66@@ -711,6 +711,26 @@
67 return buffer;62 return buffer;
68 }63 }
69 64
@@ -90,10 +85,9 @@
90 85
91 /**86 /**
92 Implementation of Drop_table_error_handler::handle_condition().87 Implementation of Drop_table_error_handler::handle_condition().
93diff -ruN a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc88--- a/storage/innobase/handler/ha_innodb.cc
94--- a/storage/innobase/handler/ha_innodb.cc 2011-07-12 17:10:37.000000000 +090089+++ b/storage/innobase/handler/ha_innodb.cc
95+++ b/storage/innobase/handler/ha_innodb.cc 2011-07-12 22:33:06.000000000 +090090@@ -2827,6 +2827,10 @@
96@@ -2828,6 +2828,10 @@
97 91
98 innobase_commit_concurrency_init_default();92 innobase_commit_concurrency_init_default();
99 93
@@ -104,7 +98,7 @@
104 #ifdef HAVE_PSI_INTERFACE98 #ifdef HAVE_PSI_INTERFACE
105 /* Register keys with MySQL performance schema */99 /* Register keys with MySQL performance schema */
106 if (PSI_server) {100 if (PSI_server) {
107@@ -11586,6 +11590,48 @@101@@ -11585,6 +11589,48 @@
108 return(false);102 return(false);
109 }103 }
110 104
@@ -153,7 +147,7 @@
153 static SHOW_VAR innodb_status_variables_export[]= {147 static SHOW_VAR innodb_status_variables_export[]= {
154 {"Innodb", (char*) &show_innodb_vars, SHOW_FUNC},148 {"Innodb", (char*) &show_innodb_vars, SHOW_FUNC},
155 {NullS, NullS, SHOW_LONG}149 {NullS, NullS, SHOW_LONG}
156@@ -11872,6 +11918,15 @@150@@ -11871,6 +11917,15 @@
157 "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",151 "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",
158 NULL, NULL, 500L, 1L, ~0L, 0);152 NULL, NULL, 500L, 1L, ~0L, 0);
159 153
@@ -169,7 +163,7 @@
169 static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,163 static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
170 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,164 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,
171 "Number of file I/O threads in InnoDB.",165 "Number of file I/O threads in InnoDB.",
172@@ -12162,6 +12217,7 @@166@@ -12161,6 +12216,7 @@
173 MYSQL_SYSVAR(fast_checksum),167 MYSQL_SYSVAR(fast_checksum),
174 MYSQL_SYSVAR(commit_concurrency),168 MYSQL_SYSVAR(commit_concurrency),
175 MYSQL_SYSVAR(concurrency_tickets),169 MYSQL_SYSVAR(concurrency_tickets),
@@ -177,9 +171,8 @@
177 MYSQL_SYSVAR(data_file_path),171 MYSQL_SYSVAR(data_file_path),
178 MYSQL_SYSVAR(doublewrite_file),172 MYSQL_SYSVAR(doublewrite_file),
179 MYSQL_SYSVAR(data_home_dir),173 MYSQL_SYSVAR(data_home_dir),
180diff -ruN a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h174--- a/storage/innobase/include/srv0srv.h
181--- a/storage/innobase/include/srv0srv.h 2011-07-12 17:10:37.000000000 +0900175+++ b/storage/innobase/include/srv0srv.h
182+++ b/storage/innobase/include/srv0srv.h 2011-07-12 22:33:57.000000000 +0900
183@@ -291,6 +291,7 @@176@@ -291,6 +291,7 @@
184 extern ulint srv_activity_count;177 extern ulint srv_activity_count;
185 extern ulint srv_fatal_semaphore_wait_threshold;178 extern ulint srv_fatal_semaphore_wait_threshold;
@@ -188,9 +181,8 @@
188 181
189 extern mutex_t* kernel_mutex_temp;/* mutex protecting the server, trx structs,182 extern mutex_t* kernel_mutex_temp;/* mutex protecting the server, trx structs,
190 query threads, and lock table: we allocate183 query threads, and lock table: we allocate
191diff -ruN a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h184--- a/storage/innobase/include/trx0trx.h
192--- a/storage/innobase/include/trx0trx.h 2011-07-12 16:47:24.000000000 +0900185+++ b/storage/innobase/include/trx0trx.h
193+++ b/storage/innobase/include/trx0trx.h 2011-07-12 22:35:39.000000000 +0900
194@@ -594,6 +594,8 @@186@@ -594,6 +594,8 @@
195 replication has processed */187 replication has processed */
196 const char* mysql_relay_log_file_name;188 const char* mysql_relay_log_file_name;
@@ -200,9 +192,8 @@
200 /*------------------------------*/192 /*------------------------------*/
201 ulint n_mysql_tables_in_use; /* number of Innobase tables193 ulint n_mysql_tables_in_use; /* number of Innobase tables
202 used in the processing of the current194 used in the processing of the current
203diff -ruN a/storage/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c195--- a/storage/innobase/srv/srv0srv.c
204--- a/storage/innobase/srv/srv0srv.c 2011-07-12 17:10:37.000000000 +0900196+++ b/storage/innobase/srv/srv0srv.c
205+++ b/storage/innobase/srv/srv0srv.c 2011-07-12 22:43:22.000000000 +0900
206@@ -87,6 +87,11 @@197@@ -87,6 +87,11 @@
207 #include "mysql/plugin.h"198 #include "mysql/plugin.h"
208 #include "mysql/service_thd_wait.h"199 #include "mysql/service_thd_wait.h"
@@ -262,9 +253,8 @@
262 /* Flush stderr so that a database user gets the output253 /* Flush stderr so that a database user gets the output
263 to possible MySQL error file */254 to possible MySQL error file */
264 255
265diff -ruN a/storage/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c256--- a/storage/innobase/trx/trx0trx.c
266--- a/storage/innobase/trx/trx0trx.c 2011-07-12 17:05:25.000000000 +0900257+++ b/storage/innobase/trx/trx0trx.c
267+++ b/storage/innobase/trx/trx0trx.c 2011-07-12 22:44:08.000000000 +0900
268@@ -143,6 +143,9 @@258@@ -143,6 +143,9 @@
269 trx->mysql_relay_log_file_name = "";259 trx->mysql_relay_log_file_name = "";
270 trx->mysql_relay_log_pos = 0;260 trx->mysql_relay_log_pos = 0;
@@ -275,3 +265,165 @@
275 mutex_create(trx_undo_mutex_key, &trx->undo_mutex, SYNC_TRX_UNDO);265 mutex_create(trx_undo_mutex_key, &trx->undo_mutex, SYNC_TRX_UNDO);
276 266
277 trx->rseg = NULL;267 trx->rseg = NULL;
268--- /dev/null
269+++ b/mysql-test/include/percona_innodb_kill_idle_trx_show.inc
270@@ -0,0 +1,2 @@
271+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
272+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
273--- /dev/null
274+++ b/mysql-test/t/percona_innodb_kill_idle_trx.test
275@@ -0,0 +1,28 @@
276+--source include/have_innodb.inc
277+--disable_warnings
278+DROP TABLE IF EXISTS t1;
279+--enable_warnings
280+
281+SET autocommit=0;
282+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
283+
284+--source include/percona_innodb_kill_idle_trx_show.inc
285+SET GLOBAL innodb_kill_idle_transaction=1;
286+--source include/percona_innodb_kill_idle_trx_show.inc
287+
288+BEGIN;
289+INSERT INTO t1 VALUES (1),(2),(3);
290+COMMIT;
291+SELECT * FROM t1;
292+
293+BEGIN;
294+INSERT INTO t1 VALUES (4),(5),(6);
295+sleep 3;
296+
297+--enable_reconnect
298+--error 2006 --error CR_SERVER_GONE_ERROR
299+SELECT * FROM t1;
300+SELECT * FROM t1;
301+DROP TABLE t1;
302+SET GLOBAL innodb_kill_idle_transaction=0;
303+--source include/percona_innodb_kill_idle_trx_show.inc
304--- /dev/null
305+++ b/mysql-test/t/percona_innodb_kill_idle_trx_locks.test
306@@ -0,0 +1,31 @@
307+--source include/have_innodb.inc
308+--disable_warnings
309+DROP TABLE IF EXISTS t1;
310+--enable_warnings
311+
312+SET autocommit=0;
313+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
314+
315+--source include/percona_innodb_kill_idle_trx_show.inc
316+SET GLOBAL innodb_kill_idle_transaction=5;
317+--source include/percona_innodb_kill_idle_trx_show.inc
318+
319+connect (conn1,localhost,root,,);
320+connection conn1;
321+
322+BEGIN;
323+INSERT INTO t1 VALUES (1),(2),(3);
324+COMMIT;
325+SELECT * FROM t1;
326+
327+--echo ### Locking rows. Lock should be released when idle trx is killed.
328+BEGIN;
329+SELECT * FROM t1 FOR UPDATE;
330+
331+connection default;
332+UPDATE t1 set a=4;
333+
334+SELECT * FROM t1;
335+DROP TABLE t1;
336+SET GLOBAL innodb_kill_idle_transaction=0;
337+--source include/percona_innodb_kill_idle_trx_show.inc
338--- /dev/null
339+++ b/mysql-test/r/percona_innodb_kill_idle_trx.result
340@@ -0,0 +1,41 @@
341+DROP TABLE IF EXISTS t1;
342+SET autocommit=0;
343+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
344+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
345+Variable_name Value
346+innodb_kill_idle_transaction 0
347+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
348+VARIABLE_NAME VARIABLE_VALUE
349+INNODB_KILL_IDLE_TRANSACTION 0
350+SET GLOBAL innodb_kill_idle_transaction=1;
351+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
352+Variable_name Value
353+innodb_kill_idle_transaction 1
354+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
355+VARIABLE_NAME VARIABLE_VALUE
356+INNODB_KILL_IDLE_TRANSACTION 1
357+BEGIN;
358+INSERT INTO t1 VALUES (1),(2),(3);
359+COMMIT;
360+SELECT * FROM t1;
361+a
362+1
363+2
364+3
365+BEGIN;
366+INSERT INTO t1 VALUES (4),(5),(6);
367+SELECT * FROM t1;
368+ERROR HY000: MySQL server has gone away
369+SELECT * FROM t1;
370+a
371+1
372+2
373+3
374+DROP TABLE t1;
375+SET GLOBAL innodb_kill_idle_transaction=0;
376+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
377+Variable_name Value
378+innodb_kill_idle_transaction 0
379+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
380+VARIABLE_NAME VARIABLE_VALUE
381+INNODB_KILL_IDLE_TRANSACTION 0
382--- /dev/null
383+++ b/mysql-test/r/percona_innodb_kill_idle_trx_locks.result
384@@ -0,0 +1,45 @@
385+DROP TABLE IF EXISTS t1;
386+SET autocommit=0;
387+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
388+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
389+Variable_name Value
390+innodb_kill_idle_transaction 0
391+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
392+VARIABLE_NAME VARIABLE_VALUE
393+INNODB_KILL_IDLE_TRANSACTION 0
394+SET GLOBAL innodb_kill_idle_transaction=5;
395+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
396+Variable_name Value
397+innodb_kill_idle_transaction 5
398+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
399+VARIABLE_NAME VARIABLE_VALUE
400+INNODB_KILL_IDLE_TRANSACTION 5
401+BEGIN;
402+INSERT INTO t1 VALUES (1),(2),(3);
403+COMMIT;
404+SELECT * FROM t1;
405+a
406+1
407+2
408+3
409+### Locking rows. Lock should be released when idle trx is killed.
410+BEGIN;
411+SELECT * FROM t1 FOR UPDATE;
412+a
413+1
414+2
415+3
416+UPDATE t1 set a=4;
417+SELECT * FROM t1;
418+a
419+4
420+4
421+4
422+DROP TABLE t1;
423+SET GLOBAL innodb_kill_idle_transaction=0;
424+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
425+Variable_name Value
426+innodb_kill_idle_transaction 0
427+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
428+VARIABLE_NAME VARIABLE_VALUE
429+INNODB_KILL_IDLE_TRANSACTION 0
278430
=== modified file 'patches/mysql-test.diff'
--- patches/mysql-test.diff 2011-08-04 21:14:39 +0000
+++ patches/mysql-test.diff 2011-08-21 21:29:24 +0000
@@ -1260,17 +1260,19 @@
1260 delete from t2 where variable_name='innodb_change_buffering_debug';1260 delete from t2 where variable_name='innodb_change_buffering_debug';
1261 update t2 set variable_name= replace(variable_name, "PERFORMANCE_SCHEMA_", "PFS_");1261 update t2 set variable_name= replace(variable_name, "PERFORMANCE_SCHEMA_", "PFS_");
1262 select variable_name as `There should be *no* long test name listed below:` from t21262 select variable_name as `There should be *no* long test name listed below:` from t2
1263@@ -11,13 +11,13 @@1263@@ -11,13 +11,15 @@
1264 select variable_name as `There should be *no* variables listed below:` from t21264 select variable_name as `There should be *no* variables listed below:` from t2
1265 left join t1 on variable_name=test_name where test_name is null;1265 left join t1 on variable_name=test_name where test_name is null;
1266 There should be *no* variables listed below:1266 There should be *no* variables listed below:
1267-INNODB_ROLLBACK_SEGMENTS1267-INNODB_ROLLBACK_SEGMENTS
1268-INNODB_STATS_METHOD1268-INNODB_STATS_METHOD
1269 INNODB_FILE_FORMAT_MAX1269 INNODB_FILE_FORMAT_MAX
1270+INNODB_KILL_IDLE_TRANSACTION
1270 INNODB_LARGE_PREFIX1271 INNODB_LARGE_PREFIX
1271 INNODB_ROLLBACK_SEGMENTS1272 INNODB_ROLLBACK_SEGMENTS
1272 INNODB_STATS_METHOD1273 INNODB_STATS_METHOD
1273 INNODB_FILE_FORMAT_MAX1274 INNODB_FILE_FORMAT_MAX
1275+INNODB_KILL_IDLE_TRANSACTION
1274 INNODB_LARGE_PREFIX1276 INNODB_LARGE_PREFIX
1275+INNODB_ROLLBACK_SEGMENTS1277+INNODB_ROLLBACK_SEGMENTS
1276+INNODB_STATS_METHOD1278+INNODB_STATS_METHOD
12771279
=== modified file 'patches/series'
--- patches/series 2011-08-04 17:53:32 +0000
+++ patches/series 2011-08-21 21:29:24 +0000
@@ -53,3 +53,4 @@
53utf8_general50_ci.patch53utf8_general50_ci.patch
54bug813587.patch54bug813587.patch
55valgrind_zlib_suppression.patch55valgrind_zlib_suppression.patch
56innodb_kill_idle_transaction.patch

Subscribers

People subscribed via source and target branches