Merge with MySQL 5.1.47

Bug #624960 reported by Seppo Jaakola
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
MySQL patches by Codership
Fix Released
Medium
Seppo Jaakola
0.7
Fix Released
Medium
Teemu Ollakka
Trunk
Fix Released
Medium
Seppo Jaakola

Bug Description

Merge with MySQL 5.1.47

Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :

This was a rather complicated merge. lp:mysql-server/5.1 revision 3366 removes and adds back in storage/innobase and storage/innodb_plugin. Probably InnoDB development has been moved to happen in LP at that moment. Anyways, it looks ugly from our point of view. The innodb history in MySQL source tree is lost at that point.

The merging from mysql-5.1.46 up to mysql-5.1.47 required following steps:

1. bzr merge -r tag:mysql-5.1.46..3365 lp:mysql-server/5.1
2. removed storage/innobase and storage/innodb_plugin
3. bzr merge -r 3365..3366 lp:mysql-server/5.1 (storage/inno* were re-created here)
4. Manually patching in the wsrep version of storage/innobase and storage/innodb_plugin
   .i.e. applied the diff between mysql-server/5.1 revisions 3365..3366 in the storage/innobase
    and storage/innodb_plugin into wsrep trunk.
5. bzr merge -r 3366..tag:mysql-5.1.47 lp:mysql-server/5.1

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.