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

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

  1. bug901060-5.1
  2. Merge into 5.1
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Stewart Smith
Approved revision: no longer in the source branch.
Merged at revision: 504
Proposed branch: lp:~laurynas-biveinis/percona-server/bug901060-5.1
Merge into: lp:percona-server/5.1
Diff against target: 76 lines (+9/-12)
3 files modified
Percona-Server/mysql-test/suite/innodb_plugin/r/percona_innodb_kill_idle_trx.result (+0/-2)
Percona-Server/mysql-test/suite/innodb_plugin/t/percona_innodb_kill_idle_trx.test (+5/-6)
Percona-Server/mysql-test/suite/innodb_plugin/t/percona_innodb_kill_idle_trx_locks.test (+4/-4)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug901060-5.1
Reviewer Review Type Date Requested Status
Stewart Smith (community) Approve
George Ormond Lorch III (community) g2 Approve
Review via email: mp+124489@code.launchpad.net

Description of the change

Fix bug 901060 (Multiple issues with percona_innodb_kill_idle_trx
test).

There are following issues with percona_innodb_kill_idle_trx (some
also apply to percona_innodb_kill_idle_trx_locks):

1) It is inherently unstable due to SLEEP 3, a background error
monitor thread doing the killing and then assuming that the next query
will get a server disconnect error. This fails on slow/loaded test
hosts. Fixed by doing SLEEP 3 and then just waiting for the
disconnect. Used this way, SLEEP does not introduce any timing issue.

2) The tests are in the wrong suite (main), whereas it should be in
innodb_plugin suite. Fixed trivially.

4) The tests check for the presence of built-in InnoDB instead of the
InnoDB plugin. Fixed trivially.

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

Should be an auto-merge to 5.5, but the current GCA 5.1 branch hits some bzr bug on 5.5 merge, so caution advised.

To post a comment you must log in.
Revision history for this message
George Ormond Lorch III (gl-az) :
review: Approve (g2)
Revision history for this message
Stewart Smith (stewart) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'Percona-Server/mysql-test/include/percona_innodb_kill_idle_trx_show.inc' => 'Percona-Server/mysql-test/suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc'
2=== renamed file 'Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx.result' => 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_innodb_kill_idle_trx.result'
3--- Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx.result 2011-11-24 02:00:51 +0000
4+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_innodb_kill_idle_trx.result 2012-09-14 17:55:26 +0000
5@@ -25,8 +25,6 @@
6 BEGIN;
7 INSERT INTO t1 VALUES (4),(5),(6);
8 SELECT * FROM t1;
9-ERROR HY000: MySQL server has gone away
10-SELECT * FROM t1;
11 a
12 1
13 2
14
15=== renamed file 'Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx_locks.result' => 'Percona-Server/mysql-test/suite/innodb_plugin/r/percona_innodb_kill_idle_trx_locks.result'
16=== renamed file 'Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx.test' => 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_innodb_kill_idle_trx.test'
17--- Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx.test 2011-11-24 02:00:51 +0000
18+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_innodb_kill_idle_trx.test 2012-09-14 17:55:26 +0000
19@@ -1,4 +1,4 @@
20---source include/have_innodb.inc
21+--source include/have_innodb_plugin.inc
22 --disable_warnings
23 DROP TABLE IF EXISTS t1;
24 --enable_warnings
25@@ -6,9 +6,9 @@
26 SET autocommit=0;
27 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
28
29---source include/percona_innodb_kill_idle_trx_show.inc
30+--source suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc
31 SET GLOBAL innodb_kill_idle_transaction=1;
32---source include/percona_innodb_kill_idle_trx_show.inc
33+--source suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc
34
35 BEGIN;
36 INSERT INTO t1 VALUES (1),(2),(3);
37@@ -20,9 +20,8 @@
38 sleep 3;
39
40 --enable_reconnect
41---error 2006 --error CR_SERVER_GONE_ERROR
42-SELECT * FROM t1;
43+--source include/wait_until_disconnected.inc
44 SELECT * FROM t1;
45 DROP TABLE t1;
46 SET GLOBAL innodb_kill_idle_transaction=0;
47---source include/percona_innodb_kill_idle_trx_show.inc
48+--source suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc
49
50=== renamed file 'Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx_locks.test' => 'Percona-Server/mysql-test/suite/innodb_plugin/t/percona_innodb_kill_idle_trx_locks.test'
51--- Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx_locks.test 2011-11-24 02:00:51 +0000
52+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_innodb_kill_idle_trx_locks.test 2012-09-14 17:55:26 +0000
53@@ -1,4 +1,4 @@
54---source include/have_innodb.inc
55+--source include/have_innodb_plugin.inc
56 --disable_warnings
57 DROP TABLE IF EXISTS t1;
58 --enable_warnings
59@@ -6,9 +6,9 @@
60 SET autocommit=0;
61 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
62
63---source include/percona_innodb_kill_idle_trx_show.inc
64+--source suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc
65 SET GLOBAL innodb_kill_idle_transaction=5;
66---source include/percona_innodb_kill_idle_trx_show.inc
67+--source suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc
68
69 connect (conn1,localhost,root,,);
70 connection conn1;
71@@ -28,4 +28,4 @@
72 SELECT * FROM t1;
73 DROP TABLE t1;
74 SET GLOBAL innodb_kill_idle_transaction=0;
75---source include/percona_innodb_kill_idle_trx_show.inc
76+--source suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc

Subscribers

People subscribed via source and target branches