Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
e1430449 · tomas@poseidon.ndb.mysql.com · 6ee824ad · 289d4f45 · e1430449
Commit e1430449 authored May 08, 2006 by tomas@poseidon.ndb.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +2 -1

No files found.
--- 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()))