[Commits] e1c6f28: Merge branch '10.0-galera' into 10.1

Nirbhay Choubey nirbhay at mariadb.com
Wed Sep 28 20:20:08 EEST 2016


revision-id: e1c6f28f0de5f3ad6c17f581a365fd90a4e14316 (mariadb-10.1.17-34-ge1c6f28)
parent(s): 735a4a17c2b83a214dcd5279c66cd3577ef76eb1 c9ded859a6fad25fc513d3a0c7d17f826e567691
author: Nirbhay Choubey
committer: Nirbhay Choubey
timestamp: 2016-09-28 13:20:02 -0400
message:

Merge branch '10.0-galera' into 10.1


 mysql-test/suite/wsrep/r/wsrep_rpl.result | 22 ++++++++++++++
 mysql-test/suite/wsrep/t/wsrep_rpl.cnf    |  1 +
 mysql-test/suite/wsrep/t/wsrep_rpl.test   | 50 +++++++++++++++++++++++++++++++
 scripts/wsrep_sst_xtrabackup-v2.sh        |  2 +-
 scripts/wsrep_sst_xtrabackup.sh           |  2 +-
 sql/handler.cc                            |  4 +++
 6 files changed, 79 insertions(+), 2 deletions(-)

diff --cc sql/handler.cc
index 4e4c8fa,a142bb4..78e0c5b
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@@ -5875,26 -6086,6 +5875,30 @@@ 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;


More information about the commits mailing list