Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

3 files changed, 14 insertions, 18 deletions

diff --git a/storage/ndb/include/ndbapi/Ndb.hpp b/storage/ndb/include/ndbapi/Ndb.hpp
index 10b7b0ea581..5f96408ea30 100644
--- a/storage/ndb/include/ndbapi/Ndb.hpp
+++ b/storage/ndb/include/ndbapi/Ndb.hpp
@@ -1055,18 +1055,6 @@ class Ndb
   friend class NdbDictInterface;
   friend class NdbBlob;
   friend class NdbImpl;
-  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>;
 #endif
 
 public:
diff --git a/storage/ndb/src/ndbapi/NdbImpl.hpp b/storage/ndb/src/ndbapi/NdbImpl.hpp
index 33dfde58c49..39787b1d4be 100644
--- a/storage/ndb/src/ndbapi/NdbImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbImpl.hpp
@@ -96,6 +96,15 @@ public:
     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;
+  }
+
   BaseString m_systemPrefix; // Buffer for preformatted for <sys>/<def>/
 
   /**
@@ -217,7 +226,7 @@ Ndb_free_list_t<T>::fill(Ndb* ndb, Uint32 cnt)
     m_free_list = new T(ndb);
     if (m_free_list == 0)
     {
-      ndb->theError.code = 4000;
+      NdbImpl::setNdbError(*ndb, 4000);
       assert(false);
       return -1;
     }
@@ -227,7 +236,7 @@ Ndb_free_list_t<T>::fill(Ndb* ndb, Uint32 cnt)
     T* obj= new T(ndb);
     if(obj == 0)
     {
-      ndb->theError.code = 4000;
+      NdbImpl::setNdbError(*ndb, 4000);
       assert(false);
       return -1;
     }
@@ -259,7 +268,7 @@ Ndb_free_list_t<T>::seize(Ndb* ndb)
   }
   else
   {
-    ndb->theError.code = 4000;
+    NdbImpl::setNdbError(*ndb, 4000);
     assert(false);
   }
   return tmp;
diff --git a/storage/ndb/test/ndbapi/testScanFilter.cpp b/storage/ndb/test/ndbapi/testScanFilter.cpp
index 958b50d6701..ac0b0ed2c4d 100644
--- a/storage/ndb/test/ndbapi/testScanFilter.cpp
+++ b/storage/ndb/test/ndbapi/testScanFilter.cpp
@@ -1,9 +1,8 @@
-/* Copyright (C) 2007, Justin He, MySQL AB
+/* 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; either version 2 of the License, or
-   (at your option) any later version.
+   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