bk commit into 5.1 tree (tomas:1.2431)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 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-21 09:08:05+01:00, tomas@stripped +1 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
  MERGE: 1.1810.2371.76

  sql/ha_ndbcluster.cc@stripped, 2007-03-21 09:08:02+01:00, tomas@stripped +2 -8
    manual merge
    MERGE: 1.175.1.125

# 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.1-telco-gca/RESYNC

--- 1.399/sql/ha_ndbcluster.cc	2007-03-09 14:29:37 +01:00
+++ 1.400/sql/ha_ndbcluster.cc	2007-03-21 09:08:02 +01:00
@@ -1011,7 +1011,7 @@
   DBUG_ASSERT(m_table == NULL);
   DBUG_ASSERT(m_table_info == NULL);
 
-  const void *data, *pack_data;
+  const void *data= NULL, *pack_data= NULL;
   uint length, pack_length;
 
   /*
@@ -4749,7 +4749,7 @@
   NDBTAB tab;
   NDBCOL col;
   uint pack_length, length, i, pk_length= 0;
-  const void *data, *pack_data;
+  const void *data= NULL, *pack_data= NULL;
   bool create_from_engine= (info->table_options & HA_OPTION_CREATE_FROM_ENGINE);
   bool is_truncate= (thd->lex->sql_command == SQLCOM_TRUNCATE);
   char tablespace[FN_LEN];
@@ -5077,7 +5077,7 @@
   const char *name;
   Ndb* ndb;
   const NDBTAB *tab;
-  const void *data, *pack_data;
+  const void *data= NULL, *pack_data= NULL;
   uint length, pack_length;
   int error= 0;