Kristian Nielsen 8f2e05f41c Merge branch 'mdev7818-4' into 10.1 ...

Conflicts:
	mysql-test/suite/perfschema/r/stage_mdl_global.result
	sql/rpl_rli.cc
	sql/sql_parse.cc

2015-11-13 14:24:40 +01:00

..

include

MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be stopped with no-zero size)

2015-09-04 10:33:56 +02:00

r

Merge branch 'mdev7818-4' into 10.1

2015-11-13 14:24:40 +01:00

t

Merge branch '10.0' into 10.1

2015-10-12 00:37:58 +02:00

disabled.def

after perfschema-mergetree merge - update tests and results

2014-05-07 10:21:58 +02:00