Kristian,
Yes I saw. Thank you for help!
I did blog about :)
http://www.mysqlperformanceblog.com/2009/08/03/xtradb-has-been-commited-to-mariadb/
Kristian Nielsen wrote:
> Ok, XtraDB 6 is now pushed to MariaDB, as a replacement for InnoDB!
>
> Merging was ok. There are a number of conflicts wh
Ok, XtraDB 6 is now pushed to MariaDB, as a replacement for InnoDB!
Merging was ok. There are a number of conflicts which need to be handled, but
that seems inevitable, and bzr seems to handle things ok (if a bit clunky).
There are no further issues know at the moment.
Thanks for working with me
Kristian,
That's strange, may be I mixed something when I did push.
Yes, repositories are lp:percona-xtradb
and
lp:~percona-dev/percona-xtradb/release-6
I think all confusing comes from fact (you noticed) we do main
development in
lp:~percona-dev/percona-xtradb/extensions-1.0
working with patc
Vadim Tkachenko writes:
> Kristian,
>
> Now lp:percona-xtradb/release-6 and lp:percona-xtradb
> should be synchronized and be up-to-date.
I still do not see that this is the case :-(
- Last push to lp:percona-xtradb is from June 26, and does not appear
up-to-date with latest XtraDB6 release
Kristian Nielsen writes:
> 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/
Kristian Nielsen writes:
> Vadim Tkachenko 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:~ma
Vadim Tkachenko 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
Kristian,
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.
Will it work for simple merge ?
Thanks,
Vadim
Kristian Nielsen wrote:
> Vadim Tkachenko writes:
>
>> I made push to
>
Vadim Tkachenko 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 a
Kristian,
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.
Thanks,
Vadim
Kristian Nielsen wrote:
> Vadim Tkachenko writes:
>
>> We are about to finalize xtradb-release6, I think it makes sense to pu
Vadim Tkachenko writes:
> We are about to finalize xtradb-release6, I think it makes sense to push
> this new release.
Yes, that sounds reasonable. Unless there are substantial changes compared to
latest bzr a few days ago, it should be simple to merge it.
> I am trying to incorporate your chan
Kristian,
We are about to finalize xtradb-release6, I think it makes sense to push
this new release.
I am trying to incorporate your changes, but
bzr branch lp:~maria-captains/maria/mariadb-xtradb-merge2
takes ages and it failed twice for me due "broken connection" error, so
I had no success here
Regarding the XtraDB merge into MariaDB, I am now finally getting ready to
push the merge, after lots of small fixes in different areas.
The code is available in the mariadb-xtradb-merge2 branch:
https://code.launchpad.net/~maria-captains/maria/mariadb-xtradb-merge2
The buildbot testing is h
13 matches
Mail list logo
