Initial merge result with mariaDB 10: lp:maria
Merged with lp:maria revision #3766
Initial fixes after mariadb 10 merge, basic replication works now
Merge 10.0 to galera-10.0
Fixed merge errors and XA prepare
Fix merge error
Merge fix.
After merge fixes
Fixed merge error on rollback to savepoint
Merged #3909 from mariadb-galera-5.5
Merged revisions 3409..3411 from mariadb-galera-5.5
Merged revisions 3411..3417 from mariadb-galera-5.5
Merged revisions 3418..3424 from mariadb-galera-5.5
Merged revisions 3425..3430 from mariadb-galera-5.5
Merge fixes, now at level 3430 in mariadb-galera-5.5
Added correct mutexing on trx handling.
Merge fix for DDL handling
Fix temporary table search
Fix incorrect merge
Fixed performance schema instrumentation on galera and added correct mutexing when cancelling waiting trx on InnoDB