diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2012-12-18 16:52:58 +0200 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2012-12-18 16:52:58 +0200 |
| commit | 5395f4a59721c0de8934d693f9d393f6e2393d68 (patch) | |
| tree | 5a8059514a2e97b2f672e4c5e34d66938ab7fc4a /storage | |
| parent | 8cd60993716707a6c9af4fcc9d6d6d26b9b155e3 (diff) | |
| parent | 7bdd8b481c9456091a6ad4cd4deeccf8d5001bd1 (diff) | |
| download | mariadb-git-5395f4a59721c0de8934d693f9d393f6e2393d68.tar.gz | |
Merge mysql-5.1 -> mysql-5.5
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/include/univ.i | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index ed32fb9bf47..1532bf146a9 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -49,9 +49,10 @@ Created 1/20/1994 Heikki Tuuri #define _IB_TO_STR(s) #s #define IB_TO_STR(s) _IB_TO_STR(s) -#define INNODB_VERSION_MAJOR 1 -#define INNODB_VERSION_MINOR 1 -#define INNODB_VERSION_BUGFIX 8 +#include <mysql_version.h> + +#define INNODB_VERSION_MAJOR MYSQL_MAJOR_VERSION +#define INNODB_VERSION_MINOR MYSQL_MINOR_VERSION /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins; @@ -62,10 +63,7 @@ component, i.e. we show M.N.P as M.N */ #define INNODB_VERSION_SHORT \ (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR) -#define INNODB_VERSION_STR \ - IB_TO_STR(INNODB_VERSION_MAJOR) "." \ - IB_TO_STR(INNODB_VERSION_MINOR) "." \ - IB_TO_STR(INNODB_VERSION_BUGFIX) +#define INNODB_VERSION_STR MYSQL_SERVER_VERSION #define REFMAN "http://dev.mysql.com/doc/refman/" \ IB_TO_STR(MYSQL_MAJOR_VERSION) "." \ |