These are tested on bb-10.x-galera branches as it has wider test scope.

• 10.2 : https://github.com/MariaDB/server/commit/7f02d6a05f26df8e0f39f9cfd0ebe90c9dfd0a24
• 10.3 : https://github.com/MariaDB/server/commit/f4541ded3dd28811205188acdf8fef0b37f9d309
• 10.4 : https://github.com/MariaDB/server/commit/9903acd9984970468ace51e8afaf8116054ba4bf
• 10.5 : https://github.com/MariaDB/server/commit/f8927f6d3e957e0d75c95f2d7ca6a14b65efcf0e
• 10.6 : https://github.com/MariaDB/server/commit/860f3f2408fc05eb40447da9a11a24efaf27074e

Rebased and applied review comments to

• 10.2 : https://github.com/MariaDB/server/commit/5080d3c124a594c6029231f99cbdfceaab6c4e91
• 10.3 : https://github.com/MariaDB/server/commit/d4c34c90469c9989936ed2bab3a7ecf06f6c00c0
• 10.4 : https://github.com/MariaDB/server/commit/236ba8a303d0a90abbea8142d33bd1e98b648374
• 10.5 : https://github.com/MariaDB/server/commit/c384cb7f2f8857ad3d041ff567ec6f86fafc74ec

Review addressed in

• 10.2 : https://github.com/MariaDB/server/commit/f24be9e3a0233d49ed360b6a546dfebba71c49d3
• 10.3 : https://github.com/MariaDB/server/commit/932d9261f0f86318fdb2433335a77125f1c23ce3
• 10.4 : https://github.com/MariaDB/server/commit/a3bc2df30f3dd356550acc19c73e108c0a4b37d1
• 10.5 : https://github.com/MariaDB/server/commit/db7ef5563e9f12cb17c4db61e3b2500a8a7458f2

• 10.2 : https://github.com/MariaDB/server/commit/9cdbb99fe76726e2a7b541a27a5f07612eb7fb2e
• 10.3 : https://github.com/MariaDB/server/commit/f723af8582ced81b95d9b74fa2566f25b225d6d7
• 10.4 : https://github.com/MariaDB/server/commit/549b08fd7ffdb25345313f6d2fb2cb7f8bd0f342
• 10.5 : https://github.com/MariaDB/server/commit/f265c8e5b05a29b780afe3eb1df567605c7bb307

• 10.2 : https://github.com/MariaDB/server/commit/df91489e18378135f351701c1e81c701e5803652
• 10.3 : https://github.com/MariaDB/server/commit/62368751d8fc99e1eca9642bfadb5506650c514c
• 10.4 : https://github.com/MariaDB/server/commit/c41f540e385f10bb0ef89bc5967f9da5d6be7608
• 10.5 : https://github.com/MariaDB/server/commit/b7c1106455a1625ccf519bd54b542f39d323dde0

• 10.2 : https://github.com/MariaDB/server/commit/13132cfc5b71aaccd407aa007a6837e81c298ce8
• 10.3 : https://github.com/MariaDB/server/commit/dcf6422f6e63deeb1c2ceac47bd15231a10cee34
• 10.4 : https://github.com/MariaDB/server/commit/76114b0f5e31cb254c2643cc1bc58cf8cd0c4a0b
• 10.5 : https://github.com/MariaDB/server/commit/df4e733b6c8301f7e7dd52df26cd7c8205c37c31

Thank you, it looks OK now.

The proposed 10.3 version would have invoked wsrep_thd_UNLOCK(thd) twice in a row in a rarely executed code path of bg_wsrep_kill_trx(). I corrected that on merge to 10.3. This is now merged up to 10.5. The merge to 10.6 will include some cleanup of wsrep_assert_no_bf_bf_wait().