The innodb patches should be applied AFTER the innodb 1.0.1 plugin is dropped in to storage/innobase
Perhaps it would make sense to carve up the patch, extract the parts that sit inside each engine.
This can help keep the innodb part sane on top of the plugin, as well as serve as an example for for instance adding PBXT support.
The infoschema support and rtlib mods to all the makefiles could also be separate I suppose.
Separating some of this before then trying partial merges could be a good approach.
Notes/ideas for 5.1 merge and future maintenance:
The innodb patches should be applied AFTER the innodb 1.0.1 plugin is dropped in to storage/innobase
Perhaps it would make sense to carve up the patch, extract the parts that sit inside each engine.
This can help keep the innodb part sane on top of the plugin, as well as serve as an example for for instance adding PBXT support.
The infoschema support and rtlib mods to all the makefiles could also be separate I suppose.
Separating some of this before then trying partial merges could be a good approach.