bk commit into 5.0 tree (mskold:1.2175) BUG#19906

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty 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
  1.2175 06/06/20 16:44:15 mskold@stripped +2 -0
  Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly: removed struct, added
m_blobs_offset instead

  sql/ha_ndbcluster.h
    1.100 06/06/20 16:43:53 mskold@stripped +1 -7
    Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly: removed struct,
added m_blobs_offset instead

  sql/ha_ndbcluster.cc
    1.259 06/06/20 16:43:53 mskold@stripped +5 -6
    Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly: removed struct,
added m_blobs_offset instead

# 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:	mskold
# Host:	linux.site
# Root:	/home/marty/MySQL/mysql-5.0

--- 1.258/sql/ha_ndbcluster.cc	2006-06-20 15:55:24 +02:00
+++ 1.259/sql/ha_ndbcluster.cc	2006-06-20 16:43:53 +02:00
@@ -770,9 +770,8 @@ int g_get_ndb_blobs_value(NdbBlob *ndb_b
   DBUG_ENTER("g_get_ndb_blobs_value");
   if (ndb_blob->blobsNextBlob() != NULL)
     DBUG_RETURN(0);
-  ndb_blobs_hook_args *my_blobs_hook_args= (ndb_blobs_hook_args *) arg;
-  ha_ndbcluster *ha= (ha_ndbcluster *) my_blobs_hook_args->ha;
-  DBUG_RETURN(ha->get_ndb_blobs_value(ndb_blob, my_blobs_hook_args->offset));
+  ha_ndbcluster *ha= (ha_ndbcluster *) arg;
+  DBUG_RETURN(ha->get_ndb_blobs_value(ndb_blob, ha->m_blobs_offset));
 }
 
 int ha_ndbcluster::get_ndb_blobs_value(NdbBlob *last_ndb_blob, 
@@ -875,9 +874,8 @@ int ha_ndbcluster::get_ndb_value(NdbOper
       if (ndb_blob != NULL)
       {
         // Set callback
-        m_blobs_hook_args.ha= (void *) this;
-        m_blobs_hook_args.offset= buf - (byte*) table->record[0];
-        void *arg= (void *)&m_blobs_hook_args;
+        m_blobs_offset= buf - (byte*) table->record[0];
+        void *arg= (void *) this;
         DBUG_RETURN(ndb_blob->setActiveHook(g_get_ndb_blobs_value, arg) != 0);
       }
       DBUG_RETURN(1);
@@ -4559,6 +4557,7 @@ ha_ndbcluster::ha_ndbcluster(TABLE *tabl
   m_ops_pending(0),
   m_skip_auto_increment(TRUE),
   m_blobs_pending(0),
+  m_blobs_offset(0),
   m_blobs_buffer(0),
   m_blobs_buffer_size(0),
   m_dupkey((uint) -1),

--- 1.99/sql/ha_ndbcluster.h	2006-06-20 15:55:24 +02:00
+++ 1.100/sql/ha_ndbcluster.h	2006-06-20 16:43:53 +02:00
@@ -58,12 +58,6 @@ typedef struct ndb_index_data {
   unsigned char *unique_index_attrid_map;
 } NDB_INDEX_DATA;
 
-typedef struct ndb_blobs_hook_args
-{
-  void *ha;
-  my_ptrdiff_t offset;
-} NDB_BLOB_HOOK_ARGS;
-
 typedef struct st_ndbcluster_share {
   THR_LOCK lock;
   pthread_mutex_t mutex;
@@ -712,7 +706,7 @@ private:
   ha_rows m_ops_pending;
   bool m_skip_auto_increment;
   bool m_blobs_pending;
-  ndb_blobs_hook_args m_blobs_hook_args;
+  my_ptrdiff_t m_blobs_offset;
   // memory for blobs in one tuple
   char *m_blobs_buffer;
   uint32 m_blobs_buffer_size;