bk commit into 5.0 tree (mskold:1.2174) 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.2174 06/06/20 15:56:14 mskold@stripped +2 -0
  Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly: inlined struct to get
rid of valgrind warning

  sql/ha_ndbcluster.h
    1.99 06/06/20 15:55:24 mskold@stripped +1 -1
    Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly: inlined struct to
get rid of valgrind warning

  sql/ha_ndbcluster.cc
    1.258 06/06/20 15:55:24 mskold@stripped +3 -8
    Fix for Bug #19906  REPLACE doesn't update TEXT fields correctly: inlined struct to
get rid of valgrind warning

# 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.257/sql/ha_ndbcluster.cc	2006-06-20 15:36:15 +02:00
+++ 1.258/sql/ha_ndbcluster.cc	2006-06-20 15:55:24 +02:00
@@ -875,9 +875,9 @@ 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_hook_args.ha= (void *) this;
+        m_blobs_hook_args.offset= buf - (byte*) table->record[0];
+        void *arg= (void *)&m_blobs_hook_args;
         DBUG_RETURN(ndb_blob->setActiveHook(g_get_ndb_blobs_value, arg) != 0);
       }
       DBUG_RETURN(1);
@@ -4559,7 +4559,6 @@ ha_ndbcluster::ha_ndbcluster(TABLE *tabl
   m_ops_pending(0),
   m_skip_auto_increment(TRUE),
   m_blobs_pending(0),
-  m_blobs_hook_args(0),
   m_blobs_buffer(0),
   m_blobs_buffer_size(0),
   m_dupkey((uint) -1),
@@ -4588,9 +4587,6 @@ ha_ndbcluster::ha_ndbcluster(TABLE *tabl
     m_index[i].unique_index_attrid_map= NULL;
   }
 
-  m_blobs_hook_args= (ndb_blobs_hook_args *)
-    my_malloc(sizeof(ndb_blobs_hook_args), MYF(MY_WME));
-
   DBUG_VOID_RETURN;
 }
 
@@ -4606,7 +4602,6 @@ ha_ndbcluster::~ha_ndbcluster() 
   if (m_share)
     free_share(m_share);
   release_metadata();
-  my_free((char *)m_blobs_hook_args, MYF(MY_ALLOW_ZERO_PTR));
   my_free(m_blobs_buffer, MYF(MY_ALLOW_ZERO_PTR));
   m_blobs_buffer= 0;
 

--- 1.98/sql/ha_ndbcluster.h	2006-06-20 15:36:14 +02:00
+++ 1.99/sql/ha_ndbcluster.h	2006-06-20 15:55:24 +02:00
@@ -712,7 +712,7 @@ private:
   ha_rows m_ops_pending;
   bool m_skip_auto_increment;
   bool m_blobs_pending;
-  ndb_blobs_hook_args *m_blobs_hook_args;
+  ndb_blobs_hook_args m_blobs_hook_args;
   // memory for blobs in one tuple
   char *m_blobs_buffer;
   uint32 m_blobs_buffer_size;