bk commit into 5.1 tree (tomas:1.2526)

[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-06-11 17:52:19+02:00, tomas@stripped +2 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco
  MERGE: 1.2506.1.26

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@stripped, 2007-06-11 17:52:15+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.80.1.9

  storage/ndb/src/ndbapi/ndb_internal.hpp@stripped, 2007-06-11 17:52:15+02:00,
tomas@stripped +0 -0
    Auto merged
    MERGE: 1.2.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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco/RESYNC

--- 1.94/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-06-11 17:19:58 +02:00
+++ 1.95/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-06-11 17:52:15 +02:00
@@ -2910,7 +2910,7 @@
   data[5]= apply_gci >> 32;
   data[6]= latest_gci & ~(Uint32)0;
   data[7]= latest_gci >> 32;
-  Ndb_internal().send_event_report(m_ndb, data,8);
+  Ndb_internal::send_event_report(m_ndb, data,8);
 #ifdef VM_TRACE
   assert(m_total_alloc >= m_free_data_sz);
 #endif

--- 1.3/storage/ndb/src/ndbapi/ndb_internal.hpp	2007-06-11 17:50:36 +02:00
+++ 1.4/storage/ndb/src/ndbapi/ndb_internal.hpp	2007-06-11 17:52:15 +02:00
@@ -19,6 +19,7 @@
 {
 private:
   friend class NdbEventBuffer;
+  friend class BackupRestore;
   Ndb_internal() {}
   virtual ~Ndb_internal() {}
   static int send_event_report(Ndb *ndb, Uint32 *data, Uint32 length)