Commit 4e2ebb9d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
parents 6c244b12 c9950f26

sql/ha_ndbcluster.cc

+1 −2
Original line number Diff line number Diff line
@@ -4337,10 +4337,9 @@ int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type) 
    no_uncommitted_rows_reset(thd);

    thd_ndb->stmt= trans;

    thd_ndb->query_state&= NDB_QUERY_NORMAL;

    m_active_trans= trans;

    trans_register_ha(thd, FALSE, ndbcluster_hton);

  }



  m_active_trans= trans;

  // Start of statement

  m_ops_pending= 0;    

  thd->set_current_stmt_binlog_row_based_if_mixed();