bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3154)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@strippedot2mx

 3154 Magnus Blåudd	2011-01-27
      ndb
       - Explicitly commit or rollback the writes to ndb_binlog_index table, 
         although we normally use a non transactional engine for the
         ndb_binlog_index table

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-01-27 12:11:16 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-01-27 12:16:35 +0000
@@ -3515,6 +3515,14 @@ ndb_binlog_index_table__write_rows(THD *
   } while (row);
 
 add_ndb_binlog_index_err:
+  /*
+    Explicitly commit or rollback the writes(although we normally
+    use a non transactional engine for the ndb_binlog_index table)
+  */
+  thd->stmt_da->can_overwrite_status= TRUE;
+  thd->is_error() ? trans_rollback_stmt(thd) : trans_commit_stmt(thd);
+  thd->stmt_da->can_overwrite_status= FALSE;
+
   close_thread_tables(thd);
   reenable_binlog(thd);
   return error;

Attachment: [text/bzr-bundle] bzr/[e-mail]