bk commit into 5.1 tree (tomas:1.2623) BUG#31497

[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-10-10 10:05:14+02:00, tomas@stripped +1 -0
  bug#31497 NdbTableImpl::getImpl(const NdbDictionary::Table & t) cause mysqld core on
drop
  - structure allocated even in error case, in which variables become uninitialized

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-10-10 10:05:12+02:00,
tomas@stripped +5 -5
    bug#31497 NdbTableImpl::getImpl(const NdbDictionary::Table & t) cause mysqld core
on drop
    - structure allocated even in error case, in which variables become uninitialized

diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc	2007-10-08 21:54:54 +02:00
+++ b/sql/ha_ndbcluster_binlog.cc	2007-10-10 10:05:12 +02:00
@@ -2729,11 +2729,6 @@ slave_set_resolve_max(NDB_SHARE *share, 
 {
   DBUG_ENTER("slave_set_resolve_max");
 
-  if (share->m_cfn_share == NULL)
-  {
-    share->m_cfn_share= (NDB_CONFLICT_FN_SHARE*)
-      alloc_root(&share->mem_root, sizeof(NDB_CONFLICT_FN_SHARE));
-  }
   Thd_ndb *thd_ndb= get_thd_ndb(current_thd);
   Ndb *ndb= thd_ndb->ndb;
   NDBDICT *dict= ndb->getDictionary();
@@ -2756,6 +2751,11 @@ slave_set_resolve_max(NDB_SHARE *share, 
                         field_index));
     DBUG_RETURN(-1);
     break;
+  }
+  if (share->m_cfn_share == NULL)
+  {
+    share->m_cfn_share= (NDB_CONFLICT_FN_SHARE*)
+      alloc_root(&share->mem_root, sizeof(NDB_CONFLICT_FN_SHARE));
   }
   share->m_cfn_share->m_resolve_size= sz;
   share->m_cfn_share->m_resolve_column= field_index;