5 Commits

Author	SHA1	Message	Date
Nirbhay Choubey	69e5f0f423	cleanup: remove duplicate declaration	2015-02-19 17:48:23 -05:00
Nirbhay Choubey	0b98d2fd2a	bzr merge -r4065..4088 codership/5.6	2014-05-21 17:07:17 -04:00
Nirbhay Choubey	899f9801d4	bzr merge -r3946..3968 codership/5.5	2014-03-25 17:01:05 -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	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