7 files changed, 19 insertions, 163 deletions

diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 32d0273beeb9..9a93941d0e4b 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.3
+PORTVERSION=	4.1.4
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
@@ -21,7 +21,7 @@ MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
 		http://mysql.proserve.nl/Downloads/MySQL-4.1/ \
 		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.1/
 PKGNAMESUFFIX?=	-server
-DISTNAME=	${PORTNAME}-${PORTVERSION}-beta
+DISTNAME=	${PORTNAME}-${PORTVERSION}-gamma
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -45,6 +45,7 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-low-memory \
 		--with-ndbcluster \
 		--with-comment='FreeBSD port: ${PKGNAME}' \
+		--with-zlib-dir=/usr \
 		--enable-thread-safe-client
 
 .ifdef USE_MYSQL
@@ -111,7 +112,7 @@ LATEST_LINK=	mysql41-server
 CONFLICTS=	mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
 
 PLIST_SUB=	DB_DIR=${DB_DIR} \
-		VER=${PORTVERSION}-beta
+		VER=${PORTVERSION}-gamma
 
 MAN1=		isamchk.1 isamlog.1 mysqld.1 \
 		mysqld_safe.1 perror.1 replace.1
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index 2f841c56292d..0aa71450242a 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql-4.1.3-beta.tar.gz) = 4dd15079ae0fd908fdbb9daf2d01c183
-SIZE (mysql-4.1.3-beta.tar.gz) = 19229478
+MD5 (mysql-4.1.4-gamma.tar.gz) = 2d41f9a6dad81daeda45af92ae86bacd
+SIZE (mysql-4.1.4-gamma.tar.gz) = 19548013
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;
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index 92598967f383..520d0a89cc3b 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -11,7 +11,6 @@ bin/mysql_install_db
 bin/mysql_tzinfo_to_sql
 bin/mysql_waitpid
 bin/mysqld_safe
-bin/ndb_cpcd
 bin/ndb_delete_all
 bin/ndb_desc
 bin/ndb_drop_index
@@ -41,6 +40,7 @@ include/mysql/ndb/ndbapi/NdbDictionary.hpp
 include/mysql/ndb/ndbapi/NdbError.hpp
 include/mysql/ndb/ndbapi/NdbEventOperation.hpp
 include/mysql/ndb/ndbapi/NdbIndexOperation.hpp
+include/mysql/ndb/ndbapi/NdbIndexScanOperation.hpp
 include/mysql/ndb/ndbapi/NdbOperation.hpp
 include/mysql/ndb/ndbapi/NdbPool.hpp
 include/mysql/ndb/ndbapi/NdbRecAttr.hpp
@@ -63,6 +63,7 @@ lib/mysql/libndbclient.so.0
 lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
+libexec/ndb_cpcd
 libexec/ndb_mgmd
 libexec/ndbd
 %%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif
@@ -177,6 +178,7 @@ share/mysql/korean/errmsg.txt
 share/mysql/mi_test_all
 share/mysql/mi_test_all.res
 share/mysql/my-huge.cnf
+share/mysql/my-innodb-heavy-4G.cnf
 share/mysql/my-large.cnf
 share/mysql/my-medium.cnf
 share/mysql/my-small.cnf