Commit ac3b8a79 authored by unknown's avatar unknown
Browse files

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

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
parents bdb9b448 22f8f391

sql/ha_ndbcluster.cc

+16 −2
Original line number Diff line number Diff line
@@ -3278,8 +3278,7 @@ int ha_ndbcluster::extra(enum ha_extra_function operation) 
    break;

  case HA_EXTRA_RESET:                 /* Reset database to after open */

    DBUG_PRINT("info", ("HA_EXTRA_RESET"));

    DBUG_PRINT("info", ("Clearing condition stack"));

    cond_clear();

    reset();

    break;

  case HA_EXTRA_CACHE:                 /* Cash record in HA_rrnd() */

    DBUG_PRINT("info", ("HA_EXTRA_CACHE"));
@@ -3401,6 +3400,21 @@ int ha_ndbcluster::extra(enum ha_extra_function operation) 
  DBUG_RETURN(0);

}





int ha_ndbcluster::reset()

{

  DBUG_ENTER("ha_ndbcluster::reset");

  cond_clear();



  /* reset flags set by extra calls */

  m_retrieve_all_fields= FALSE;

  m_retrieve_primary_key= FALSE;

  m_ignore_dup_key= FALSE;

  m_use_write= FALSE;

  DBUG_RETURN(0);

}





/* 

   Start of an insert, remember number of rows to be inserted, it will

   be used in write_row and get_autoincrement to send an optimal number

sql/ha_ndbcluster.h

+1 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ class ha_ndbcluster: public handler 
  int info(uint);

  int extra(enum ha_extra_function operation);

  int extra_opt(enum ha_extra_function operation, ulong cache_size);

  int reset();

  int external_lock(THD *thd, int lock_type);

  void unlock_row();

  int start_stmt(THD *thd, thr_lock_type lock_type);