bk commit into 5.1 tree (tomas:1.2530)

[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:19:20+02:00, tomas@stripped +3 -0
  internal interface to ndb (to be used by e.g. ndb_restore)

  storage/ndb/include/ndbapi/Ndb.hpp@stripped, 2007-06-11 17:19:18+02:00, tomas@stripped +1 -0
    internal interface to ndb (to be used by e.g. ndb_restore)

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@stripped, 2007-06-11 17:19:18+02:00, tomas@stripped +2 -1
    internal interface to ndb (to be used by e.g. ndb_restore)

  storage/ndb/src/ndbapi/ndb_internal.hpp@stripped, 2007-06-11 17:19:18+02:00, tomas@stripped +27 -0
    New BitKeeper file ``storage/ndb/src/ndbapi/ndb_internal.hpp''

  storage/ndb/src/ndbapi/ndb_internal.hpp@stripped, 2007-06-11 17:19:18+02:00, tomas@stripped +0 -0

# 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-new-ndb

--- 1.63/storage/ndb/include/ndbapi/Ndb.hpp	2007-04-26 16:54:20 +02:00
+++ 1.64/storage/ndb/include/ndbapi/Ndb.hpp	2007-06-11 17:19:18 +02:00
@@ -1055,6 +1055,7 @@
   friend class NdbDictInterface;
   friend class NdbBlob;
   friend class NdbImpl;
+  friend class Ndb_internal;
 #endif
 
 public:

--- 1.87/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-04-25 23:47:31 +02:00
+++ 1.88/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-06-11 17:19:18 +02:00
@@ -41,6 +41,7 @@
 #include <NdbEventOperation.hpp>
 #include "NdbEventOperationImpl.hpp"
 #include <signaldata/AlterTable.hpp>
+#include "ndb_internal.hpp"
 
 #include <EventLogger.hpp>
 extern EventLogger g_eventLogger;
@@ -2838,7 +2839,7 @@
   data[5]= apply_gci >> 32;
   data[6]= latest_gci & ~(Uint32)0;
   data[7]= latest_gci >> 32;
-  m_ndb->theImpl->send_event_report(data,8);
+  Ndb_internal().send_event_report(m_ndb, data,8);
 #ifdef VM_TRACE
   assert(m_total_alloc >= m_free_data_sz);
 #endif
--- New file ---
+++ storage/ndb/src/ndbapi/ndb_internal.hpp	07/06/11 17:19:18
/* Copyright (C) 2007 MySQL AB

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; version 2 of the License.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.

   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */

#include <ndb_global.h>
#include <Ndb.hpp>

class Ndb_internal
{
private:
  friend class NdbEventBuffer;
  Ndb_internal() {}
  virtual ~Ndb_internal() {}
  int send_event_report(Ndb *ndb, Uint32 *data, Uint32 length)
    { return ndb->theImpl->send_event_report(data, length); }
};