Commit e74a42f5 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/marty/MySQL/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
parents 11fe3003 4bc3ba78

sql/ha_ndbcluster.cc

+2 −1
Original line number Diff line number Diff line
@@ -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()))