codership-maria

Merge changes in lp:codership-mysql

Bug #433030 reported by Seppo Jaakola
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
codership-maria
In Progress
Medium
Teemu Ollakka

Bug Description

Merge the changes in lp:codership-mysql in lp:codership-maria

Related branches

lp:codership-maria
Seppo Jaakola (seppo-jaakola)
Changed in codership-maria:
assignee: nobody → Seppo Jaakola (seppo-jaakola)
importance: Undecided → Medium
status: New → In Progress
Revision history for this message
Seppo Jaakola (seppo-jaakola) wrote :

lp:maria has currently merged up to MySQL 5.1.35.
lp:codership-mysql has merged up to MySQL 5.1.38

In lp:coderhisp-mysql, the revision containing MySQL 5.1.35 merge is 2843.1.2

The MariaDB merge should happen by taking the diff between lp:codership-mysql, revision
2843.1.2 and applying on top of lp:maria head

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

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.

Teemu Ollakka (teemu-ollakka)
Changed in codership-maria:
assignee: Seppo Jaakola (seppo-jaakola) → Teemu Ollakka (teemu-ollakka)
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

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