[Maria-developers] XtraDB merge
![](https://secure.gravatar.com/avatar/b217799bb4424807bac67c08691f4d72.jpg?s=120&d=mm&r=g)
Hello, We had talk with Monty and I am going to propose merge for MariaDB-MySQL tree with InnoDB->XtraDB replacement. Merge only related to InnoDB, no other changes in main MySQL tree. Is that OK ? What is the best way to do that - just merge proposal ? Thanks, Vadim -- 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/ Attend the 2009 Percona Performance Conference April 22-23 - http://conferences.percona.com/
![](https://secure.gravatar.com/avatar/99fde0c1dfd216326aae0aff30d493f1.jpg?s=120&d=mm&r=g)
Vadim Tkachenko
We had talk with Monty and I am going to propose merge for MariaDB-MySQL tree with InnoDB->XtraDB replacement.
Merge only related to InnoDB, no other changes in main MySQL tree.
Is that OK ? What is the best way to do that - just merge proposal ?
I think the best way is to do the merge in a local branch and then push it to a new branch on launchpad using something like bzr push 'lp:~percona-dev/maria/maria-1.5-xtradb' Then you can activate a launchpad merge request for that branch. I don't think we have used the merge request feature for MariaDB yet, but it seems to work well for Drizzle, so we might as well try it out. - Kristian.
![](https://secure.gravatar.com/avatar/99fde0c1dfd216326aae0aff30d493f1.jpg?s=120&d=mm&r=g)
Kristian Nielsen
Vadim Tkachenko
writes: We had talk with Monty and I am going to propose merge for MariaDB-MySQL tree with InnoDB->XtraDB replacement.
Merge only related to InnoDB, no other changes in main MySQL tree.
Is that OK ? What is the best way to do that - just merge proposal ?
I think the best way is to do the merge in a local branch and then push it to a new branch on launchpad using something like
bzr push 'lp:~percona-dev/maria/maria-1.5-xtradb'
Then you can activate a launchpad merge request for that branch. I don't think we have used the merge request feature for MariaDB yet, but it seems to work well for Drizzle, so we might as well try it out.
Actually, correcting myself... You should join (or join percona-dev) to the maria-captains Launchpad group: https://launchpad.net/~maria-captains Then you get push rights to the main trees, and can just push it yourself after commit and review. - Kristian.
participants (2)
-
Kristian Nielsen
-
Vadim Tkachenko