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: Superseded
Proposed branch: lp:~tsarev/percona-server/fix_for_kill_idle_trx_test
Merge into: lp:percona-server/5.1
Diff against target: 232 lines (+51/-39)
4 files modified
patches/innodb_bug47167_test_fix.patch (+0/-8)
patches/innodb_kill_idle_transaction.patch (+34/-29)
patches/innodb_swap_builtin_plugin.patch (+11/-0)
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
Oleg Tsarev Pending
Review via email: mp+78673@code.launchpad.net

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

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

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 : 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 :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'patches/innodb_bug47167_test_fix.patch'
2--- patches/innodb_bug47167_test_fix.patch 2011-08-01 17:56:34 +0000
3+++ patches/innodb_bug47167_test_fix.patch 2011-10-08 01:34:24 +0000
4@@ -42,11 +42,3 @@
5
6 # Following are negative tests, all should fail.
7 --disable_warnings
8---- a/mysql-test/include/have_innodb.inc
9-+++ b/mysql-test/include/have_innodb.inc
10-@@ -1,4 +1,4 @@
11--if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED')`)
12-+if (`select count(*)>0 from information_schema.plugins where plugin_name like 'xtradb%'`)
13- {
14- --skip Test requires InnoDB.
15- }
16
17=== modified file 'patches/innodb_kill_idle_transaction.patch'
18--- patches/innodb_kill_idle_transaction.patch 2011-09-11 21:53:35 +0000
19+++ patches/innodb_kill_idle_transaction.patch 2011-10-08 01:34:24 +0000
20@@ -60,7 +60,7 @@
21 Implementation of Drop_table_error_handler::handle_error().
22 --- a/storage/innodb_plugin/handler/ha_innodb.cc
23 +++ b/storage/innodb_plugin/handler/ha_innodb.cc
24-@@ -2511,6 +2511,10 @@
25+@@ -2515,6 +2515,10 @@
26
27 innobase_commit_concurrency_init_default();
28
29@@ -71,7 +71,7 @@
30 /* Since we in this module access directly the fields of a trx
31 struct, and due to different headers and flags it might happen that
32 mutex_t has a different size in this module and in InnoDB
33-@@ -11237,6 +11241,48 @@
34+@@ -11241,6 +11245,48 @@
35 return(false);
36 }
37
38@@ -120,7 +120,7 @@
39 static SHOW_VAR innodb_status_variables_export[]= {
40 {"Innodb", (char*) &show_innodb_vars, SHOW_FUNC},
41 {NullS, NullS, SHOW_LONG}
42-@@ -11480,6 +11526,15 @@
43+@@ -11484,6 +11530,15 @@
44 "Number of times a thread is allowed to enter InnoDB within the same SQL query after it has once got the ticket",
45 NULL, NULL, 500L, 1L, ~0L, 0);
46
47@@ -136,7 +136,7 @@
48 static MYSQL_SYSVAR_LONG(file_io_threads, innobase_file_io_threads,
49 PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY | PLUGIN_VAR_NOSYSVAR,
50 "Number of file I/O threads in InnoDB.",
51-@@ -11762,6 +11817,7 @@
52+@@ -11772,6 +11827,7 @@
53 MYSQL_SYSVAR(fast_checksum),
54 MYSQL_SYSVAR(commit_concurrency),
55 MYSQL_SYSVAR(concurrency_tickets),
56@@ -189,7 +189,7 @@
57 /* How much data manipulation language (DML) statements need to be delayed,
58 in microseconds, in order to reduce the lagging of the purge thread. */
59 UNIV_INTERN ulint srv_dml_needed_delay = 0;
60-@@ -2549,6 +2557,36 @@
61+@@ -2552,6 +2560,36 @@
62 old_sema = sema;
63 }
64
65@@ -245,18 +245,18 @@
66 +SET autocommit=0;
67 +CREATE TABLE t1 (a INT) ENGINE=InnoDB;
68 +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
69-+Variable_name Value
70-+innodb_kill_idle_transaction 0
71++Variable_name Value
72++innodb_kill_idle_transaction 0
73 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
74-+VARIABLE_NAME VARIABLE_VALUE
75-+INNODB_KILL_IDLE_TRANSACTION 0
76++VARIABLE_NAME VARIABLE_VALUE
77++INNODB_KILL_IDLE_TRANSACTION 0
78 +SET GLOBAL innodb_kill_idle_transaction=1;
79 +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
80-+Variable_name Value
81-+innodb_kill_idle_transaction 1
82++Variable_name Value
83++innodb_kill_idle_transaction 1
84 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
85-+VARIABLE_NAME VARIABLE_VALUE
86-+INNODB_KILL_IDLE_TRANSACTION 1
87++VARIABLE_NAME VARIABLE_VALUE
88++INNODB_KILL_IDLE_TRANSACTION 1
89 +BEGIN;
90 +INSERT INTO t1 VALUES (1),(2),(3);
91 +COMMIT;
92@@ -277,11 +277,11 @@
93 +DROP TABLE t1;
94 +SET GLOBAL innodb_kill_idle_transaction=0;
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 --- /dev/null
106 +++ b/mysql-test/r/percona_innodb_kill_idle_trx_locks.result
107 @@ -0,0 +1,45 @@
108@@ -289,18 +289,18 @@
109 +SET autocommit=0;
110 +CREATE TABLE t1 (a INT) ENGINE=InnoDB;
111 +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
112-+Variable_name Value
113-+innodb_kill_idle_transaction 0
114++Variable_name Value
115++innodb_kill_idle_transaction 0
116 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
117-+VARIABLE_NAME VARIABLE_VALUE
118-+INNODB_KILL_IDLE_TRANSACTION 0
119++VARIABLE_NAME VARIABLE_VALUE
120++INNODB_KILL_IDLE_TRANSACTION 0
121 +SET GLOBAL innodb_kill_idle_transaction=5;
122 +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
123-+Variable_name Value
124-+innodb_kill_idle_transaction 5
125++Variable_name Value
126++innodb_kill_idle_transaction 5
127 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
128-+VARIABLE_NAME VARIABLE_VALUE
129-+INNODB_KILL_IDLE_TRANSACTION 5
130++VARIABLE_NAME VARIABLE_VALUE
131++INNODB_KILL_IDLE_TRANSACTION 5
132 +BEGIN;
133 +INSERT INTO t1 VALUES (1),(2),(3);
134 +COMMIT;
135@@ -325,11 +325,11 @@
136 +DROP TABLE t1;
137 +SET GLOBAL innodb_kill_idle_transaction=0;
138 +SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
139-+Variable_name Value
140-+innodb_kill_idle_transaction 0
141++Variable_name Value
142++innodb_kill_idle_transaction 0
143 +SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
144-+VARIABLE_NAME VARIABLE_VALUE
145-+INNODB_KILL_IDLE_TRANSACTION 0
146++VARIABLE_NAME VARIABLE_VALUE
147++INNODB_KILL_IDLE_TRANSACTION 0
148 --- /dev/null
149 +++ b/mysql-test/t/percona_innodb_kill_idle_trx.test
150 @@ -0,0 +1,28 @@
151@@ -395,3 +395,8 @@
152 +DROP TABLE t1;
153 +SET GLOBAL innodb_kill_idle_transaction=0;
154 +--source include/percona_innodb_kill_idle_trx_show.inc
155+--- /dev/null
156++++ b/mysql-test/include/percona_innodb_kill_idle_trx_show.inc
157+@@ -0,0 +1,2 @@
158++SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
159++SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
160
161=== modified file 'patches/innodb_swap_builtin_plugin.patch'
162--- patches/innodb_swap_builtin_plugin.patch 2011-08-09 13:35:34 +0000
163+++ patches/innodb_swap_builtin_plugin.patch 2011-10-08 01:34:24 +0000
164@@ -198,3 +198,14 @@
165 MYSQL_PLUGIN_DYNAMIC(innodb_plugin, [ha_innodb_plugin.la])
166 MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
167 AC_CHECK_HEADERS(sched.h)
168+--- a/mysql-test/mysql-test-run.pl
169++++ b/mysql-test/mysql-test-run.pl
170+@@ -157,7 +157,7 @@
171+ # executables will be used by the test suite.
172+ our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
173+
174+-my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb,innodb_plugin";
175++my $DEFAULT_SUITES= "main,binlog,federated,rpl,rpl_ndb,ndb,innodb_plugin";
176+ my $opt_suites;
177+
178+ our $opt_verbose= 0; # Verbose output, enable with --verbose
179
180=== modified file 'patches/mysql-test.diff'
181--- patches/mysql-test.diff 2011-10-05 00:02:14 +0000
182+++ patches/mysql-test.diff 2011-10-08 01:34:24 +0000
183@@ -4009,7 +4009,7 @@
184 +0
185 --- /dev/null
186 +++ b/mysql-test/r/percona_server_variables_debug.result
187-@@ -0,0 +1,347 @@
188+@@ -0,0 +1,350 @@
189 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
190 +Variable_name
191 +AUTOCOMMIT
192@@ -4111,6 +4111,7 @@
193 +INNODB_EXPAND_IMPORT
194 +INNODB_EXTRA_RSEGMENTS
195 +INNODB_EXTRA_UNDOSLOTS
196++INNODB_FAKE_CHANGES
197 +INNODB_FAST_CHECKSUM
198 +INNODB_FAST_RECOVERY
199 +INNODB_FAST_SHUTDOWN
200@@ -4126,6 +4127,7 @@
201 +INNODB_IBUF_ACTIVE_CONTRACT
202 +INNODB_IBUF_MAX_SIZE
203 +INNODB_IO_CAPACITY
204++INNODB_KILL_IDLE_TRANSACTION
205 +INNODB_LAZY_DROP_TABLE
206 +INNODB_LOCKS_UNSAFE_FOR_BINLOG
207 +INNODB_LOCK_WAIT_TIMEOUT
208@@ -4360,7 +4362,7 @@
209 +WARNING_COUNT
210 --- /dev/null
211 +++ b/mysql-test/r/percona_server_variables_release.result
212-@@ -0,0 +1,344 @@
213+@@ -0,0 +1,347 @@
214 +SELECT Variable_name FROM INFORMATION_SCHEMA.SESSION_VARIABLES ORDER BY 1;
215 +Variable_name
216 +AUTOCOMMIT
217@@ -4460,6 +4462,7 @@
218 +INNODB_EXPAND_IMPORT
219 +INNODB_EXTRA_RSEGMENTS
220 +INNODB_EXTRA_UNDOSLOTS
221++INNODB_FAKE_CHANGES
222 +INNODB_FAST_CHECKSUM
223 +INNODB_FAST_RECOVERY
224 +INNODB_FAST_SHUTDOWN
225@@ -4475,6 +4478,7 @@
226 +INNODB_IBUF_ACTIVE_CONTRACT
227 +INNODB_IBUF_MAX_SIZE
228 +INNODB_IO_CAPACITY
229++INNODB_KILL_IDLE_TRANSACTION
230 +INNODB_LAZY_DROP_TABLE
231 +INNODB_LOCKS_UNSAFE_FOR_BINLOG
232 +INNODB_LOCK_WAIT_TIMEOUT

Subscribers

People subscribed via source and target branches