wsrep merge procedure for MariaDB
MariaDB project has a branch where wsrep API implementation is integrated in the MariaDB code base. This blueprint defines the policy how to merge further wsrep and MariaDB development in the MariaDB/wsrep branch.
Blueprint information
- Status:
- Not started
- Approver:
- None
- Priority:
- Undefined
- Drafter:
- Seppo Jaakola
- Direction:
- Needs approval
- Assignee:
- Seppo Jaakola
- Definition:
- New
- Series goal:
- None
- Implementation:
-
Unknown
- Milestone target:
- None
- Started by
- Completed by
Related branches
Related bugs
Sprints
Whiteboard
wsrep API implementation will be merged into MariaDB 5.5. series: lp:maria/5.5.
Merge source will be gained from codership-mysql project: lp:codership-mysql/5.5
And, the resulting wsrep API implementation in MariaDB will be hosted in this branch: lp:~maria-captains/maria/maria-5.5-galera
maria-5.5-galera branch will need periodical updates both from MariaDB and codership-mysql projects.
Merges from MariaDB can happen simply with bzr merge lp:maria/5.5
Merges from codership-mysql must not contain upstream Oracle's MySQL changes (as they would conflict with MariaDB baseline). Also, mariaDB contains two innodb storage engine implemnetations: Oracle's version and XtraDB, which must be taken in account when merging.
A workable merge procedure is to create a patch file for wsrep API only changes from codership-mysql and apply the patch on maria-5.5-galera branch.
For XtraDB merges, create an additional patch file from storage/innobase changes only and replace 'innobase' to 'xtradb' in the patch file. Then apply the patch file again into maria-5.5-galera branch.
