diff options
| author | Luis Soares <luis.soares@oracle.com> | 2010-12-16 19:11:08 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2010-12-16 19:11:08 +0000 |
| commit | 60f650069b7bf02a312991e99dedab4c3fba2ad8 (patch) | |
| tree | a6edecd2cb28ff7a9782664037a67ee1290074f4 /sql/handler.cc | |
| parent | 6a9822a8d03335a8470ed6f61343cb2dc812232c (diff) | |
| parent | bd0709cc8726e2d189df71138488ff7b2b004460 (diff) | |
| download | mariadb-git-60f650069b7bf02a312991e99dedab4c3fba2ad8.tar.gz | |
BUG#46166
Merging to latest mysql-5.1-bugteam.
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) |