diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-08 14:19:32 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-08 14:19:32 +0200 |
| commit | 2f0b9ce9aa5673c4692d1b4cd8fbe3f3bcd56798 (patch) | |
| tree | 5d7cb46d309965729984223c573642adb9591740 /sql/ha_ndbcluster.cc | |
| parent | 5b0f172586337be136fd7a56619bbb0a9d794440 (diff) | |
| parent | e74a42f50ce464e122ddd8b59b014f69c931e936 (diff) | |
| download | mariadb-git-2f0b9ce9aa5673c4692d1b4cd8fbe3f3bcd56798.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/ha_ndbcluster.cc')
| -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())) |