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

Merge lp:~tsarev/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 Oleg Tsarev
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 322
Proposed branch: lp:~tsarev/percona-server/fix_for_kill_idle_trx_test
Merge into: lp:percona-server/5.1
Prerequisite: lp:~tsarev/percona-server/5.1_fix_bug_838725_base
Diff against target: 197 lines (+40/-31)
2 files modified
patches/innodb_kill_idle_transaction.patch (+34/-29)
patches/mysql-test.diff (+6/-2)
To merge this branch: bzr merge lp:~tsarev/percona-server/fix_for_kill_idle_trx_test
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Percona developers Pending
Oleg Tsarev Pending
Review via email: mp+78691@code.launchpad.net

This proposal supersedes a proposal from 2011-10-08.

Description of the change

NOTE: This branch NOT FOR MERGE, JUST FOR REVIEW

PREREQUISITE BRANCH: https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_838725_base/+merge/78683

FAILED TESTS:
1. main.endspace main.index_merge_innodb main.rowid_order_innodb main.type_bit_innodb
https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_832528/+merge/78687

2. main.percona_server_variables_debug main.percona_server_variables_release
https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_860416/+merge/78692

FAILED TESTCASES (JUST DEBUG):
1. rpl.rpl_binlog_errors
https://code.launchpad.net/~tsarev/percona-server/5.1_fix_bug_794790/+merge/78694

