Marko Mäkelä 4e7b382d31 Merge 10.1 to 10.2 ... Most conflicts are related to the MDEV-11638 InnoDB shutdown refactoring.		2017-01-05 10:48:03 +02:00
..
include	Fix/disable some failing galera tests.	2016-11-07 11:53:59 -05:00
r	Merge 10.1 to 10.2	2017-01-05 10:48:03 +02:00
t	Merge 10.1 to 10.2	2017-01-05 10:48:03 +02:00
disabled.def	Merge branch '10.1' into 10.2	2016-12-29 13:23:18 +01:00
galera_2nodes.cnf	Merge branch '10.0-galera' into bb-10.1-serg	2016-08-25 15:39:39 -04:00
galera_2nodes_as_master.cnf
galera_2nodes_as_slave.cnf	Merge branch 'github/10.0-galera' into 10.1	2015-11-19 17:48:36 +01:00
galera_3nodes_as_slave.cnf	Fix galera.galera_as_slave_nonprim test.	2015-11-20 12:32:31 -05:00
galera_4nodes.cnf
my.cnf
suite.pm	MDEV-10235: Deadlock in CREATE TABLE .. AS SELECT .. if result set is empty in Galera	2016-06-27 18:21:00 -04:00