Commit 03f4492b authored by joerg@trift-lap.fambruehe's avatar joerg@trift-lap.fambruehe
Browse files

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

into  trift-lap.fambruehe:/MySQL/M50/push-5.0
parents 5af470ee 75c31f6b

Makefile.am

+4 −0
Original line number Diff line number Diff line
@@ -153,6 +153,10 @@ test-bt: 
	@PERL@ ./mysql-test-run.pl --force --comment=normal --report-features

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol

	-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 \

VC++Files/mysql.sln

+1 −0
Original line number Diff line number Diff line
@@ -733,6 +733,7 @@ Global 
		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug 98.ActiveCfg = Debug 98|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug 98.Build.0 = Debug 98|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Enterprise.ActiveCfg = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Enterprise.Build.0 = Release|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Enterprise Debug.ActiveCfg = Debug|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Enterprise Debug.Build.0 = Debug|Win32

		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Enterprise GPL.ActiveCfg = Release|Win32

mysql-test/Makefile.am

+8 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ endif 
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 mysql-test-run install_test_db mtr

PRESCRIPTS =		mysql-test-run.pl

test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)
@@ -67,6 +67,7 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib

	-rm -rf `find $(distdir)/suite -type d -name SCCS`



install-data-local:

	$(mkinstalldirs) \
@@ -98,6 +99,12 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

	$(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)

ndb/include/ndbapi/Ndb.hpp

+1 −12
Original line number Diff line number Diff line
@@ -1051,18 +1051,7 @@ class Ndb 
  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:

ndb/src/ndbapi/NdbImpl.hpp

+12 −3
Original line number Diff line number Diff line
@@ -89,6 +89,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;

  }



  /**

   * NOTE free lists must be _after_ theNdbObjectIdMap take

   *   assure that destructors are run in correct order
@@ -208,7 +217,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;

    }
@@ -218,7 +227,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;

    }
@@ -250,7 +259,7 @@ Ndb_free_list_t<T>::seize(Ndb* ndb) 
  }

  else

  {

    ndb->theError.code = 4000;

    NdbImpl::setNdbError(*ndb, 4000);

    assert(false);

  }

  return tmp;