Auto merge.

mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result

+RESET MASTER;
 CREATE TABLE t1 (c1 char(50));
 LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
 LOAD DATA CONCURRENT INFILE '../../std_data/words.dat' INTO TABLE t1;

mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test

 -- source include/not_ndb_default.inc
 -- source include/have_log_bin.inc
 -- source include/have_binlog_format_statement.inc
+RESET MASTER;
 
 let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
 CREATE TABLE t1 (c1 char(50));