correct merge

a0bba5fa · jonas@perch.ndb.mysql.com · 0edae8e9 · a0bba5fa
Commit a0bba5fa authored Aug 22, 2006 by jonas@perch.ndb.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

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

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -7810,6 +7810,7 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
   */
  m_current_multi_operation= 
    lastOp ? lastOp->next() : m_active_trans->getFirstDefinedOperation();
+  if (!(res= execute_no_commit_ie(this, m_active_trans,true)))
  {
    m_multi_range_defined= multi_range_curr;
    multi_range_curr= ranges;