1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql-5.1 -> mysql-5.5

Browse Source
This commit is contained in:
Vasil Dimov 2012-12-18 16:52:58 +02:00
commit 5395f4a597
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
storage/innobase/include/univ.i
View File

@ -49,9 +49,10 @@ Created 1/20/1994 Heikki Tuuri
#define _IB_TO_STR(s) #s #define _IB_TO_STR(s) #s
#define IB_TO_STR(s) _IB_TO_STR(s) #define IB_TO_STR(s) _IB_TO_STR(s)
#define INNODB_VERSION_MAJOR 1 #include <mysql_version.h>
#define INNODB_VERSION_MINOR 1
#define INNODB_VERSION_BUGFIX 8 #define INNODB_VERSION_MAJOR MYSQL_MAJOR_VERSION
#define INNODB_VERSION_MINOR MYSQL_MINOR_VERSION
/* The following is the InnoDB version as shown in /* The following is the InnoDB version as shown in
SELECT plugin_version FROM information_schema.plugins; 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 \ #define INNODB_VERSION_SHORT \
(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR) (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
#define INNODB_VERSION_STR \ #define INNODB_VERSION_STR MYSQL_SERVER_VERSION
IB_TO_STR(INNODB_VERSION_MAJOR) "." \
IB_TO_STR(INNODB_VERSION_MINOR) "." \
IB_TO_STR(INNODB_VERSION_BUGFIX)
#define REFMAN "http://dev.mysql.com/doc/refman/" \ #define REFMAN "http://dev.mysql.com/doc/refman/" \
IB_TO_STR(MYSQL_MAJOR_VERSION) "." \ IB_TO_STR(MYSQL_MAJOR_VERSION) "." \