Kristian Nielsen 2f88b14acd Merge branch 'tmp' into tmp-10.1 ... Conflicts: sql/slave.cc		2016-01-15 13:01:19 +01:00
..
archive
binlog
csv
encryption
engines
federated	Merge branch '10.0' into 10.1	2015-12-21 21:24:22 +01:00
funcs_1	update results	2015-12-23 16:22:48 +01:00
funcs_2
galera	Merge branch 'github/10.0-galera' into 10.1	2015-12-22 10:32:33 +01:00
galera_3nodes
handler
heap
innodb	fix innodb-get-fk test	2015-12-21 21:24:53 +01:00
innodb_fts	Merge branch '10.0' into 10.1	2015-12-21 21:24:22 +01:00
innodb_zip
jp
large_tests
maria
mtr/t
mtr2
multi_source
ndb
optimizer_unfixed_bugs	Merge branch '10.0' into 10.1	2015-12-21 21:24:22 +01:00
parts	Merge branch '10.0' into 10.1	2015-12-21 21:24:22 +01:00
percona
perfschema	Merge branch '10.0' into 10.1	2015-12-21 21:24:22 +01:00
perfschema_stress
plugins	Merge branch '10.0' into 10.1	2015-12-21 21:24:22 +01:00
roles	MDEV-8627: SHOW GRANTS does not work for a replicated role	2015-12-21 13:42:19 +02:00
rpl	Merge branch 'tmp' into tmp-10.1	2016-01-15 13:01:19 +01:00
storage_engine
stress
sys_vars	update results	2015-12-23 16:22:48 +01:00
unit
vcol	Merge branch '10.0' into 10.1	2015-12-21 21:24:22 +01:00
wsrep