bzr commit into mysql-trunk-cluster branch (magnus.blaudd:3314)

[magnus.blaudd]

#At file:///data0/magnus/mysql/trunk-cluster/ based on revid:magnus.blaudd@stripped

 3314 magnus.blaudd@stripped	2011-06-08
      ndb
       - adapt to use mark_modified_non_trans_table() and
       has_modified_non_trans_table()
       - there is not way to turn off the flag, so remove the  code setting
        it to false. Only keep the assert.

    modified:
      sql/ha_ndbcluster.cc
      sql/ndb_local_connection.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-06-08 11:25:40 +0000
+++ b/sql/ha_ndbcluster.cc	2011-06-08 11:35:35 +0000
@@ -6301,8 +6301,8 @@ ha_ndbcluster::flush_bulk_insert(bool al
       be rolled back
     */
     THD *thd= table->in_use;
-    thd->transaction.all.modified_non_trans_table=
-      thd->transaction.stmt.modified_non_trans_table= TRUE;
+    thd->transaction.all.mark_modified_non_trans_table();
+    thd->transaction.stmt.mark_modified_non_trans_table();
     if (execute_commit(m_thd_ndb, trans, m_thd_ndb->m_force_send,
                        m_ignore_no_key) != 0)
     {

=== modified file 'sql/ndb_local_connection.cc'
--- a/sql/ndb_local_connection.cc	2011-03-28 09:28:45 +0000
+++ b/sql/ndb_local_connection.cc	2011-06-08 11:35:35 +0000
@@ -143,9 +143,8 @@ Ndb_local_connection::execute_query_iso(
   THD_TRANS save_thd_transaction_all= m_thd->transaction.all;
   THD_TRANS save_thd_transaction_stmt= m_thd->transaction.stmt;
 
-  /* Set modified_non_trans_table to false(check if actually needed) */
-  assert(m_thd->transaction.stmt.modified_non_trans_table == FALSE);
-  m_thd->transaction.stmt.modified_non_trans_table= FALSE;
+  /* Check modified_non_trans_table is false(check if actually needed) */
+  assert(!m_thd->transaction.stmt.has_modified_non_trans_table());
 
 #if 0
   /*


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