maria-developers team mailing list archive

[Kristian Nielsen <knielsen@xxxxxxxxxxxxxxx>]

Vadim Tkachenko <vadim@xxxxxxxxxxx> writes:

> Ok, let's try to figure out how to merge it properly :)
>
> I tried to include all your changes, but seems failed.
>
> Actually all latest changes should be in lp:xtradb.

Hm, we must have been misunderstanding each other?

lp:~maria-captains/maria/mariadb-xtradb6-merge is missing all of the changes
outside of storage/xtradb (except one CMakeLists.txt). These missing changes
should not go in stand-alone xtradb, but are needed in MariaDB.

lp:xtradb does not exist. lp:percona-xtradb/release-6  exists, but seems to be
missing some things that are in lp:~maria-captains/maria/mariadb-xtradb-merge2,
including things like #define PERCONA_INNODB_VERSION 6,
/* bugfix: http://bugs.mysql.com/bug.php?id=43948 */, ...

So I am confused about what needs to be merged ...

What I need from you is the name of the branch that contains the stand-alone
XtraDB 6 release. That is the crucial thing.

 - Kristian.

> Kristian Nielsen wrote:
>> Vadim Tkachenko <vadim@xxxxxxxxxxx> writes:
>> 
>>> I made push to
>>>
>>> lp:~maria-captains/maria/mariadb-xtradb6-merge
>>>
>>> (not proposed for merge yet).
>>>
>>> If everything is fine we can merge it to maria.
>> 
>> I am now looking into this.
>> 
>> I have a hard time understanding this merge. It seems you just applied
>> manually a patch against latest lp:maria, omitting most (but not all?) of the
>> necessary fixes I already made in the tree
>> 
>>     lp:~maria-captains/maria/mariadb-xtradb-merge2
>> 
>> I think we need to work instead from my merged tree, as that includes the full
>> bzr history of both lp:maria and lp:percona-xtradb. This is necessary to allow
>> smooth merging of future changes in XtraDB (and MariaDB).
>> 
>> Basically, the merge should be a simple `bzr merge` from the xtradb6 branch
>> into my mariadb-xtradb-merge2 branch, and then a merge of that result into
>> lp:maria. However, I do not know which branch contains the xtradb6 code (is it
>> pushed to Launchpad yet?). I assumed 'lp:percona-xtradb/release-6', but that
>> code seems to be missing the changes listed below compared to
>> mariadb-xtradb-merge.
>> 
>> Can you tell me which branch to merge to get the correct changes?
>> 
>>  - Kristian.
>> 
>
>
> -- 
> Vadim Tkachenko, CTO
> Percona Inc.
> ICQ: 369-510-335, Skype: vadimtk153, Phone +1-888-401-3403
> MySQL Performance Blog - http://www.mysqlperformanceblog.com
> MySQL Consulting http://www.percona.com/