diff options
author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 14:32:57 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 14:32:57 -0400 |
commit | 99df0fbad5147b02ffed926f50cef11f9427e398 (patch) | |
tree | 08db15074e1dde87aeea0c24284bf93e36e35460 /sql/wsrep_hton.cc | |
parent | 8a6f4e198a57491bac8cc2aac0f3d455a28d79cd (diff) | |
download | mariadb-git-99df0fbad5147b02ffed926f50cef11f9427e398.tar.gz |
bzr merge -r3968..3984 codership/5.5 (non-Innodb changes only).
Diffstat (limited to 'sql/wsrep_hton.cc')
-rw-r--r-- | sql/wsrep_hton.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index 6319ce561e1..a1de760ad9e 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -513,11 +513,17 @@ wsrep_run_wsrep_commit(THD *thd, handlerton *hton, bool all) DBUG_RETURN(WSREP_TRX_CERT_FAIL); + case WSREP_SIZE_EXCEEDED: + WSREP_ERROR("transaction size exceeded"); + mysql_mutex_unlock(&thd->LOCK_wsrep_thd); + DBUG_RETURN(WSREP_TRX_SIZE_EXCEEDED); case WSREP_CONN_FAIL: WSREP_ERROR("connection failure"); + mysql_mutex_unlock(&thd->LOCK_wsrep_thd); DBUG_RETURN(WSREP_TRX_ERROR); default: WSREP_ERROR("unknown connection failure"); + mysql_mutex_unlock(&thd->LOCK_wsrep_thd); DBUG_RETURN(WSREP_TRX_ERROR); } |