Merge trift-lap.fambruehe:/MySQL/M50/push-5.0

into  trift-lap.fambruehe:/MySQL/M51/push-5.1

Makefile.am

@@ -123,6 +123,10 @@ test-bt:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	@PERL@ ./mysql-test-run.pl --comment=NDB            --force --timer \
 	--with-ndbcluster-only
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	@PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	@PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
 
 test-bt-debug:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \

mysql-test/Makefile.am

@@ -24,7 +24,7 @@ benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test
 EXTRA_SCRIPTS = 	mysql-test-run-shell.sh install_test_db.sh \
 			valgrind.supp $(PRESCRIPTS)
-EXTRA_DIST = 		$(EXTRA_SCRIPTS)
+EXTRA_DIST = 		$(EXTRA_SCRIPTS) suite
 GENSCRIPTS =		mysql-test-run-shell install_test_db mtr mysql-test-run
 PRESCRIPTS =		mysql-test-run.pl
 test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)
@@ -71,6 +71,7 @@ dist-hook:
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(distdir)/std_data/ndb_backup50
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(distdir)/std_data/ndb_backup51
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
+	-rm -rf `find $(distdir)/suite -type d -name SCCS`
 
 install-data-local:
 	$(mkinstalldirs) \
@@ -112,6 +113,12 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51
 	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
+	for f in `(cd $(srcdir); find suite -type f | grep -v SCCS)`; \
+	do \
+	  d=$(DESTDIR)$(testdir)/`dirname $$f`; \
+	  mkdir -p $$d ; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $$d ; \
+	done
 
 uninstall-local:
 	@RM@ -f -r $(DESTDIR)$(testdir)

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:

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;

storage/ndb/test/ndbapi/testScanFilter.cpp

-/* 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; version 2 of the License only.
+   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