diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-17 13:06:49 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-17 13:06:49 +0200 |
| commit | 2269988b7570bd0a78a92ee3778590cde5b1b90f (patch) | |
| tree | 500d3653afddd19e0dc1dd73c4d76426295665b9 /sql/handler.cc | |
| parent | 122cde4c38ed821a262c58462a8a85663288344e (diff) | |
| parent | 4c0c5525825714ccd91c3c07e303c068bcc12ce5 (diff) | |
| download | mariadb-git-2269988b7570bd0a78a92ee3778590cde5b1b90f.tar.gz | |
merge
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 33c7f518838..ce4e4a9e3a9 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1192,7 +1192,11 @@ int ha_commit_trans(THD *thd, bool all) error=ha_commit_one_phase(thd, all) ? (cookie ? 2 : 1) : 0; DBUG_EXECUTE_IF("crash_commit_before_unlog", DBUG_SUICIDE();); if (cookie) - tc_log->unlog(cookie, xid); + if(tc_log->unlog(cookie, xid)) + { + error= 2; + goto end; + } DBUG_EXECUTE_IF("crash_commit_after", DBUG_SUICIDE();); end: if (rw_trans) |