diff options
| author | Luis Soares <luis.soares@oracle.com> | 2010-12-07 16:11:13 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2010-12-07 16:11:13 +0000 |
| commit | 26ee8f532edc7497a78114e65a261c7fb82531de (patch) | |
| tree | b5babca4ee608dc5e5daf9722eeb5c8414974565 /sql/handler.cc | |
| parent | 209df6a69fdebcaede67b8060eaa67fe639dc4ab (diff) | |
| parent | ffc16a2d06deb125f7ead5c4a9f6eb1fb3b48379 (diff) | |
| download | mariadb-git-26ee8f532edc7497a78114e65a261c7fb82531de.tar.gz | |
BUG#46166
Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam.
Conflicts
=========
Text conflict in sql/log.cc
Text conflict in sql/log.h
Text conflict in sql/slave.cc
Text conflict in sql/sql_parse.cc
Text conflict in sql/sql_priv.h
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 38b57c16ee0..4c48298d9e9 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: |