Comment 2 for bug 433030

The diff command was:

 bzr diff --old lp:mysql-server -rtag:mysql-5.1.35 > wsrep.diff

Patching showed a number of rejects, which were manually fixed.
One major issue remains: MariaDB build does not include innobase static version.

wsrep has a call from mysql side for: wsrep_innobase_abort_thd() (declared in ha_innodb.cc),
and this cannot be resolved at link time. This call is needed for resolving DDL concurrency conflicts.

First push in the codership-maria tree has this call simply removed. Complete merging requires
integrating wsrep in innodb plugin.