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

[Magnus Blåudd]

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

 3155 Magnus Blåudd	2011-01-27
      ndb
       - move the thd->clear_error() call up one level in the call stack
       - add assert to check that we normally don't call the function with an
        error in thd(which should then need to be handled or rest when it occured).

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-01-27 12:16:35 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-01-27 12:48:55 +0000
@@ -3412,7 +3412,6 @@ ndb_binlog_index_table__open(THD *thd, T
   tables->lock_type= TL_WRITE;
   thd->proc_info= "Opening " NDB_REP_DB "." NDB_REP_TABLE;
   tables->required_type= FRMTYPE_TABLE;
-  thd->clear_error();
   if (simple_open_n_lock_tables(thd, tables))
   {
     if (thd->killed)
@@ -3444,6 +3443,13 @@ ndb_binlog_index_table__write_rows(THD *
   TABLE_LIST binlog_tables;
 
   /*
+    Assume this function is not called with an error set in thd
+    (but clear for safety in release version)
+   */
+  assert(!thd->is_error());
+  thd->clear_error();
+
+  /*
     Turn of binlogging to prevent the table changes to be written to
     the binary log.
   */

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