Nirbhay Choubey
3088d52c20
bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).
2014-03-25 14:42:15 -04:00
Nirbhay Choubey
4cb029b38b
* Merged the missing revision 3934 from
...
codership-mysql/5.5 (missed in the last merge).
* Merged changes from Innodb to xtradb.
* Updated WSREP_PATCH_REVNO
2014-02-05 00:28:11 -05:00
Nirbhay Choubey
31eaa90a6e
Merging revision 3839..3932 from codership-mysql/5.5.
2014-01-09 14:54:57 -05:00
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
45f484b838
fixes for wsrep-5.5 merges
2013-11-27 22:20:32 +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
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
2b4183f10b
bzr merge -r3890..3891 lp:codership-mysql/5.5
2013-11-06 00:29:37 +02:00
