BUG#25032066 PREPARED TRANSACTION SHOULD NOT BE ROLLED BACK

 BY HIGH PRIORITY TRANSACTION Problem : --------- 1. delete_all_rows() and rnd_init() are not returning error after async rollback in 5.7. This results in assert in innodb in next call. 2. High priority transaction is rolling back prepared transaction. This is because TRX_FORCE_ROLLBACK_DISABLE is getting set only for first entry [TrxInInnoDB]. Solution : ---------- 1. return DB_FORCED_ABORT error after rollback. 2. check and disable rollback in TrxInInnodb::enter always. Reviewed-by: Sunny Bains <sunny.bains@oracle.com> RB: 13777 (cherry picked from commit 628f957a874dfcdc5431c52a39b5363c13a1fdba)

Author: Debarun Banerjee

mysql-test/suite/innodb/r/high_prio_trx_debug.result

@@ -25,3 +25,21 @@ select * from t1;
 c1
 2
 DROP TABLE t1;
+#
+# Bug #25032066: PREPARED TRANSACTION SHOULD NOT BE ROLLED BACK
+#
+CREATE TABLE t1(col1 int PRIMARY KEY, col2 int);
+INSERT INTO t1 VALUES(1, 10);
+XA START 'xid1';
+UPDATE t1 SET col2 = 20;
+XA END 'xid1';
+XA PREPARE 'xid1';
+include/start_transaction_high_prio.inc
+START TRANSACTION /* HIGH PRIORITY */;
+UPDATE t1 SET col2 = 30 WHERE col2 = 10;;
+XA COMMIT 'xid1';
+COMMIT;
+SELECT * FROM t1;
+col1	col2
+1	20
+DROP TABLE t1;

mysql-test/suite/innodb/t/high_prio_trx_debug.test

@@ -33,7 +33,6 @@ select * from t1;
 SET DEBUG_SYNC='trx_kill_blocking_enter SIGNAL enter_innodb';
 UPDATE t1 SET c1=2 WHERE c1=0;
 commit;
---disconnect con1
 
 --connection default
 --error ER_LOCK_DEADLOCK
@@ -42,4 +41,34 @@ commit;
 select * from t1;
 DROP TABLE t1;
 
+--echo #
+--echo # Bug #25032066: PREPARED TRANSACTION SHOULD NOT BE ROLLED BACK
+--echo #
+
+CREATE TABLE t1(col1 int PRIMARY KEY, col2 int);
+INSERT INTO t1 VALUES(1, 10);
+
+XA START 'xid1';
+UPDATE t1 SET col2 = 20;
+XA END 'xid1';
+XA PREPARE 'xid1';
+
+--connection con1
+--source include/start_transaction_high_prio.inc
+--send UPDATE t1 SET col2 = 30 WHERE col2 = 10;
+--sleep 1
+
+--connection default
+XA COMMIT 'xid1';
+
+--connection con1
+--reap
+COMMIT;
+
+--connection default
+SELECT * FROM t1;
+
+--disconnect con1
+DROP TABLE t1;
+
 --source include/wait_until_count_sessions.inc

rapid/plugin/group_replication/tests/mtr/r/gr_multi_primary_foreign_key_conflict.result

@@ -35,7 +35,6 @@ COMMIT;
 # certification, since server_1 is blocked before broadcast.
 [connection server2]
 UPDATE t1 SET a=2 WHERE a=1;
-include/sync_slave_sql_with_master.inc
 
 ############################################################
 # 5. Signal the waiting thread on server_1 to resume.
@@ -47,6 +46,8 @@ SET @@GLOBAL.DEBUG= @debug_save;
 # 6. It will end up in an error stating that it was aborted,
 # since transactions are conflicting and server2 was
 # ordered first.
+[connection server2]
+include/sync_slave_sql_with_master.inc
 [connection server_1]
 ERROR HY000: Plugin instructed the server to rollback the current transaction.
 

rapid/plugin/group_replication/tests/mtr/r/gr_multi_primary_key_conflict.result

@@ -32,7 +32,6 @@ COMMIT;
 # certification, since server_1 is blocked before broadcast.
 [connection server2]
 UPDATE t1 SET a=4 AND b=5 WHERE b=2;
-include/sync_slave_sql_with_master.inc
 
 ############################################################
 # 5. Signal the waiting thread on server_1 to resume.
@@ -44,6 +43,8 @@ SET @@GLOBAL.DEBUG= @debug_save;
 # 6. It will end up in an error stating that it was aborted,
 # since transactions are conflicting and server2 was
 # ordered first.
+[connection server2]
+include/sync_slave_sql_with_master.inc
 [connection server_1]
 ERROR HY000: Plugin instructed the server to rollback the current transaction.
 

