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

Proposed by Tomislav Plavcic on 2014-06-30
Status: Merged
Approved by: Laurynas Biveinis on 2014-06-30
Approved revision: 671
Merged at revision: 672
Proposed branch: lp:~tplavcic/percona-server/bug1328421-5.5
Merge into: lp:percona-server/5.5
Diff against target: 12 lines (+1/-1)
1 file modified
storage/innobase/include/univ.i (+1/-1)
To merge this branch: bzr merge lp:~tplavcic/percona-server/bug1328421-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-06-30 Needs Fixing on 2014-07-03
Review via email: mp+224988@code.launchpad.net

Description of the change

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/

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

This has caused bug 1337324

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'storage/innobase/include/univ.i'
2--- storage/innobase/include/univ.i 2014-05-29 09:16:46 +0000
3+++ storage/innobase/include/univ.i 2014-06-30 12:30:40 +0000
4@@ -67,7 +67,7 @@
5 #define PERCONA_INNODB_VERSION 35.1
6 #endif
7
8-#define INNODB_VERSION_STR MYSQL_SERVER_VERSION "-" IB_TO_STR(PERCONA_INNODB_VERSION)
9+#define INNODB_VERSION_STR MYSQL_SERVER_VERSION
10
11 #define REFMAN "http://dev.mysql.com/doc/refman/" \
12 IB_TO_STR(MYSQL_MAJOR_VERSION) "." \

Subscribers

People subscribed via source and target branches