Merge 10.3 into 10.4

mysql-test/suite/wsrep/r/wsrep-recover-v25,binlogon.rdiff

@@ -0,0 +1,17 @@
+--- r/wsrep-recover-v25.result	2019-02-05 12:33:42.681586950 +0200
++++ r/wsrep-recover-v25.reject	2019-02-05 12:34:41.661752903 +0200
+@@ -18,11 +18,10 @@
+ connection default;
+ SET DEBUG_SYNC = "now WAIT_FOR after_prepare_reached";
+ # Kill the server
+-Expect seqno 7
+-7
+-Expect 5 7
++Expect seqno 6
++6
++Expect 5
+ SELECT * FROM t1;
+ f1
+ 5
+-7
+ DROP TABLE t1;

mysql-test/suite/wsrep/r/wsrep-recover-v25.result

@@ -0,0 +1,28 @@
+# Kill the server
+Expect seqno 1
+1
+CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB;
+# Kill the server
+Expect seqno 3
+3
+INSERT INTO t1 VALUES (5);
+# Kill the server
+Expect seqno 5
+5
+SELECT VARIABLE_VALUE `expect 6` FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_last_committed';
+expect 6
+6
+connect con1, localhost, root;
+SET DEBUG_SYNC = "ha_commit_trans_after_prepare SIGNAL after_prepare_reached WAIT_FOR continue";
+INSERT INTO t1 VALUES (7);
+connection default;
+SET DEBUG_SYNC = "now WAIT_FOR after_prepare_reached";
+# Kill the server
+Expect seqno 7
+7
+Expect 5 7
+SELECT * FROM t1;
+f1
+5
+7
+DROP TABLE t1;