Commit 491b78be authored by mskold/marty@linux.site's avatar mskold/marty@linux.site

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
parents 4cc8da4d c16251ad
...@@ -4337,10 +4337,9 @@ int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type) ...@@ -4337,10 +4337,9 @@ int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type)
no_uncommitted_rows_reset(thd); no_uncommitted_rows_reset(thd);
thd_ndb->stmt= trans; thd_ndb->stmt= trans;
thd_ndb->query_state&= NDB_QUERY_NORMAL; thd_ndb->query_state&= NDB_QUERY_NORMAL;
m_active_trans= trans;
trans_register_ha(thd, FALSE, ndbcluster_hton); trans_register_ha(thd, FALSE, ndbcluster_hton);
} }
m_active_trans= trans;
// Start of statement // Start of statement
m_ops_pending= 0; m_ops_pending= 0;
thd->set_current_stmt_binlog_row_based_if_mixed(); thd->set_current_stmt_binlog_row_based_if_mixed();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment