diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-12-31 20:58:54 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-12-31 20:58:54 -0500 |
| commit | 6f4f8c5f8ae55f6fe05990e047c10309d598eb28 (patch) | |
| tree | 934a20e50daa00b80289eb66e1312923953b08c7 /sql/handler.cc | |
| parent | 61f73d40cab40994a1baaacc87c9e81d8e335975 (diff) | |
| download | mariadb-git-6f4f8c5f8ae55f6fe05990e047c10309d598eb28.tar.gz | |
MDEV-7374 : Losing connection to MySQL while running ALTER TABLE
In the special case of ALTER TABLE with >10K rows, wsrep commit
should skip if wsrep is not enabled. Added a test case.
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index c512f2d0eb9..eb2deeaffc1 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1167,7 +1167,7 @@ static int prepare_or_error(handlerton *ht, THD *thd, bool all) /* avoid sending error, if we're going to replay the transaction */ #ifdef WITH_WSREP if (ht == wsrep_hton && - err != WSREP_TRX_SIZE_EXCEEDED && + err != EMSGSIZE && thd->wsrep_conflict_state != MUST_REPLAY) #endif my_error(ER_ERROR_DURING_COMMIT, MYF(0), err); |