maria-developers team mailing list archive

[Aleksandr Kuzminsky <aleksandr.kuzminsky@xxxxxxxxxxx>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
 
Kristian,
> Does this have any impact on how XtraDB is built when built as part
> of MariaDB?
>
> Is there something we should change in how things work when we
> merge this into MariaDB?

In the trunk branch of MariaDB lp:maria version 6a is hardcoded. See
storage/xtradb/include/univ.i:

35: #define INNODB_VERSION_MAJOR    1
36: #define INNODB_VERSION_MINOR    0
37: #define INNODB_VERSION_BUGFIX   3
38: #define PERCONA_INNODB_VERSION  6a
which means XtraDB version is 1.0.3-6a .

When you merge XtraDB into Maria there are several options are seen
1. Manually change XtraDB version in storage/xtradb/include/univ.i . Say

#define INNODB_VERSION_MINOR    0
#define INNODB_VERSION_BUGFIX    4
#define PERCONA_INNODB_VERSION 9   // <-- add this
#ifndef PERCONA_INNODB_VERSION
#define PERCONA_INNODB_VERSION unknown
#endif

2. Pass XtraDB version with AM_CPPFLAGS when compile
# export AM_CPPFLAGS="$AM_CPPFLAGS -DPERCONA_INNODB_VERSION=9"
# ./configure && make all && etc...


Best regards,
Aleks


>
> - Kristian.
>
>> --
>>
https://code.launchpad.net/~percona-dev/percona-xtradb/fix-bug476887/+merge/14570
>>  You are subscribed to branch
>> lp:~percona-dev/percona-xtradb/extensions-1.0.
>>
>> === modified file 'innodb_show_status.patch' ---
>> innodb_show_status.patch    2009-09-03 08:25:21 +0000 +++
>> innodb_show_status.patch    2009-11-06 23:45:22 +0000 @@ -157,32
>> +157,37 @@ #ifndef UNIV_NONINL #include "thr0loc.ic" #endif -diff
>> -ru innodb_plugin-1.0.4_orig/include/univ.i
>> innodb_plugin-1.0.4_tmp/include/univ.i ----
>> innodb_plugin-1.0.4_orig/include/univ.i    2009-07-21
>> 06:56:30.000000000 +0900 -+++
>> innodb_plugin-1.0.4_tmp/include/univ.i    2009-08-28
>> 15:33:48.000000000 +0900 -@@ -47,6 +47,7 @@ - #define
>> INNODB_VERSION_MAJOR    1 +diff -Nur a/include/univ.i
>> b/include/univ.i +--- a/include/univ.i    2009-11-06
>> 12:57:14.000000000 -0800 ++++ b/include/univ.i    2009-11-06
>> 13:02:43.000000000 -0800 +@@ -48,6 +48,11 @@ #define
>> INNODB_VERSION_MINOR    0 #define INNODB_VERSION_BUGFIX    4 -+#define
>> PERCONA_INNODB_VERSION    7
>>
>> ++#ifndef PERCONA_INNODB_VERSION ++#define PERCONA_INNODB_VERSION
>> unknown ++#endif ++ ++ /* The following is the InnoDB version as
>> shown in SELECT plugin_version FROM information_schema.plugins;
>> -@@ -58,13 +59,14 @@ + calculated in in make_version_string() in
>> sql/sql_show.cc like this: +@@ -58,13 +63,15 @@
>> (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(a, b, c, d)    (#a "." #b "." #c "-" #d) -+#define
>> _INNODB_VERSION(a, b, c, d)    __INNODB_VERSION(a, b, c, d)
>> ++#define __INNODB_VERSION(a, b, c, d)   (#a "." #b "." #c "-"
>> #d) ++#define _INNODB_VERSION(a, b, c, d)    __INNODB_VERSION(a,
>> b, c, d) ++
>>
>> #define INNODB_VERSION_STR            \
>> _INNODB_VERSION(INNODB_VERSION_MAJOR,    \ INNODB_VERSION_MINOR,    \ -
>> INNODB_VERSION_BUGFIX) -+            INNODB_VERSION_BUGFIX,    \ -+
>> PERCONA_INNODB_VERSION) ++            INNODB_VERSION_BUGFIX,  \ ++
>> PERCONA_INNODB_VERSION)
>>
>> #define REFMAN "http://dev.mysql.com/doc/refman/5.1/en/";
>>
>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
 
iEYEARECAAYFAkr4NKAACgkQQ6p+ZxjCGwWJXQCfcFcZ3oKdrx9kM6+zRK74PjNR
2K4AoKU1z6pbF7QhjzOTIZ3f18ckz2Rw
=XgWE
-----END PGP SIGNATURE-----