Commit 8e60be55 authored by unknown's avatar unknown
Browse files

merge

parent 1cf6bc4b

sql/ha_ndbcluster.cc

+0 −18
Original line number Diff line number Diff line
@@ -9611,24 +9611,6 @@ ha_ndbcluster::generate_scan_filter(Ndb_cond_stack *ndb_cond_stack, 
  DBUG_RETURN(0);

}





void 

ha_ndbcluster::release_completed_operations(NdbTransaction *trans,

					    bool force_release)

{

  if (!force_release)

  {

    if (get_thd_ndb(current_thd)->query_state & NDB_QUERY_MULTI_READ_RANGE)

    {

      /* We are batching reads and have not consumed all fetched

	 rows yet, releasing operation records is unsafe 

      */

      return;

    }

  }

  trans->releaseCompletedOperations();

}



/*

  get table space info for SHOW CREATE TABLE

*/

sql/ha_ndbcluster.h

+0 −1
Original line number Diff line number Diff line
@@ -907,7 +907,6 @@ static void set_tabname(const char *pathname, char *tabname); 
  bool m_force_send;

  ha_rows m_autoincrement_prefetch;

  bool m_transaction_on;

  void release_completed_operations(NdbTransaction*, bool);



  Ndb_cond_stack *m_cond_stack;

  bool m_disable_multi_read;