8 Commits

Author	SHA1	Message	Date
Nirbhay Choubey	02ba2bfdb4	Merging revision from codership-mysql/5.5 (r3928..3968) and ... codership-mysql/5.6 (r4021..4065). - Also contains fixes for some build failures.	2014-03-27 16:26:00 -04:00
Nirbhay Choubey	c5f7486654	bzr merge -r4062..4065 codership/5.6	2014-03-26 14:13:12 -04: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	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
Seppo Jaakola	255e20a175	Merged revisions 3418..3424 from mariadb-galera-5.5	2013-10-07 08:57:23 +03:00
Jan Lindström	ba3ff50ab2	Merge 10.0 to galera-10.0	2013-09-03 17:50:36 +03:00