From: Date: March 27 2006 1:17pm
Subject: bk commit into 5.0 tree (pekka:1.2115) BUG#17380
List-Archive: http://lists.mysql.com/commits/4188
X-Bug: 17380
Message-Id: <200603271117.k2RBH8G4030769@orca.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of pekka. When pekka 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.2115 06/03/27 13:16:53 pekka@stripped +1 -0
  ndb - bug#17380: Missing charset causes NDB Client to crash

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.85 06/03/27 13:15:38 pekka@stripped +2 -1
    check parseTableInfo return value to avoid coredump
    seen on solaris when charsets missing on client host

# 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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my50

--- 1.84/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2005-08-18 14:24:56 +02:00
+++ 1.85/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-03-27 13:15:38 +02:00
@@ -1139,7 +1139,8 @@
   m_error.code= parseTableInfo(&rt, 
 			       (Uint32*)m_buffer.get_data(), 
 			       m_buffer.length() / 4, fullyQualifiedNames);
-  rt->buildColumnHash();
+  if (rt != 0)
+    rt->buildColumnHash();
   return rt;
 }