Merge pull request #654 from codership/MDEV-13549-fixes-for-galera_var_max_ws_rows

MDEV-13549 Fix for test galera.galera_var_max_ws_rows

mysql-test/suite/galera/disabled.def

@@ -44,7 +44,6 @@ lp1376747 : MDEV-13549 Galera test failures
 galera_toi_ddl_nonconflicting : MDEV-13549 Galera test failures
 galera_parallel_simple : MDEV-13549 Galera test failures
 galera_admin : MDEV-13549 Galera test failures
-galera_var_max_ws_rows :  MDEV-13549 Galera test failures 10.1
 galera_as_master: MDEV-13549 Galera test failures 10.1
 galera_pc_ignore_sb : MDEV-13549 Galera test failures 10.1
 galera_lock_table : MDEV-13549 Galera test failures 10.1

sql/handler.cc

@@ -5771,8 +5771,6 @@ static int write_locked_table_maps(THD *thd)
 
 typedef bool Log_func(THD*, TABLE*, bool, const uchar*, const uchar*);
 
-static int check_wsrep_max_ws_rows();
-
 static int binlog_log_row(TABLE* table,
                           const uchar *before_record,
                           const uchar *after_record,
@@ -5826,13 +5824,6 @@ static int binlog_log_row(TABLE* table,
       bool const has_trans= thd->lex->sql_command == SQLCOM_CREATE_TABLE ||
                             table->file->has_transactions();
       error= (*log_func)(thd, table, has_trans, before_record, after_record);
-
-      /*
-        Now that the record has been logged, increment wsrep_affected_rows and
-        also check whether its within the allowable limits (wsrep_max_ws_rows).
-      */
-      if (error == 0)
-        error= check_wsrep_max_ws_rows();
     }
   }
   return error ? HA_ERR_RBR_LOGGING_FAILED : 0;
@@ -5943,30 +5934,6 @@ int handler::ha_reset()
 }
 
 
-static int check_wsrep_max_ws_rows()
-{
-#ifdef WITH_WSREP
-  if (wsrep_max_ws_rows)
-  {
-    THD *thd= current_thd;
-
-    if (!WSREP(thd))
-      return 0;
-
-    thd->wsrep_affected_rows++;
-    if (thd->wsrep_exec_mode != REPL_RECV &&
-        thd->wsrep_affected_rows > wsrep_max_ws_rows)
-    {
-      trans_rollback_stmt(thd) || trans_rollback(thd);
-      my_message(ER_ERROR_DURING_COMMIT, "wsrep_max_ws_rows exceeded", MYF(0));
-      return ER_ERROR_DURING_COMMIT;
-    }
-  }
-#endif /* WITH_WSREP */
-  return 0;
-}
-
-
 int handler::ha_write_row(uchar *buf)
 {
   int error;