diff options
| author | mskold/marty@linux.site <> | 2007-01-31 22:58:03 +0100 |
|---|---|---|
| committer | mskold/marty@linux.site <> | 2007-01-31 22:58:03 +0100 |
| commit | 201705a4b42108190387ee6aba10e088042ef193 (patch) | |
| tree | 5640c3d05c3a339bf4131c112a07e1a4fc61de77 /sql/ha_ndbcluster.cc | |
| parent | 1ce3dc9636761e201998d5c3e81e6262d6cb0a48 (diff) | |
| parent | 4cc8da4d391727ab5f7b06889b1fa7a1bd5a7038 (diff) | |
| download | mariadb-git-201705a4b42108190387ee6aba10e088042ef193.tar.gz | |
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index e930e3bee46..bf38a904297 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -4347,10 +4347,10 @@ int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type) ERR_RETURN(ndb->getNdbError()); 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); } - thd_ndb->query_state&= NDB_QUERY_NORMAL; - m_active_trans= trans; // Start of statement m_ops_pending= 0; @@ -8292,6 +8292,8 @@ close_scan: if (multi_range_curr == multi_range_end) { DBUG_MULTI_RANGE(16); + Thd_ndb *thd_ndb= get_thd_ndb(current_thd); + thd_ndb->query_state&= NDB_QUERY_NORMAL; DBUG_RETURN(HA_ERR_END_OF_FILE); } |