diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-08 18:47:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-10 22:27:36 +0200 |
| commit | 03ec3511a82e90310c850ea71b395b214cab1645 (patch) | |
| tree | 65e6b3dea94e4744b5b9a3bfb0f847977ed7d55a /sql/wsrep_hton.cc | |
| parent | 8596b70f96fc543c2e1cac4bc8cbe58dcc4004e5 (diff) | |
| download | mariadb-git-03ec3511a82e90310c850ea71b395b214cab1645.tar.gz | |
cleanup: galera misc cleanups
also disable galera-specific output in mysql_tzinfo_to_sql,
it'll be enabled later.
Diffstat (limited to 'sql/wsrep_hton.cc')
| -rw-r--r-- | sql/wsrep_hton.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index 4fc9ce2bce2..b77cc54ee15 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -157,6 +157,11 @@ static int wsrep_prepare(handlerton *hton, THD *thd, bool all) !thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) && (thd->variables.wsrep_on && !wsrep_trans_cache_is_empty(thd))) { + int res= wsrep_run_wsrep_commit(thd, hton, all); + if (res == WSREP_TRX_SIZE_EXCEEDED) + res= EMSGSIZE; + else + res= EDEADLK; // for a better error message DBUG_RETURN (wsrep_run_wsrep_commit(thd, hton, all)); } DBUG_RETURN(0); |