Sergei Petrunia e709eb9bf7 Merge branch '10.2' into 10.3 ... # Conflicts: # mysql-test/suite/galera/r/MW-388.result # mysql-test/suite/galera/t/MW-388.test # mysql-test/suite/innodb/r/truncate_inject.result # mysql-test/suite/innodb/t/truncate_inject.test # mysql-test/suite/rpl/r/rpl_stop_slave.result # mysql-test/suite/rpl/t/rpl_stop_slave.test # sql/sp_head.cc # sql/sp_head.h # sql/sql_lex.cc # sql/sql_yacc.yy # storage/xtradb/buf/buf0dblwr.cc		2020-01-17 00:46:40 +03:00
..
include	Merge branch '10.2' into 10.3	2020-01-17 00:46:40 +03:00
r	Merge branch '10.2' into 10.3	2020-01-17 00:46:40 +03:00
std_data	MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work	2013-12-09 12:37:45 +01:00
t	Merge branch '10.2' into 10.3	2020-01-08 13:44:06 +05:30
combinations
disabled.def	mysql-5.5.31 merge	2013-05-07 13:05:09 +02:00