Merge lp:~tplavcic/percona-server/bug1328421-5.5 into lp:percona-server/5.5

[Tomislav Plavcic]

There was a bug in 5.5 with innodb_version string which had duplication like so:
show global variables like '%version%';
...
| innodb_version | 5.5.37-35.1-35.1 |

So have fixed definition of the string in univ.i so that it doesn't add PS version to MYSQL version since it's already included in the full version.

So it looks like this:
mysql> show variables like "%version%";
...
| innodb_version | 5.5.38-35.2 |

It was tested by making a test build and running rpm and debian version to check if it's ok.
Test builds were done here:
http://jenkins.percona.com/job/percona-server-5.5-redhat-binary-test/label_exp=centos6-64/
http://jenkins.percona.com/job/percona-server-5.5-debian-binary-test/label_exp=ubuntu-precise-64bit/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

This has caused bug 1337324

review: Needs Fixing

=== modified file 'storage/innobase/include/univ.i'
--- storage/innobase/include/univ.i	2014-05-29 09:16:46 +0000
+++ storage/innobase/include/univ.i	2014-06-30 12:30:40 +0000
@@ -67,7 +67,7 @@
 #define PERCONA_INNODB_VERSION 35.1
 #endif
 
-#define INNODB_VERSION_STR	MYSQL_SERVER_VERSION "-" IB_TO_STR(PERCONA_INNODB_VERSION)
+#define INNODB_VERSION_STR	MYSQL_SERVER_VERSION
 
 #define REFMAN "http://dev.mysql.com/doc/refman/"	\
 	IB_TO_STR(MYSQL_MAJOR_VERSION) "."		\