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
=== 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'
=== 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'
--- Percona-Server/mysql-test/r/percona_innodb_kill_idle_trx.result 2011-11-24 02:00:51 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/r/percona_innodb_kill_idle_trx.result 2012-09-14 17:55:26 +0000
@@ -25,8 +25,6 @@
25BEGIN;25BEGIN;
26INSERT INTO t1 VALUES (4),(5),(6);26INSERT INTO t1 VALUES (4),(5),(6);
27SELECT * FROM t1;27SELECT * FROM t1;
28ERROR HY000: MySQL server has gone away
29SELECT * FROM t1;
30a28a
311291
322302
3331
=== 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'
=== 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'
--- Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx.test 2011-11-24 02:00:51 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_innodb_kill_idle_trx.test 2012-09-14 17:55:26 +0000
@@ -1,4 +1,4 @@
1--source include/have_innodb.inc1--source include/have_innodb_plugin.inc
2--disable_warnings2--disable_warnings
3DROP TABLE IF EXISTS t1; 3DROP TABLE IF EXISTS t1;
4--enable_warnings4--enable_warnings
@@ -6,9 +6,9 @@
6SET autocommit=0;6SET autocommit=0;
7CREATE TABLE t1 (a INT) ENGINE=InnoDB;7CREATE TABLE t1 (a INT) ENGINE=InnoDB;
88
9--source include/percona_innodb_kill_idle_trx_show.inc9--source suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc
10SET GLOBAL innodb_kill_idle_transaction=1;10SET GLOBAL innodb_kill_idle_transaction=1;
11--source include/percona_innodb_kill_idle_trx_show.inc11--source suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc
1212
13BEGIN;13BEGIN;
14INSERT INTO t1 VALUES (1),(2),(3);14INSERT INTO t1 VALUES (1),(2),(3);
@@ -20,9 +20,8 @@
20sleep 3;20sleep 3;
2121
22--enable_reconnect22--enable_reconnect
23--error 2006 --error CR_SERVER_GONE_ERROR23--source include/wait_until_disconnected.inc
24SELECT * FROM t1;
25SELECT * FROM t1;24SELECT * FROM t1;
26DROP TABLE t1;25DROP TABLE t1;
27SET GLOBAL innodb_kill_idle_transaction=0;26SET GLOBAL innodb_kill_idle_transaction=0;
28--source include/percona_innodb_kill_idle_trx_show.inc27--source suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc
2928
=== 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'
--- Percona-Server/mysql-test/t/percona_innodb_kill_idle_trx_locks.test 2011-11-24 02:00:51 +0000
+++ Percona-Server/mysql-test/suite/innodb_plugin/t/percona_innodb_kill_idle_trx_locks.test 2012-09-14 17:55:26 +0000
@@ -1,4 +1,4 @@
1--source include/have_innodb.inc1--source include/have_innodb_plugin.inc
2--disable_warnings2--disable_warnings
3DROP TABLE IF EXISTS t1;3DROP TABLE IF EXISTS t1;
4--enable_warnings4--enable_warnings
@@ -6,9 +6,9 @@
6SET autocommit=0;6SET autocommit=0;
7CREATE TABLE t1 (a INT) ENGINE=InnoDB;7CREATE TABLE t1 (a INT) ENGINE=InnoDB;
88
9--source include/percona_innodb_kill_idle_trx_show.inc9--source suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc
10SET GLOBAL innodb_kill_idle_transaction=5;10SET GLOBAL innodb_kill_idle_transaction=5;
11--source include/percona_innodb_kill_idle_trx_show.inc11--source suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc
1212
13connect (conn1,localhost,root,,);13connect (conn1,localhost,root,,);
14connection conn1;14connection conn1;
@@ -28,4 +28,4 @@
28SELECT * FROM t1;28SELECT * FROM t1;
29DROP TABLE t1;29DROP TABLE t1;
30SET GLOBAL innodb_kill_idle_transaction=0;30SET GLOBAL innodb_kill_idle_transaction=0;
31--source include/percona_innodb_kill_idle_trx_show.inc31--source suite/innodb_plugin/include/percona_innodb_kill_idle_trx_show.inc

Subscribers

People subscribed via source and target branches