Merge lp:~laurynas-biveinis/percona-server/bug901060-5.5 into lp:percona-server/5.5

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 372
Proposed branch: lp:~laurynas-biveinis/percona-server/bug901060-5.5
Merge into: lp:percona-server/5.5
Diff against target: 340 lines (+144/-147)
10 files modified
Percona-Server/mysql-test/include/percona_innodb_kill_idle_trx_show.inc (+0/-2)
Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx.result (+0/-41)
Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx_locks.result (+0/-45)
Percona-Server/mysql-test/suite/innodb/include/percona_innodb_kill_idle_trx_show.inc (+2/-0)
Percona-Server/mysql-test/suite/innodb/r/percona_innodb_kill_idle_trx.result (+39/-0)
Percona-Server/mysql-test/suite/innodb/r/percona_innodb_kill_idle_trx_locks.result (+45/-0)
Percona-Server/mysql-test/suite/innodb/t/percona_innodb_kill_idle_trx.test (+27/-0)
Percona-Server/mysql-test/suite/innodb/t/percona_innodb_kill_idle_trx_locks.test (+31/-0)
Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx.test (+0/-28)
Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx_locks.test (+0/-31)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug901060-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+139662@code.launchpad.net

Description of the change

Obvious merge of bug 901060 from 5.1 with file-id resolution.
http://jenkins.percona.com/job/percona-server-5.5-param/603/

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'Percona-Server/mysql-test/include/percona_innodb_kill_idle_trx_show.inc'
2--- Percona-Server/mysql-test/include/percona_innodb_kill_idle_trx_show.inc 2012-04-18 23:25:34 +0000
3+++ Percona-Server/mysql-test/include/percona_innodb_kill_idle_trx_show.inc 1970-01-01 00:00:00 +0000
4@@ -1,2 +0,0 @@
5-SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
6-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
7
8=== removed file 'Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx.result'
9--- Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx.result 2012-04-18 23:25:34 +0000
10+++ Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx.result 1970-01-01 00:00:00 +0000
11@@ -1,41 +0,0 @@
12-DROP TABLE IF EXISTS t1;
13-SET autocommit=0;
14-CREATE TABLE t1 (a INT) ENGINE=InnoDB;
15-SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
16-Variable_name Value
17-innodb_kill_idle_transaction 0
18-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
19-VARIABLE_NAME VARIABLE_VALUE
20-INNODB_KILL_IDLE_TRANSACTION 0
21-SET GLOBAL innodb_kill_idle_transaction=1;
22-SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
23-Variable_name Value
24-innodb_kill_idle_transaction 1
25-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
26-VARIABLE_NAME VARIABLE_VALUE
27-INNODB_KILL_IDLE_TRANSACTION 1
28-BEGIN;
29-INSERT INTO t1 VALUES (1),(2),(3);
30-COMMIT;
31-SELECT * FROM t1;
32-a
33-1
34-2
35-3
36-BEGIN;
37-INSERT INTO t1 VALUES (4),(5),(6);
38-SELECT * FROM t1;
39-ERROR HY000: MySQL server has gone away
40-SELECT * FROM t1;
41-a
42-1
43-2
44-3
45-DROP TABLE t1;
46-SET GLOBAL innodb_kill_idle_transaction=0;
47-SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
48-Variable_name Value
49-innodb_kill_idle_transaction 0
50-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
51-VARIABLE_NAME VARIABLE_VALUE
52-INNODB_KILL_IDLE_TRANSACTION 0
53
54=== removed file 'Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx_locks.result'
55--- Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx_locks.result 2012-04-18 23:25:34 +0000
56+++ Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx_locks.result 1970-01-01 00:00:00 +0000
57@@ -1,45 +0,0 @@
58-DROP TABLE IF EXISTS t1;
59-SET autocommit=0;
60-CREATE TABLE t1 (a INT) ENGINE=InnoDB;
61-SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
62-Variable_name Value
63-innodb_kill_idle_transaction 0
64-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
65-VARIABLE_NAME VARIABLE_VALUE
66-INNODB_KILL_IDLE_TRANSACTION 0
67-SET GLOBAL innodb_kill_idle_transaction=5;
68-SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
69-Variable_name Value
70-innodb_kill_idle_transaction 5
71-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
72-VARIABLE_NAME VARIABLE_VALUE
73-INNODB_KILL_IDLE_TRANSACTION 5
74-BEGIN;
75-INSERT INTO t1 VALUES (1),(2),(3);
76-COMMIT;
77-SELECT * FROM t1;
78-a
79-1
80-2
81-3
82-### Locking rows. Lock should be released when idle trx is killed.
83-BEGIN;
84-SELECT * FROM t1 FOR UPDATE;
85-a
86-1
87-2
88-3
89-UPDATE t1 set a=4;
90-SELECT * FROM t1;
91-a
92-4
93-4
94-4
95-DROP TABLE t1;
96-SET GLOBAL innodb_kill_idle_transaction=0;
97-SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
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
104=== added file 'Percona-Server/mysql-test/suite/innodb/include/percona_innodb_kill_idle_trx_show.inc'
105--- Percona-Server/mysql-test/suite/innodb/include/percona_innodb_kill_idle_trx_show.inc 1970-01-01 00:00:00 +0000
106+++ Percona-Server/mysql-test/suite/innodb/include/percona_innodb_kill_idle_trx_show.inc 2012-12-13 11:00:28 +0000
107@@ -0,0 +1,2 @@
108+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
109+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
110
111=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_innodb_kill_idle_trx.result'
112--- Percona-Server/mysql-test/suite/innodb/r/percona_innodb_kill_idle_trx.result 1970-01-01 00:00:00 +0000
113+++ Percona-Server/mysql-test/suite/innodb/r/percona_innodb_kill_idle_trx.result 2012-12-13 11:00:28 +0000
114@@ -0,0 +1,39 @@
115+DROP TABLE IF EXISTS t1;
116+SET autocommit=0;
117+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
118+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
119+Variable_name Value
120+innodb_kill_idle_transaction 0
121+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
122+VARIABLE_NAME VARIABLE_VALUE
123+INNODB_KILL_IDLE_TRANSACTION 0
124+SET GLOBAL innodb_kill_idle_transaction=1;
125+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
126+Variable_name Value
127+innodb_kill_idle_transaction 1
128+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
129+VARIABLE_NAME VARIABLE_VALUE
130+INNODB_KILL_IDLE_TRANSACTION 1
131+BEGIN;
132+INSERT INTO t1 VALUES (1),(2),(3);
133+COMMIT;
134+SELECT * FROM t1;
135+a
136+1
137+2
138+3
139+BEGIN;
140+INSERT INTO t1 VALUES (4),(5),(6);
141+SELECT * FROM t1;
142+a
143+1
144+2
145+3
146+DROP TABLE t1;
147+SET GLOBAL innodb_kill_idle_transaction=0;
148+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
149+Variable_name Value
150+innodb_kill_idle_transaction 0
151+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
152+VARIABLE_NAME VARIABLE_VALUE
153+INNODB_KILL_IDLE_TRANSACTION 0
154
155=== added file 'Percona-Server/mysql-test/suite/innodb/r/percona_innodb_kill_idle_trx_locks.result'
156--- Percona-Server/mysql-test/suite/innodb/r/percona_innodb_kill_idle_trx_locks.result 1970-01-01 00:00:00 +0000
157+++ Percona-Server/mysql-test/suite/innodb/r/percona_innodb_kill_idle_trx_locks.result 2012-12-13 11:00:28 +0000
158@@ -0,0 +1,45 @@
159+DROP TABLE IF EXISTS t1;
160+SET autocommit=0;
161+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
162+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
163+Variable_name Value
164+innodb_kill_idle_transaction 0
165+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
166+VARIABLE_NAME VARIABLE_VALUE
167+INNODB_KILL_IDLE_TRANSACTION 0
168+SET GLOBAL innodb_kill_idle_transaction=5;
169+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
170+Variable_name Value
171+innodb_kill_idle_transaction 5
172+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
173+VARIABLE_NAME VARIABLE_VALUE
174+INNODB_KILL_IDLE_TRANSACTION 5
175+BEGIN;
176+INSERT INTO t1 VALUES (1),(2),(3);
177+COMMIT;
178+SELECT * FROM t1;
179+a
180+1
181+2
182+3
183+### Locking rows. Lock should be released when idle trx is killed.
184+BEGIN;
185+SELECT * FROM t1 FOR UPDATE;
186+a
187+1
188+2
189+3
190+UPDATE t1 set a=4;
191+SELECT * FROM t1;
192+a
193+4
194+4
195+4
196+DROP TABLE t1;
197+SET GLOBAL innodb_kill_idle_transaction=0;
198+SHOW GLOBAL VARIABLES LIKE 'innodb_kill_idle_transaction';
199+Variable_name Value
200+innodb_kill_idle_transaction 0
201+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='innodb_kill_idle_transaction';
202+VARIABLE_NAME VARIABLE_VALUE
203+INNODB_KILL_IDLE_TRANSACTION 0
204
205=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_innodb_kill_idle_trx.test'
206--- Percona-Server/mysql-test/suite/innodb/t/percona_innodb_kill_idle_trx.test 1970-01-01 00:00:00 +0000
207+++ Percona-Server/mysql-test/suite/innodb/t/percona_innodb_kill_idle_trx.test 2012-12-13 11:00:28 +0000
208@@ -0,0 +1,27 @@
209+--source include/have_innodb.inc
210+--disable_warnings
211+DROP TABLE IF EXISTS t1;
212+--enable_warnings
213+
214+SET autocommit=0;
215+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
216+
217+--source suite/innodb/include/percona_innodb_kill_idle_trx_show.inc
218+SET GLOBAL innodb_kill_idle_transaction=1;
219+--source suite/innodb/include/percona_innodb_kill_idle_trx_show.inc
220+
221+BEGIN;
222+INSERT INTO t1 VALUES (1),(2),(3);
223+COMMIT;
224+SELECT * FROM t1;
225+
226+BEGIN;
227+INSERT INTO t1 VALUES (4),(5),(6);
228+sleep 3;
229+
230+--enable_reconnect
231+--source include/wait_until_disconnected.inc
232+SELECT * FROM t1;
233+DROP TABLE t1;
234+SET GLOBAL innodb_kill_idle_transaction=0;
235+--source suite/innodb/include/percona_innodb_kill_idle_trx_show.inc
236
237=== added file 'Percona-Server/mysql-test/suite/innodb/t/percona_innodb_kill_idle_trx_locks.test'
238--- Percona-Server/mysql-test/suite/innodb/t/percona_innodb_kill_idle_trx_locks.test 1970-01-01 00:00:00 +0000
239+++ Percona-Server/mysql-test/suite/innodb/t/percona_innodb_kill_idle_trx_locks.test 2012-12-13 11:00:28 +0000
240@@ -0,0 +1,31 @@
241+--source include/have_innodb.inc
242+--disable_warnings
243+DROP TABLE IF EXISTS t1;
244+--enable_warnings
245+
246+SET autocommit=0;
247+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
248+
249+--source suite/innodb/include/percona_innodb_kill_idle_trx_show.inc
250+SET GLOBAL innodb_kill_idle_transaction=5;
251+--source suite/innodb/include/percona_innodb_kill_idle_trx_show.inc
252+
253+connect (conn1,localhost,root,,);
254+connection conn1;
255+
256+BEGIN;
257+INSERT INTO t1 VALUES (1),(2),(3);
258+COMMIT;
259+SELECT * FROM t1;
260+
261+--echo ### Locking rows. Lock should be released when idle trx is killed.
262+BEGIN;
263+SELECT * FROM t1 FOR UPDATE;
264+
265+connection default;
266+UPDATE t1 set a=4;
267+
268+SELECT * FROM t1;
269+DROP TABLE t1;
270+SET GLOBAL innodb_kill_idle_transaction=0;
271+--source suite/innodb/include/percona_innodb_kill_idle_trx_show.inc
272
273=== removed file 'Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx.test'
274--- Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx.test 2012-04-18 23:25:34 +0000
275+++ Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx.test 1970-01-01 00:00:00 +0000
276@@ -1,28 +0,0 @@
277---source include/have_innodb.inc
278---disable_warnings
279-DROP TABLE IF EXISTS t1;
280---enable_warnings
281-
282-SET autocommit=0;
283-CREATE TABLE t1 (a INT) ENGINE=InnoDB;
284-
285---source include/percona_innodb_kill_idle_trx_show.inc
286-SET GLOBAL innodb_kill_idle_transaction=1;
287---source include/percona_innodb_kill_idle_trx_show.inc
288-
289-BEGIN;
290-INSERT INTO t1 VALUES (1),(2),(3);
291-COMMIT;
292-SELECT * FROM t1;
293-
294-BEGIN;
295-INSERT INTO t1 VALUES (4),(5),(6);
296-sleep 3;
297-
298---enable_reconnect
299---error 2006 --error CR_SERVER_GONE_ERROR
300-SELECT * FROM t1;
301-SELECT * FROM t1;
302-DROP TABLE t1;
303-SET GLOBAL innodb_kill_idle_transaction=0;
304---source include/percona_innodb_kill_idle_trx_show.inc
305
306=== removed file 'Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx_locks.test'
307--- Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx_locks.test 2012-04-18 23:25:34 +0000
308+++ Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx_locks.test 1970-01-01 00:00:00 +0000
309@@ -1,31 +0,0 @@
310---source include/have_innodb.inc
311---disable_warnings
312-DROP TABLE IF EXISTS t1;
313---enable_warnings
314-
315-SET autocommit=0;
316-CREATE TABLE t1 (a INT) ENGINE=InnoDB;
317-
318---source include/percona_innodb_kill_idle_trx_show.inc
319-SET GLOBAL innodb_kill_idle_transaction=5;
320---source include/percona_innodb_kill_idle_trx_show.inc
321-
322-connect (conn1,localhost,root,,);
323-connection conn1;
324-
325-BEGIN;
326-INSERT INTO t1 VALUES (1),(2),(3);
327-COMMIT;
328-SELECT * FROM t1;
329-
330---echo ### Locking rows. Lock should be released when idle trx is killed.
331-BEGIN;
332-SELECT * FROM t1 FOR UPDATE;
333-
334-connection default;
335-UPDATE t1 set a=4;
336-
337-SELECT * FROM t1;
338-DROP TABLE t1;
339-SET GLOBAL innodb_kill_idle_transaction=0;
340---source include/percona_innodb_kill_idle_trx_show.inc

Subscribers

People subscribed via source and target branches