Merge 10.3 into 10.4

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

@@ -648,4 +648,12 @@ SET GLOBAL slave_parallel_threads=@old_parallel_threads;
 include/start_slave.inc
 connection server_1;
 DROP TABLE t1, t2, t3;
+include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+Check that no more than the expected last four GTIDs are in mysql.gtid_slave_pos
+select count(4) <= 4 from mysql.gtid_slave_pos order by domain_id, sub_id;
+count(4) <= 4
+1
+connection server_1;
 include/rpl_end.inc

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

@@ -13,8 +13,8 @@ insert into mysqltest1.t1 values (1);
 select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt';
 create table mysqltest1.t2 (n int);
 create table mysqltest1.t3 (n int);
---replace_result \\ / 66 39 93 39 17 39 247 39 "File exists" "Directory not empty"
---error 1010
+--replace_result \\ / 66 39 93 39 17 39 247 39 41 39 "File exists" "Directory not empty"
+--error ER_DB_DROP_RMDIR
 drop database mysqltest1;
 use mysqltest1;
 show tables;
@@ -30,8 +30,8 @@ while ($1)
 }
 --enable_query_log
 
---replace_result \\ / 66 39 93 39 17 39 247 39 "File exists" "Directory not empty"
---error 1010
+--replace_result \\ / 66 39 93 39 17 39 247 39  41 39 "File exists" "Directory not empty"
+--error ER_DB_DROP_RMDIR
 drop database mysqltest1;
 use mysqltest1;
 show tables;

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

@@ -1,6 +1,7 @@
 --source include/have_innodb.inc
 --source include/have_binlog_format_statement.inc
 --source include/master-slave.inc
+--source include/not_windows.inc #unix shell escaping used for mysqlbinlog
 
 # MDEV-382: multiple SQL injections in replication code.
 

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

@@ -553,5 +553,29 @@ SET GLOBAL slave_parallel_threads=@old_parallel_threads;
 
 --connection server_1
 DROP TABLE t1, t2, t3;
+--source include/save_master_gtid.inc
 
+--connection server_2
+--source include/sync_with_master_gtid.inc
+# Check for left-over rows in table mysql.gtid_slave_pos (MDEV-12147).
+#
+# There was a bug when a transaction got a conflict and was rolled back. It
+# might have also handled deletion of some old rows, and these deletions would
+# then also be rolled back. And since the deletes were never re-tried, old no
+# longer needed rows would accumulate in the table without limit.
+# 
+# The earlier part of this test file have plenty of transactions being rolled
+# back. But the last DROP TABLE statement runs on its own and should never
+# conflict, thus at this point the mysql.gtid_slave_pos table should be clean.
+#
+# To support @@gtid_pos_auto_engines, when a row is inserted in the table, it
+# is associated with the engine of the table at insertion time, and it will
+# only be deleted during record_gtid from a table of the same engine. Since we
+# alter the table from MyISAM to InnoDB at the start of this test, we should
+# end up with 4 rows: two left-over from when the table was MyISAM, and two
+# left-over from the InnoDB part.
+--echo Check that no more than the expected last four GTIDs are in mysql.gtid_slave_pos
+select count(4) <= 4 from mysql.gtid_slave_pos order by domain_id, sub_id;
+
+--connection server_1
 --source include/rpl_end.inc

mysql-test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.cnf

@@ -5,5 +5,6 @@ log-slave-updates=0
 loose-innodb
 
 [mysqld.2]
+slave-transaction-retries=100
 log-slave-updates=0
 loose-innodb