diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2006-05-08 14:19:32 +0200 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2006-05-08 14:19:32 +0200 |
| commit | e1430449e6d568485968c5562b3b4b343a5e5174 (patch) | |
| tree | 5d7cb46d309965729984223c573642adb9591740 /sql | |
| parent | 6ee824ad01161a76f6aaf777b5ee35a40775fdb4 (diff) | |
| parent | 289d4f45957fa92be77c0a82bb1d0fdb217cfcbd (diff) | |
| download | mariadb-git-e1430449e6d568485968c5562b3b4b343a5e5174.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index f0b4c2c3f6c..b84350fd3b8 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -6447,7 +6447,8 @@ ha_ndbcluster::records_in_range(uint inx, key_range *min_key, } // Define scan op for the range - if ((trans=m_active_trans) == NULL) + if ((trans=m_active_trans) == NULL || + trans->commitStatus() != NdbTransaction::Started) { DBUG_PRINT("info", ("no active trans")); if (! (trans=ndb->startTransaction())) |