DESCRIPTION:
Added missing include for innodb_kill_idle_transaction.patch's tests.
  Fix percona_server_variables_{release|debug} tests for innodb_kill_idle_transaction.patch and innodb_fake_changes.patch (related to bug #838725 this tests didn't run on tests)

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

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

Revision history for this message
Oleg Tsarev (tsarev) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing
Revision history for this message
Oleg Tsarev (tsarev) wrote : Posted in a previous version of this proposal

Jenkins: http://jenkins.percona.com/view/Percona%20Server%205.1/job/percona-server-5.1-param/167/

Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

LGTM. It fixes regressions in the original MP that added kill_idle_trx test.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/innodb_kill_idle_transaction.patch'
2--- patches/innodb_kill_idle_transaction.patch 2011-09-11 21:53:35 +0000
3+++ patches/innodb_kill_idle_transaction.patch 2011-10-08 01:39:23 +0000
4@@ -60,7 +60,7 @@
5 Implementation of Drop_table_error_handler::handle_error().
6 --- a/storage/innodb_plugin/handler/ha_innodb.cc
7 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
8-@@ -2511,6 +2511,10 @@
9+@@ -2515,6 +2515,10 @@
10
11 innobase_commit_concurrency_init_default();
12
13@@ -71,7 +71,7 @@
14 /* Since we in this module access directly the fields of a trx
15 struct, and due to different headers and flags it might happen that
16 mutex_t has a different size in this module and in InnoDB
17-@@ -11237,6 +11241,48 @@
18+@@ -11241,6 +11245,48 @@
19 return(false);
20 }
21
22@@ -120,7 +120,7 @@
23 static SHOW_VAR innodb_status_variables_export[]= {
24 {"Innodb", (char*) &show_innodb_vars, SHOW_FUNC},
25 {NullS, NullS, SHOW_LONG}
26-@@ -11480,6 +11526,15 @@
27+@@ -11484,6 +11530,15 @@
28 "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",
29 NULL, NULL, 500L, 1L, ~0L, 0);
30
31@@ -136,7 +136,7 @@
32 static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
33 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,
34 "Number of file I/O threads in InnoDB.",
35-@@ -11762,6 +11817,7 @@
36+@@ -11772,6 +11827,7 @@
37 MYSQL_SYSVAR(fast_checksum),
38 MYSQL_SYSVAR(commit_concurrency),
39 MYSQL_SYSVAR(concurrency_tickets),
40@@ -189,7 +189,7 @@
41 /* How much data manipulation language (DML) statements need to be delayed,
42 in microseconds, in order to reduce the lagging of the purge thread. */
43 UNIV_INTERN ulint srv_dml_needed_delay = 0;
44-@@ -2549,6 +2557,36 @@
45+@@ -2552,6 +2560,36 @@
46 old_sema = sema;
47 }
48
49@@ -245,18 +245,18 @@
50 +SET autocommit=0;
51 +CREATE TABLE t1 (a INT) ENGINE=InnoDB;
52 +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
53-+Variable_name Value
54-+innodb_kill_idle_transaction 0
55++Variable_name Value
56++innodb_kill_idle_transaction 0
57 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
58-+VARIABLE_NAME VARIABLE_VALUE
59-+INNODB_KILL_IDLE_TRANSACTION 0
60++VARIABLE_NAME VARIABLE_VALUE
61++INNODB_KILL_IDLE_TRANSACTION 0
62 +SET GLOBAL innodb_kill_idle_transaction=1;
63 +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
64-+Variable_name Value
65-+innodb_kill_idle_transaction 1
66++Variable_name Value
67++innodb_kill_idle_transaction 1
68 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
69-+VARIABLE_NAME VARIABLE_VALUE
70-+INNODB_KILL_IDLE_TRANSACTION 1
71++VARIABLE_NAME VARIABLE_VALUE
72++INNODB_KILL_IDLE_TRANSACTION 1
73 +BEGIN;
74 +INSERT INTO t1 VALUES (1),(2),(3);
75 +COMMIT;
76@@ -277,11 +277,11 @@
77 +DROP TABLE t1;
78 +SET GLOBAL innodb_kill_idle_transaction=0;
79 +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
80-+Variable_name Value
81-+innodb_kill_idle_transaction 0
82++Variable_name Value
83++innodb_kill_idle_transaction 0
84 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
85-+VARIABLE_NAME VARIABLE_VALUE
86-+INNODB_KILL_IDLE_TRANSACTION 0
87++VARIABLE_NAME VARIABLE_VALUE
88++INNODB_KILL_IDLE_TRANSACTION 0
89 --- /dev/null
90 +++ b/mysql-test/r/percona_innodb_kill_idle_trx_locks.result
91 @@ -0,0 +1,45 @@
92@@ -289,18 +289,18 @@
93 +SET autocommit=0;
94 +CREATE TABLE t1 (a INT) ENGINE=InnoDB;
95 +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
96-+Variable_name Value
97-+innodb_kill_idle_transaction 0
98++Variable_name Value
99++innodb_kill_idle_transaction 0
100 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
101-+VARIABLE_NAME VARIABLE_VALUE
102-+INNODB_KILL_IDLE_TRANSACTION 0
103++VARIABLE_NAME VARIABLE_VALUE
104++INNODB_KILL_IDLE_TRANSACTION 0
105 +SET GLOBAL innodb_kill_idle_transaction=5;
106 +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
107-+Variable_name Value
108-+innodb_kill_idle_transaction 5
109++Variable_name Value
110++innodb_kill_idle_transaction 5
111 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
112-+VARIABLE_NAME VARIABLE_VALUE
113-+INNODB_KILL_IDLE_TRANSACTION 5
114++VARIABLE_NAME VARIABLE_VALUE
115++INNODB_KILL_IDLE_TRANSACTION 5
116 +BEGIN;
117 +INSERT INTO t1 VALUES (1),(2),(3);
118 +COMMIT;
119@@ -325,11 +325,11 @@
120 +DROP TABLE t1;
121 +SET GLOBAL innodb_kill_idle_transaction=0;
122 +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
123-+Variable_name Value
124-+innodb_kill_idle_transaction 0
125++Variable_name Value
126++innodb_kill_idle_transaction 0
127 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
128-+VARIABLE_NAME VARIABLE_VALUE
129-+INNODB_KILL_IDLE_TRANSACTION 0
130++VARIABLE_NAME VARIABLE_VALUE
131++INNODB_KILL_IDLE_TRANSACTION 0
132 --- /dev/null
133 +++ b/mysql-test/t/percona_innodb_kill_idle_trx.test
134 @@ -0,0 +1,28 @@
135@@ -395,3 +395,8 @@
136 +DROP TABLE t1;
137 +SET GLOBAL innodb_kill_idle_transaction=0;
138 +--source include/percona_innodb_kill_idle_trx_show.inc
139+--- /dev/null
140++++ b/mysql-test/include/percona_innodb_kill_idle_trx_show.inc
141+@@ -0,0 +1,2 @@
142++SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
143++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
144
145=== modified file 'patches/mysql-test.diff'
146--- patches/mysql-test.diff 2011-10-05 00:02:14 +0000
147+++ patches/mysql-test.diff 2011-10-08 01:39:23 +0000
148@@ -4009,7 +4009,7 @@
149 +0
150 --- /dev/null
151 +++ b/mysql-test/r/percona_server_variables_debug.result
152-@@ -0,0 +1,347 @@
153+@@ -0,0 +1,350 @@
154 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
155 +Variable_name
156 +AUTOCOMMIT
157@@ -4111,6 +4111,7 @@
158 +INNODB_EXPAND_IMPORT
159 +INNODB_EXTRA_RSEGMENTS
160 +INNODB_EXTRA_UNDOSLOTS
161++INNODB_FAKE_CHANGES
162 +INNODB_FAST_CHECKSUM
163 +INNODB_FAST_RECOVERY
164 +INNODB_FAST_SHUTDOWN
165@@ -4126,6 +4127,7 @@
166 +INNODB_IBUF_ACTIVE_CONTRACT
167 +INNODB_IBUF_MAX_SIZE
168 +INNODB_IO_CAPACITY
169++INNODB_KILL_IDLE_TRANSACTION
170 +INNODB_LAZY_DROP_TABLE
171 +INNODB_LOCKS_UNSAFE_FOR_BINLOG
172 +INNODB_LOCK_WAIT_TIMEOUT
173@@ -4360,7 +4362,7 @@
174 +WARNING_COUNT
175 --- /dev/null
176 +++ b/mysql-test/r/percona_server_variables_release.result
177-@@ -0,0 +1,344 @@
178+@@ -0,0 +1,347 @@
179 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
180 +Variable_name
181 +AUTOCOMMIT
182@@ -4460,6 +4462,7 @@
183 +INNODB_EXPAND_IMPORT
184 +INNODB_EXTRA_RSEGMENTS
185 +INNODB_EXTRA_UNDOSLOTS
186++INNODB_FAKE_CHANGES
187 +INNODB_FAST_CHECKSUM
188 +INNODB_FAST_RECOVERY
189 +INNODB_FAST_SHUTDOWN
190@@ -4475,6 +4478,7 @@
191 +INNODB_IBUF_ACTIVE_CONTRACT
192 +INNODB_IBUF_MAX_SIZE
193 +INNODB_IO_CAPACITY
194++INNODB_KILL_IDLE_TRANSACTION
195 +INNODB_LAZY_DROP_TABLE
196 +INNODB_LOCKS_UNSAFE_FOR_BINLOG
197 +INNODB_LOCK_WAIT_TIMEOUT

Subscribers

People subscribed via source and target branches