Seppo Jaakola
496e22cf3b
merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
...
and a number of fixes to make this buildable.
Run also few short multi-master high conflict rate tests, with no issues
2013-12-04 10:32:43 +02:00
Seppo Jaakola
b098b7a84c
bzr merge -r3904..3928 lp:codership-mysql/5.5
...
This is now otherwise on level wsrep-25.9, but storage/innobase has not been fully merged
wsrep-5.5 is not good source for that, so we probably have to cherry pick innodb changes from wsrep-5.6
2013-11-27 00:18:44 +02:00
Seppo Jaakola
6422d276fa
bzr merge -r3895..3903 lp:codership-mysql/5.5
...
This is just before 5.5.34 merge in wsrep-5.5 branch
2013-11-26 22:09:14 +02:00
Seppo Jaakola
4a11e84414
merge from lp:codership-mysql/5.5 rev #3895
2013-11-26 17:03:14 +02:00
Seppo Jaakola
a2594e96f7
Merges from lp:codership-mysql/5.5 up to rev #3893 , this changes to wsrep API #24
2013-11-26 16:48:30 +02:00
Seppo Jaakola
f222e7d471
Merge fixes, now at level 3430 in mariadb-galera-5.5
2013-10-07 11:35:19 +03:00
Seppo Jaakola
255e20a175
Merged revisions 3418..3424 from mariadb-galera-5.5
2013-10-07 08:57:23 +03:00
Seppo Jaakola
06a7eeb992
Merged revisions 3411..3417 from mariadb-galera-5.5
2013-10-07 00:18:26 +03:00
Jan Lindström
ba3ff50ab2
Merge 10.0 to galera-10.0
2013-09-03 17:50:36 +03:00