rapid/plugin/group_replication/tests/mtr/r/gr_multi_primary_unique_key_conflict.result

@@ -32,7 +32,6 @@ COMMIT;
 # certification, since server_1 is blocked before broadcast.
 [connection server2]
 UPDATE t1 SET b=6 WHERE c=4;
-include/sync_slave_sql_with_master.inc
 
 ############################################################
 # 5. Signal the waiting thread on server_1 to resume.
@@ -44,6 +43,8 @@ SET @@GLOBAL.DEBUG= @debug_save;
 # 6. It will end up in an error stating that it was aborted,
 # since transactions are conflicting and server2 was
 # ordered first.
+[connection server2]
+include/sync_slave_sql_with_master.inc
 [connection server_1]
 ERROR HY000: Plugin instructed the server to rollback the current transaction.
 

rapid/plugin/group_replication/tests/mtr/r/gr_multi_unique_key_conflict.result

@@ -31,7 +31,6 @@ COMMIT;
 # certification, since server_1 is blocked before broadcast.
 [connection server2]
 INSERT INTO t1 VALUES(4, 2, 3);
-include/sync_slave_sql_with_master.inc
 
 ############################################################
 # 5. Signal the waiting thread on server_1 to resume.
@@ -43,6 +42,8 @@ SET @@GLOBAL.DEBUG= @debug_save;
 # 6. It will end up in an error stating that it was aborted,
 # since transactions are conflicting and server2 was
 # ordered first.
+[connection server2]
+include/sync_slave_sql_with_master.inc
 [connection server_1]
 ERROR HY000: Plugin instructed the server to rollback the current transaction.
 

rapid/plugin/group_replication/tests/mtr/r/gr_primary_key_conflict.result

@@ -31,7 +31,6 @@ COMMIT;
 # certification, since server_1 is blocked before broadcast.
 [connection server2]
 INSERT INTO t1 VALUES (1);
-include/sync_slave_sql_with_master.inc
 
 ############################################################
 # 5. Signal the waiting thread on server_1 to resume.
@@ -43,6 +42,8 @@ SET @@GLOBAL.DEBUG= @debug_save;
 # 6. It will end up in an error stating that it was aborted,
 # since transactions are conflicting and server2 was
 # ordered first.
+[connection server2]
+include/sync_slave_sql_with_master.inc
 [connection server_1]
 ERROR HY000: Plugin instructed the server to rollback the current transaction.
 

rapid/plugin/group_replication/tests/mtr/r/gr_read_committed_isolation.result

@@ -44,7 +44,6 @@ BEGIN;
 UPDATE t1 SET a=3 WHERE a=10;
 DELETE FROM t1 where a=20;
 COMMIT;
-include/sync_slave_sql_with_master.inc
 
 ## 3.4 Signal the waiting thread on server1 to resume.
 [connection server1]
@@ -53,6 +52,8 @@ SET @@GLOBAL.DEBUG= @debug_save;
 
 ## 3.5 It will end up in an error stating that it was aborted, since
 ## transactions are conflicting and server2 was ordered first.
+[connection server2]
+include/sync_slave_sql_with_master.inc
 [connection server_1]
 ERROR HY000: Plugin instructed the server to rollback the current transaction.
 

rapid/plugin/group_replication/tests/mtr/r/gr_read_uncommitted_isolation.result

@@ -44,7 +44,6 @@ BEGIN;
 UPDATE t1 SET a=3 WHERE a=10;
 DELETE FROM t1 where a=20;
 COMMIT;
-include/sync_slave_sql_with_master.inc
 
 ## 3.4 Signal the waiting thread on server1 to resume.
 [connection server1]
@@ -53,6 +52,8 @@ SET @@GLOBAL.DEBUG= @debug_save;
 
 ## 3.5 It will end up in an error stating that it was aborted, since
 ## transactions are conflicting and server2 was ordered first.
+[connection server2]
+include/sync_slave_sql_with_master.inc
 [connection server_1]
 ERROR HY000: Plugin instructed the server to rollback the current transaction.
 

rapid/plugin/group_replication/tests/mtr/r/gr_repeatable_read_isolation.result

@@ -44,7 +44,6 @@ BEGIN;
 UPDATE t1 SET a=3 WHERE a=10;
 DELETE FROM t1 where a=20;
 COMMIT;
-include/sync_slave_sql_with_master.inc
 
 ## 3.4 Signal the waiting thread on server1 to resume.
 [connection server1]
@@ -53,6 +52,8 @@ SET @@GLOBAL.DEBUG= @debug_save;
 
 ## 3.5 It will end up in an error stating that it was aborted, since
 ## transactions are conflicting and server2 was ordered first.
+[connection server2]
+include/sync_slave_sql_with_master.inc
 [connection server_1]
 ERROR HY000: Plugin instructed the server to rollback the current transaction.