6 Commits

Author	SHA1	Message	Date
Jan Lindström	9b506d4bcb	MDEV-6602: rpl.rpl_mdev6020 fails sporadically with SIGABRT ... Analysis: Problem is that we execute galera code when we are actually executing asyncronoush replication. Fix: Do not execute galera code if wsrep provider is not set.	2014-08-25 09:13:15 +03:00
Nirbhay Choubey	97779a2ef0	bzr merge -r4091..4101 codership/5.6/	2014-06-19 18:48:20 -04:00
Nirbhay Choubey	b5871a51e9	* bzr merge -r4027..4061 codership/5.6 ... * Merged Innodb changes to xtradb	2014-03-26 11:12:38 -04:00
Nirbhay Choubey	3088d52c20	bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).	2014-03-25 14:42:15 -04: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	2b4183f10b	bzr merge -r3890..3891 lp:codership-mysql/5.5	2013-11-06 00:29:37 +02:00