diff options
| author | Luis Soares <luis.soares@oracle.com> | 2010-12-16 19:12:31 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2010-12-16 19:12:31 +0000 |
| commit | 905e21a0cf7507099de181a67a114bb881b50c56 (patch) | |
| tree | dd770a5e46eacda4881d8b5c76dfb57a72df6417 /sql/handler.cc | |
| parent | a72186103febeafb08a9704b0ec1bd4488a7b24c (diff) | |
| parent | 1b94ba5407d125b03550ce7231714fab8c634cc9 (diff) | |
| download | mariadb-git-905e21a0cf7507099de181a67a114bb881b50c56.tar.gz | |
BUG#46166
Merging to latest mysql-5.5-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 069422a7245..4e8af034fd8 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1237,7 +1237,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();); RUN_HOOK(transaction, after_commit, (thd, FALSE)); end: |