bk commit into 5.0 tree (tomas:1.2400) BUG#27320

[tomas]

Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-22 12:42:13+01:00, tomas@stripped +2 -0
  Bug #27320 ndb handler does not reset extra flags on reset()
  - make sure all extra flags are reset

  sql/ha_ndbcluster.cc@stripped, 2007-03-22 12:42:11+01:00, tomas@stripped +16
-2
    Bug #27320 ndb handler does not reset extra flags on reset()
    - make sure all extra flags are reset

  sql/ha_ndbcluster.h@stripped, 2007-03-22 12:42:11+01:00, tomas@stripped +1
-0
    Bug #27320 ndb handler does not reset extra flags on reset()
    - make sure all extra flags are reset

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0-telco-gca

--- 1.300/sql/ha_ndbcluster.cc	2007-03-21 08:40:22 +01:00
+++ 1.301/sql/ha_ndbcluster.cc	2007-03-22 12:42:11 +01:00
@@ -3282,8 +3282,7 @@
     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"));
@@ -3404,6 +3403,21 @@
   
   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

--- 1.108/sql/ha_ndbcluster.h	2006-12-23 20:04:24 +01:00
+++ 1.109/sql/ha_ndbcluster.h	2007-03-22 12:42:11 +01:00
@@ -553,6 +553,7 @@
   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);