Merge lp:~tplavcic/percona-server/bug-1337324-5.5 into lp:percona-server/5.5

Proposed by Tomislav Plavcic on 2014-07-09
Status: Merged
Approved by: Laurynas Biveinis on 2014-07-10
Approved revision: 671
Merged at revision: 676
Proposed branch: lp:~tplavcic/percona-server/bug-1337324-5.5
Merge into: lp:percona-server/5.5
Diff against target: 19 lines (+2/-2)
2 files modified
mysql-test/r/percona_innodb_version.result (+1/-1)
mysql-test/t/percona_innodb_version.test (+1/-1)
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug-1337324-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-07-09 Approve on 2014-07-10
Review via email: mp+226130@code.launchpad.net

Description of the change

This is a fix for percona_innodb_version test which started failing once the layout for version changed from 5.5.38-35.2-35.2 to 5.5.38-35.2 to be the same as version 5.6.

Test was checked by running it locally on latest binary build and the result is below.
If it's needed to run the whole param build on the branch please comment.
There's also a branch with null merge for 5.6:
https://code.launchpad.net/~tplavcic/percona-server/bug-1337324-5.6

==============================================================================

TEST RESULT TIME (ms) or COMMENT
--------------------------------------------------------------------------

worker[1] Using MTR_BUILD_THREAD 300, with reserved ports 13000..13009
main.percona_innodb_version [ pass ] 1
--------------------------------------------------------------------------
The servers were restarted 0 times
Spent 0.001 of 16 seconds executing testcases

Completed: All 1 tests were successful.

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test/r/percona_innodb_version.result'
2--- mysql-test/r/percona_innodb_version.result 2013-10-09 06:01:37 +0000
3+++ mysql-test/r/percona_innodb_version.result 2014-07-09 13:43:56 +0000
4@@ -1,3 +1,3 @@
5 SELECT @@innodb_version;
6 @@innodb_version
7-5.5.x-x.x-x.x
8+5.5.x-x.x
9
10=== modified file 'mysql-test/t/percona_innodb_version.test'
11--- mysql-test/t/percona_innodb_version.test 2013-10-09 06:01:37 +0000
12+++ mysql-test/t/percona_innodb_version.test 2014-07-09 13:43:56 +0000
13@@ -4,5 +4,5 @@
14 # Bug #917246: Unintentional change of innodb_version format in 5.1.60
15 ########################################################################
16
17---replace_regex /5\.5\.[0-9]+-[0-9]+\.[0-9]+-[0-9]+\.[0-9]+/5.5.x-x.x-x.x/
18+--replace_regex /5\.5\.[0-9]+-[0-9]+\.[0-9]+/5.5.x-x.x/
19 SELECT @@innodb_version;

Subscribers

People subscribed via source and target branches