bk commit into 5.0 tree (tomas:1.2466)

[tomas]

Below is the list of changes that have just been committed into a local
5.0 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-04-20 12:37:32+02:00, tomas@stripped +2 -0
  Construction does not work on hpux aCC, so some refactoring

  ndb/include/ndbapi/Ndb.hpp@stripped, 2007-04-20 12:37:29+02:00, tomas@stripped +1 -12
    Construction does not work on hpux aCC, so some refactoring

  ndb/src/ndbapi/NdbImpl.hpp@stripped, 2007-04-20 12:37:30+02:00, tomas@stripped +12 -3
    Construction does not work on hpux aCC, so some refactoring

# 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.0-release

--- 1.49/ndb/include/ndbapi/Ndb.hpp	2007-04-11 15:21:08 +02:00
+++ 1.50/ndb/include/ndbapi/Ndb.hpp	2007-04-20 12:37:29 +02:00
@@ -1051,18 +1051,7 @@
   friend class NdbDictionaryImpl;
   friend class NdbDictInterface;
   friend class NdbBlob;
-  friend class Ndb_free_list_t<NdbRecAttr>;  
-  friend class Ndb_free_list_t<NdbApiSignal>;
-  friend class Ndb_free_list_t<NdbLabel>;
-  friend class Ndb_free_list_t<NdbBranch>;
-  friend class Ndb_free_list_t<NdbSubroutine>;
-  friend class Ndb_free_list_t<NdbCall>;
-  friend class Ndb_free_list_t<NdbBlob>;
-  friend class Ndb_free_list_t<NdbReceiver>;
-  friend class Ndb_free_list_t<NdbIndexScanOperation>;
-  friend class Ndb_free_list_t<NdbOperation>;
-  friend class Ndb_free_list_t<NdbIndexOperation>;
-  friend class Ndb_free_list_t<NdbTransaction>;
+  friend class NdbImpl;
 #endif
 
 public:

--- 1.16/ndb/src/ndbapi/NdbImpl.hpp	2007-04-11 15:21:08 +02:00
+++ 1.17/ndb/src/ndbapi/NdbImpl.hpp	2007-04-20 12:37:30 +02:00
@@ -89,6 +89,15 @@
     return 0;
   }
 
+/*
+  We need this friend accessor function to work around a HP compiler problem,
+  where template class friends are not working.
+*/
+  static inline void setNdbError(Ndb &ndb,int code){
+    ndb.theError.code = code;
+    return;
+  }
+
   /**
    * NOTE free lists must be _after_ theNdbObjectIdMap take
    *   assure that destructors are run in correct order
@@ -208,7 +217,7 @@
     m_free_list = new T(ndb);
     if (m_free_list == 0)
     {
-      ndb->theError.code = 4000;
+      NdbImpl::setNdbError(*ndb, 4000);
       assert(false);
       return -1;
     }
@@ -218,7 +227,7 @@
     T* obj= new T(ndb);
     if(obj == 0)
     {
-      ndb->theError.code = 4000;
+      NdbImpl::setNdbError(*ndb, 4000);
       assert(false);
       return -1;
     }
@@ -250,7 +259,7 @@
   }
   else
   {
-    ndb->theError.code = 4000;
+    NdbImpl::setNdbError(*ndb, 4000);
     assert(false);
   }
   return tmp;