162 Commits

Author	SHA1	Message	Date
Nirbhay Choubey	8ec02bb836	bzr merge -c4123 codership/5.6/ ... (minus http://bazaar.launchpad.net/~codership/codership-mysql/5.6/revision/4122)	2014-08-12 14:50:26 -04:00
Nirbhay Choubey	efdf79b447	Local merge of patch for MDEV-4647 from maria-5.5-galera.	2014-07-22 09:43:42 -04:00
Nirbhay Choubey	dc377fcbc0	Merge of patch for MDEV-6411 from maria-5.5-galera.	2014-07-09 11:07:23 -04:00
Nirbhay Choubey	02034e4218	Merging fix for MDEV#6296 from maria-5.5-galera.	2014-06-19 21:55:19 -04:00
Nirbhay Choubey	3088d52c20	bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).	2014-03-25 14:42:15 -04:00
Nirbhay Choubey	4a6be51f78	* Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera. ... * Fixed Debian/Ubuntu dist files. * Fixed some compiler warnings.	2014-01-30 12:45:38 -05: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	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
Jan Lindström	ba3ff50ab2	Merge 10.0 to galera-10.0	2013-09-03 17:50:36 +03:00