Commit 68fa01f0 authored by unknown's avatar unknown
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


include/my_base.h:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
parents 34dcbe66 23e92aca

sql/ha_ndbcluster.cc

+2 −2
Original line number Diff line number Diff line
@@ -3926,8 +3926,6 @@ int ha_ndbcluster::extra(enum ha_extra_function operation) 
int ha_ndbcluster::reset()

{

  DBUG_ENTER("ha_ndbcluster::reset");

  m_delete_cannot_batch= FALSE;

  m_update_cannot_batch= FALSE;

  cond_clear();

  /*

    Regular partition pruning will set the bitmap appropriately.
@@ -3941,6 +3939,8 @@ int ha_ndbcluster::reset() 
  m_ignore_dup_key= FALSE;

  m_use_write= FALSE;

  m_ignore_no_key= FALSE;

  m_delete_cannot_batch= FALSE;

  m_update_cannot_batch= FALSE;



  DBUG_RETURN(0);

}