diff options
Diffstat (limited to 'databases/mysql41-server/files')
| -rw-r--r-- | databases/mysql41-server/files/patch-Docs::Makefile.in | 4 | ||||
| -rw-r--r-- | databases/mysql41-server/files/patch-Makefile.in | 16 | ||||
| -rw-r--r-- | databases/mysql41-server/files/patch-client::mysql.cc | 11 | ||||
| -rw-r--r-- | databases/mysql41-server/files/patch-gcc34 | 136 |
4 files changed, 10 insertions, 157 deletions
diff --git a/databases/mysql41-server/files/patch-Docs::Makefile.in b/databases/mysql41-server/files/patch-Docs::Makefile.in index e9700bd64e46..cb417e0742e2 100644 --- a/databases/mysql41-server/files/patch-Docs::Makefile.in +++ b/databases/mysql41-server/files/patch-Docs::Makefile.in @@ -4,8 +4,8 @@ all: $(targets) txt_files --txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE \ -+txt_files: ../INSTALL-SOURCE ../COPYING \ +-txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ ++txt_files: ../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \ INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt CLEAN_FILES: $(BUILD_SOURCES) diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in index 1ec46e3b31bb..54fcf35c5e2c 100644 --- a/databases/mysql41-server/files/patch-Makefile.in +++ b/databases/mysql41-server/files/patch-Makefile.in @@ -1,16 +1,16 @@ ---- Makefile.in.orig Fri May 28 21:38:32 2004 -+++ Makefile.in Mon May 31 15:10:44 2004 -@@ -282,12 +282,7 @@ +--- Makefile.in.orig Thu Aug 26 23:47:06 2004 ++++ Makefile.in Thu Sep 2 12:49:11 2004 +@@ -297,12 +297,7 @@ # These are built from source in the Docs directory - EXTRA_DIST = INSTALL-SOURCE README COPYING zlib --SUBDIRS = . include @docs_dirs@ \ + EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT +-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack @sql_client_dirs@ \ -- @sql_server_dirs@ scripts man tests SSL\ -- BUILD netware os2 @libmysqld_dirs@ \ +- @sql_server_dirs@ scripts man tests \ +- netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = - # Relink after clean + DIST_SUBDIRS = . include @docs_dirs@ zlib \ diff --git a/databases/mysql41-server/files/patch-client::mysql.cc b/databases/mysql41-server/files/patch-client::mysql.cc deleted file mode 100644 index edce89820a23..000000000000 --- a/databases/mysql41-server/files/patch-client::mysql.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- client/mysql.cc.orig Wed Jun 2 09:11:24 2004 -+++ client/mysql.cc Wed Jun 2 09:13:19 2004 -@@ -294,7 +294,7 @@ - HIST_ENTRY is defined for libedit, but not for the real readline - Need to redefine it for real readline to find it - */ --#if !defined(USE_LIBEDIT_INTERFACE) -+#if !defined(HIST_ENTRY) - typedef struct _hist_entry { - const char *line; - const char *data; diff --git a/databases/mysql41-server/files/patch-gcc34 b/databases/mysql41-server/files/patch-gcc34 deleted file mode 100644 index f2acb4a5cf1b..000000000000 --- a/databases/mysql41-server/files/patch-gcc34 +++ /dev/null @@ -1,136 +0,0 @@ ---- ndb/src/kernel/vm/ArrayPool.hpp.orig 2004-07-27 01:09:09 -07:00 -+++ ndb/src/kernel/vm/ArrayPool.hpp 2004-07-27 01:09:09 -07:00 -@@ -795,8 +795,8 @@ - void - UnsafeArrayPool<T>::getPtrForce(Ptr<T> & ptr){ - Uint32 i = ptr.i; -- if(i < size){ -- ptr.p = &theArray[i]; -+ if(i < this->size){ -+ ptr.p = &this->theArray[i]; - } else { - ErrorReporter::handleAssert("UnsafeArrayPool<T>::getPtr", - __FILE__, __LINE__); -@@ -808,8 +808,8 @@ - void - UnsafeArrayPool<T>::getPtrForce(ConstPtr<T> & ptr) const{ - Uint32 i = ptr.i; -- if(i < size){ -- ptr.p = &theArray[i]; -+ if(i < this->size){ -+ ptr.p = &this->theArray[i]; - } else { - ErrorReporter::handleAssert("UnsafeArrayPool<T>::getPtr", - __FILE__, __LINE__); -@@ -820,8 +820,8 @@ - inline - T * - UnsafeArrayPool<T>::getPtrForce(Uint32 i){ -- if(i < size){ -- return &theArray[i]; -+ if(i < this->size){ -+ return &this->theArray[i]; - } else { - ErrorReporter::handleAssert("UnsafeArrayPool<T>::getPtr", - __FILE__, __LINE__); -@@ -833,8 +833,8 @@ - inline - const T * - UnsafeArrayPool<T>::getConstPtrForce(Uint32 i) const { -- if(i < size){ -- return &theArray[i]; -+ if(i < this->size){ -+ return &this->theArray[i]; - } else { - ErrorReporter::handleAssert("UnsafeArrayPool<T>::getPtr", - __FILE__, __LINE__); -@@ -847,8 +847,8 @@ - void - UnsafeArrayPool<T>::getPtrForce(Ptr<T> & ptr, Uint32 i){ - ptr.i = i; -- if(i < size){ -- ptr.p = &theArray[i]; -+ if(i < this->size){ -+ ptr.p = &this->theArray[i]; - return ; - } else { - ErrorReporter::handleAssert("UnsafeArrayPool<T>::getPtr", -@@ -861,8 +861,8 @@ - void - UnsafeArrayPool<T>::getPtrForce(ConstPtr<T> & ptr, Uint32 i) const{ - ptr.i = i; -- if(i < size){ -- ptr.p = &theArray[i]; -+ if(i < this->size){ -+ ptr.p = &this->theArray[i]; - return ; - } else { - ErrorReporter::handleAssert("UnsafeArrayPool<T>::getPtr", -diff -Nru a/ndb/src/kernel/vm/DLFifoList.hpp b/ndb/src/kernel/vm/DLFifoList.hpp ---- ndb/src/kernel/vm/DLFifoList.hpp.orig 2004-07-27 01:09:09 -07:00 -+++ ndb/src/kernel/vm/DLFifoList.hpp 2004-07-27 01:09:09 -07:00 -@@ -153,11 +153,11 @@ - LocalDLFifoList(ArrayPool<T> & thePool, typename DLFifoList<T>::Head & _src) - : DLFifoList<T>(thePool), src(_src) - { -- head = src; -+ this->head = src; - } - - ~LocalDLFifoList(){ -- src = head; -+ src = this->head; - } - private: - typename DLFifoList<T>::Head & src; -diff -Nru a/ndb/src/kernel/vm/DLList.hpp b/ndb/src/kernel/vm/DLList.hpp ---- ndb/src/kernel/vm/DLList.hpp.orig 2004-07-27 01:09:09 -07:00 -+++ ndb/src/kernel/vm/DLList.hpp 2004-07-27 01:09:09 -07:00 -@@ -169,11 +169,11 @@ - LocalDLList(ArrayPool<T> & thePool, typename DLList<T>::Head & _src) - : DLList<T>(thePool), src(_src) - { -- head = src; -+ this->head = src; - } - - ~LocalDLList(){ -- src = head; -+ src = this->head; - } - private: - typename DLList<T>::Head & src; -diff -Nru a/ndb/src/kernel/vm/DataBuffer.hpp b/ndb/src/kernel/vm/DataBuffer.hpp ---- ndb/src/kernel/vm/DataBuffer.hpp.orig 2004-07-27 01:09:09 -07:00 -+++ ndb/src/kernel/vm/DataBuffer.hpp 2004-07-27 01:09:09 -07:00 -@@ -174,11 +174,11 @@ - typename DataBuffer<sz>::Head & _src) - : DataBuffer<sz>(thePool), src(_src) - { -- head = src; -+ this->head = src; - } - - ~LocalDataBuffer(){ -- src = head; -+ src = this->head; - } - private: - typename DataBuffer<sz>::Head & src; -diff -Nru a/ndb/src/kernel/vm/SLList.hpp b/ndb/src/kernel/vm/SLList.hpp ---- ndb/src/kernel/vm/SLList.hpp.orig 2004-07-27 01:09:09 -07:00 -+++ ndb/src/kernel/vm/SLList.hpp 2004-07-27 01:09:09 -07:00 -@@ -137,11 +137,11 @@ - LocalSLList(ArrayPool<T> & thePool, typename SLList<T>::Head & _src) - : SLList<T>(thePool), src(_src) - { -- head = src; -+ this->head = src; - } - - ~LocalSLList(){ -- src = head; -+ src = this->head; - } - private: - typename SLList<T>::Head & src; |