MW-313 Enforce wsrep_max_ws_rows also when binlog is enabled

Signed-off-by: Sachin Setiya <sachinsetia1001@gmail.com>

mysql-test/suite/wsrep/r/wsrep_rpl.result

@@ -5,12 +5,12 @@ include/master-slave.inc
 # wsrep_max_ws_rows exceeded. Error_Code 1180
 #
 CREATE TABLE t1(i INT) ENGINE = INNODB;
-SET @@GLOBAL.wsrep_max_ws_rows = 1;
+SET @@GLOBAL.wsrep_max_ws_rows = 2;
 INSERT INTO t1 VALUES(1), (2);
 SELECT COUNT(*) = 2 FROM t1;
 COUNT(*) = 2
 1
-SET @@GLOBAL.wsrep_max_ws_rows = 1;
+SET @@GLOBAL.wsrep_max_ws_rows = 2;
 DELETE FROM t1;
 SELECT COUNT(*) = 0 FROM t1;
 COUNT(*) = 0

mysql-test/suite/wsrep/t/wsrep_rpl.test

@@ -15,18 +15,13 @@ let $wsrep_max_ws_rows_slave = `SELECT @@GLOBAL.wsrep_max_ws_rows`;
 connection master;
 CREATE TABLE t1(i INT) ENGINE = INNODB;
 
-# Setting wsrep_max_ws_rows should have no impact on replication master
-# unless its a cluster node.
-SET @@GLOBAL.wsrep_max_ws_rows = 1;
+SET @@GLOBAL.wsrep_max_ws_rows = 2;
 INSERT INTO t1 VALUES(1), (2);
-
 sync_slave_with_master;
 SELECT COUNT(*) = 2 FROM t1;
 
 connection slave;
-# Setting wsrep_max_ws_rows should have no impact on replication slave
-# unless its a cluster node.
-SET @@GLOBAL.wsrep_max_ws_rows = 1;
+SET @@GLOBAL.wsrep_max_ws_rows = 2;
 
 connection master;
 DELETE FROM t1;
@@ -38,7 +33,6 @@ connection master;
 DROP TABLE t1;
 
 sync_slave_with_master;
-
 # Restore wsrep_max_ws_rows on master and slave
 connection master;
 eval SET @@GLOBAL.wsrep_max_ws_rows = $wsrep_max_ws_rows_master;

sql/log_event.cc

@@ -7586,6 +7586,10 @@ int Xid_log_event::do_apply_event(rpl_group_info *rgi)
     Record any GTID in the same transaction, so slave state is transactionally
     consistent.
   */
+
+  /*Set wsrep_affected_rows = 0 */
+  thd->wsrep_affected_rows= 0;
+
   if (rgi->gtid_pending)
   {
     sub_id= rgi->gtid_sub_id;