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

Fix Bug#13463493 INNODB PLUGIN WERE CHANGED, BUT STILL USE THE

Browse Source 
SAME VERSION NUMBER 1.0.17

Now that InnoDB/InnoDB Plugin is no longer separately developed and
distributed from the MySQL server it does not need its own version number.
Thus use the MySQL version instead.

"Removing" the version altogether is not feasible because the config
variable 'innodb_version' cannot be removed in GA branches.

Reviewed by:	Marko (rb#1751)
This commit is contained in:
Vasil Dimov 2012-12-18 16:51:41 +02:00
parent b92b7a42fd
commit 3cdef32c9d
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storage/innodb_plugin/ChangeLog
View File

@ -1,3 +1,9 @@
2012-12-18 The InnoDB Team
* include/univ.i:
Fix Bug#Bug#13463493 INNODB PLUGIN WERE CHANGED, BUT STILL USE THE
SAME VERSION NUMBER 1.0.17
2012-12-13 The InnoDB Team
* buf/buf0buf.c:

18
storage/innodb_plugin/include/univ.i
View File

@ -43,9 +43,12 @@ Created 1/20/1994 Heikki Tuuri
#include "hb_univ.i"
#endif /* UNIV_HOTBACKUP */
#define INNODB_VERSION_MAJOR 1
#define INNODB_VERSION_MINOR 0
#define INNODB_VERSION_BUGFIX 17
#include <mysql_version.h>
/* Set InnoDB Plugin version to be the same as the MySQL server version.
MYSQL_VERSION_ID is something like 50168. */
#define INNODB_VERSION_MAJOR (MYSQL_VERSION_ID / 10000)
#define INNODB_VERSION_MINOR (MYSQL_VERSION_ID / 100 % 100)
/* The following is the InnoDB version as shown in
SELECT plugin_version FROM information_schema.plugins;
@ -56,14 +59,7 @@ component, i.e. we show M.N.P as M.N */
#define INNODB_VERSION_SHORT \
(INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
/* auxiliary macros to help creating the version as string */
#define __INNODB_VERSION(a, b, c) (#a "." #b "." #c)
#define _INNODB_VERSION(a, b, c) __INNODB_VERSION(a, b, c)
#define INNODB_VERSION_STR \
_INNODB_VERSION(INNODB_VERSION_MAJOR, \
INNODB_VERSION_MINOR, \
INNODB_VERSION_BUGFIX)
#define INNODB_VERSION_STR MYSQL_SERVER_VERSION
#define REFMAN "http://dev.mysql.com/doc/refman/5.1/en/"