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

[Tomislav Plavcic]

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.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'mysql-test/r/percona_innodb_version.result'
--- mysql-test/r/percona_innodb_version.result	2013-10-09 06:01:37 +0000
+++ mysql-test/r/percona_innodb_version.result	2014-07-09 13:43:56 +0000
@@ -1,3 +1,3 @@
 SELECT @@innodb_version;
 @@innodb_version
-5.5.x-x.x-x.x
+5.5.x-x.x

=== modified file 'mysql-test/t/percona_innodb_version.test'
--- mysql-test/t/percona_innodb_version.test	2013-10-09 06:01:37 +0000
+++ mysql-test/t/percona_innodb_version.test	2014-07-09 13:43:56 +0000
@@ -4,5 +4,5 @@
 # Bug #917246: Unintentional change of innodb_version format in 5.1.60
 ########################################################################
 
---replace_regex /5\.5\.[0-9]+-[0-9]+\.[0-9]+-[0-9]+\.[0-9]+/5.5.x-x.x-x.x/
+--replace_regex /5\.5\.[0-9]+-[0-9]+\.[0-9]+/5.5.x-x.x/
 SELECT @@innodb_version;