diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-12-29 13:23:18 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-29 13:23:18 +0100 |
commit | 4a5d25c338a5d1d2cc16343380193d6bf25ae6ae (patch) | |
tree | 73b84a9c8f3d5e3e3383fa79465b11f9ded512d3 /sql/handler.cc | |
parent | 48dc7cc66ef5b69fcf28ec0b2ecf0338c188cf4e (diff) | |
parent | c13b5011629b5ff7b969d648265002e4d1ba94c2 (diff) | |
download | mariadb-git-4a5d25c338a5d1d2cc16343380193d6bf25ae6ae.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/handler.cc')
-rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 37e60f5c9bd..a91a97598d6 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -5926,6 +5926,10 @@ static int check_wsrep_max_ws_rows() 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) |