5 Commits

Author	SHA1	Message	Date
Marko Mäkelä	1a9b6c4c7f	Merge 10.2 into 10.3	2020-03-30 11:12:56 +03:00
Oleksandr Byelkin	ceda5f724f	Merge branch '10.2' into 10.3	2020-01-24 14:16:20 +01:00
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
Marko Mäkelä	5098d708a0	Merge 10.2 into 10.3	2019-11-12 16:42:58 +02:00
Michael Widenius	39018f2a5a	Move mysql-test-run/extra/rpl_tests to suite/rpl/include ... Renamed suite/rpl/include/rpl_sync.inc to rpl_sync_test.inc to remove clash with include/rpl_sync.inc	2018-03-29 13:59:44 +03:00