#At file:///home/tomas/mysql_src/mysql-5.1-telco-6.3/
2772 Tomas Ulin 2008-11-25
post merge fix, remove previously dead code
modified:
sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc 2008-11-24 18:24:47 +0000
+++ b/sql/ha_ndbcluster.cc 2008-11-25 19:29:29 +0000
@@ -5861,12 +5861,6 @@ static int ndbcluster_rollback(handlerto
if (res != -1)
ndbcluster_print_error(res, error_op);
}
- if (!all &&
- thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
- {
- DBUG_PRINT("info", ("Rollback transaction at statement error"));
- DBUG_RETURN(res);
- }
ndb->closeTransaction(trans);
thd_ndb->trans= NULL;
thd_ndb->m_handler= NULL;
| Thread |
|---|
| • bzr commit into mysql-5.1 branch (tomas.ulin:2772) | Tomas Ulin | 26 Nov |