bk commit into 5.1 tree (mskold:1.2517)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 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@stripped, 2007-06-14 16:10:11+02:00, mskold@stripped +2 -0
  Merge mskold@stripped:/home/bk/mysql-5.1-ndb
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
  MERGE: 1.2515.1.34

  sql/ha_ndbcluster.cc@stripped, 2007-06-14 16:10:00+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.454.1.1

  storage/ndb/include/ndbapi/Ndb.hpp@stripped, 2007-06-14 16:10:01+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.63.1.1

# 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:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb/RESYNC

--- 1.65/storage/ndb/include/ndbapi/Ndb.hpp	2007-06-14 16:10:25 +02:00
+++ 1.66/storage/ndb/include/ndbapi/Ndb.hpp	2007-06-14 16:10:25 +02:00
@@ -1055,6 +1055,7 @@ class Ndb
   friend class NdbDictInterface;
   friend class NdbBlob;
   friend class NdbImpl;
+  friend class Ndb_internal;
 #endif
 
 public:

--- 1.455/sql/ha_ndbcluster.cc	2007-06-14 16:10:26 +02:00
+++ 1.456/sql/ha_ndbcluster.cc	2007-06-14 16:10:26 +02:00
@@ -4248,8 +4248,6 @@ THR_LOCK_DATA **ha_ndbcluster::store_loc
 extern MASTER_INFO *active_mi;
 static int ndbcluster_update_apply_status(THD *thd, int do_update)
 {
-  return 0;
-
   Thd_ndb *thd_ndb= get_thd_ndb(thd);
   Ndb *ndb= thd_ndb->ndb;
   NDBDICT *dict= ndb->getDictionary();