After-merge fix.

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

@@ -1745,21 +1745,21 @@ SET GLOBAL debug_dbug=@old_dbug;
 include/start_slave.inc
 *** MDEV-8725: Assertion on ROLLBACK statement in the binary log ***
 BEGIN;
-INSERT INTO t2 VALUES (200);
-INSERT INTO t1 VALUES (200);
-INSERT INTO t2 VALUES (201);
+INSERT INTO t2 VALUES (2000);
+INSERT INTO t1 VALUES (2000);
+INSERT INTO t2 VALUES (2001);
 ROLLBACK;
-SELECT * FROM t1 WHERE a>=200 ORDER BY a;
+SELECT * FROM t1 WHERE a>=2000 ORDER BY a;
 a
-200
-SELECT * FROM t2 WHERE a>=200 ORDER BY a;
+2000
+SELECT * FROM t2 WHERE a>=2000 ORDER BY a;
 a
 include/save_master_gtid.inc
 include/sync_with_master_gtid.inc
-SELECT * FROM t1 WHERE a>=200 ORDER BY a;
+SELECT * FROM t1 WHERE a>=2000 ORDER BY a;
 a
-200
-SELECT * FROM t2 WHERE a>=200 ORDER BY a;
+2000
+SELECT * FROM t2 WHERE a>=2000 ORDER BY a;
 a
 include/stop_slave.inc
 SET GLOBAL slave_parallel_threads=@old_parallel_threads;

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

@@ -2436,19 +2436,19 @@ SET GLOBAL debug_dbug=@old_dbug;
 # mark_start_commit() being already called.
 --disable_warnings
 BEGIN;
-INSERT INTO t2 VALUES (200);
-INSERT INTO t1 VALUES (200);
-INSERT INTO t2 VALUES (201);
+INSERT INTO t2 VALUES (2000);
+INSERT INTO t1 VALUES (2000);
+INSERT INTO t2 VALUES (2001);
 ROLLBACK;
 --enable_warnings
-SELECT * FROM t1 WHERE a>=200 ORDER BY a;
-SELECT * FROM t2 WHERE a>=200 ORDER BY a;
+SELECT * FROM t1 WHERE a>=2000 ORDER BY a;
+SELECT * FROM t2 WHERE a>=2000 ORDER BY a;
 --source include/save_master_gtid.inc
 
 --connection server_2
 --source include/sync_with_master_gtid.inc
-SELECT * FROM t1 WHERE a>=200 ORDER BY a;
-SELECT * FROM t2 WHERE a>=200 ORDER BY a;
+SELECT * FROM t1 WHERE a>=2000 ORDER BY a;
+SELECT * FROM t2 WHERE a>=2000 ORDER BY a;
 
 
 # Clean up.