Fix two issues that caused the MTR tests

   galera.galera_performance_schema,
   galera.galera_retry_applying, and
   galera.GCF-939

to fail:
   1) Moved mtr.add_suppression() calls to the beginning of the
      galera_retry_applying MTR test.
   2) Modified the condition in wsrep_apply_events() for
      calling wsrep_dump_rbr_buf_with_header() function.

Author: plampio

mysql-test/suite/galera/r/galera_retry_applying.result

@@ -1,5 +1,9 @@
 connection node_2;
 connection node_1;
+CALL mtr.add_suppression("Event .* Update_rows.* apply failed");
+CALL mtr.add_suppression("Inconsistency detected");
+CALL mtr.add_suppression("Failed to apply write set:.*");
+CALL mtr.add_suppression("Event .* Write_rows.* apply failed");
 CREATE TABLE t1 (f1 INTEGER PRIMARY KEY DEFAULT 0, f2 char(12));
 CREATE TABLE t3 (f1 INTEGER PRIMARY KEY DEFAULT 0, f2 char(12));
 START TRANSACTION;
@@ -10,7 +14,6 @@ COMMIT;
 connection node_2;
 SET GLOBAL wsrep_applier_retry_count = 2;
 SET GLOBAL debug_dbug = "d,apply_event_fail_once:o,/dev/null";
-CALL mtr.add_suppression("Event .* Write_rows.* apply failed");
 connection node_1;
 START TRANSACTION;
 UPDATE t3 SET f2 = 'ax' WHERE f1 = 1;
@@ -46,9 +49,6 @@ connection node_1;
 SET wsrep_sync_wait=0;
 CREATE TABLE t2 (f1 INTEGER PRIMARY KEY DEFAULT 0, f2 char(12));
 connection node_2;
-CALL mtr.add_suppression("Event .* Update_rows.* apply failed");
-CALL mtr.add_suppression("Inconsistency detected");
-CALL mtr.add_suppression("Failed to apply write set:.*");
 SET GLOBAL wsrep_applier_retry_count = 2;
 SET GLOBAL debug_dbug = '';
 SET GLOBAL debug_dbug = "d,apply_event_fail_always:o,/dev/null";

mysql-test/suite/galera/t/galera_retry_applying.test

@@ -5,6 +5,11 @@
 --source include/galera_cluster.inc
 --source include/have_debug_sync.inc
 
+CALL mtr.add_suppression("Event .* Update_rows.* apply failed");
+CALL mtr.add_suppression("Inconsistency detected");
+CALL mtr.add_suppression("Failed to apply write set:.*");
+CALL mtr.add_suppression("Event .* Write_rows.* apply failed");
+
 #
 # Case 1: Retrying succeeds after one retry event, no error is raised.
 #
@@ -26,7 +31,6 @@ COMMIT;
 
 SET GLOBAL wsrep_applier_retry_count = 2;
 SET GLOBAL debug_dbug = "d,apply_event_fail_once:o,/dev/null";
-CALL mtr.add_suppression("Event .* Write_rows.* apply failed");
 
 --connection node_1
 START TRANSACTION;
@@ -86,9 +90,6 @@ SET wsrep_sync_wait=0;
 CREATE TABLE t2 (f1 INTEGER PRIMARY KEY DEFAULT 0, f2 char(12));
 
 --connection node_2
-CALL mtr.add_suppression("Event .* Update_rows.* apply failed");
-CALL mtr.add_suppression("Inconsistency detected");
-CALL mtr.add_suppression("Failed to apply write set:.*");
 
 SET GLOBAL wsrep_applier_retry_count = 2;
 SET GLOBAL debug_dbug = '';

sql/wsrep_applier.cc

@@ -311,9 +311,11 @@ int wsrep_apply_events(THD*                       thd,
     trans_release_savepoint(thd, savepoint);
   }
 
-  if (ret && !thd->wsrep_has_ignored_error)
+  if (ret || wsrep_thd_has_ignored_error(thd))
   {
-    wsrep_store_error(thd, err, include_msg);
+    if (ret) {
+      wsrep_store_error(thd, err, include_msg);
+    }
     wsrep_dump_rbr_buf_with_header(thd, data.data(), data.size());
   }