pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases Update mysql-{client,server} to 4.0.22.
details: https://anonhg.NetBSD.org/pkgsrc/rev/a68ea7ef117a
branches: trunk
changeset: 483194:a68ea7ef117a
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Tue Nov 09 06:11:48 2004 +0000
description:
Update mysql-{client,server} to 4.0.22.
Functionality added or changed:
* The --with-openssl option for configure now accepts a path
prefix as an argument. --with-openssl-includes and
--with-openssl-libs are still supported, but are needed only
to override the default values. (Bug #5494)
* Added new --without-man option to configure to suppress
building/installing the manual pages. (Bug #5379)
* InnoDB: New mysqld option --innodb-table-locks and session
variable innodb_table_locks (on by default). In applications
using AUTOCOMMIT=1, InnoDB's internal table locks can cause
deadlocks. You can set innodb_table_locks=0 in `my.cnf' to
remove that problem. See section 16.17 Restrictions on InnoDB
Tables. (Bug #3299, Bug #5998)
* InnoDB: Added the startup option and settable global variable
innodb_max_purge_lag for delaying INSERT, UPDATE and DELETE
operations when the purge operations are lagging. The default
value of this parameter is zero, meaning that there will not be
any delays. See section 16.13 Implementation of Multi-Versioning.
* InnoDB: Change error code to HA_ERR_ROW_IS_REFERENCED if we
cannot DROP a parent table because it is referenced by a FOREIGN
KEY constraint.
And a lot of bugfixes: http://dev.mysql.com/doc/mysql/en/News-4.0.22.html
diffstat:
databases/mysql-client/Makefile | 7 +--
databases/mysql-client/Makefile.common | 18 +++++++++-
databases/mysql-client/PLIST | 26 +--------------
databases/mysql-client/distinfo | 12 ++++--
databases/mysql-client/patches/patch-af | 55 ++++++++++++++++++++++++++++++--
databases/mysql-client/patches/patch-au | 13 +++++++
databases/mysql-client/patches/patch-av | 18 ++++++++++
databases/mysql-client/patches/patch-aw | 17 ++++++++++
databases/mysql-client/patches/patch-ax | 36 +++++++++++++++++++++
databases/mysql-server/Makefile | 10 +-----
databases/mysql-server/distinfo | 11 +++---
databases/mysql-server/patches/patch-aa | 10 +++---
databases/mysql-server/patches/patch-ae | 12 -------
databases/mysql-server/patches/patch-am | 37 +++++++++++----------
14 files changed, 193 insertions(+), 89 deletions(-)
diffs (truncated from 472 to 300 lines):
diff -r 1da843e33c22 -r a68ea7ef117a databases/mysql-client/Makefile
--- a/databases/mysql-client/Makefile Tue Nov 09 05:49:10 2004 +0000
+++ b/databases/mysql-client/Makefile Tue Nov 09 06:11:48 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/10/28 01:08:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.34 2004/11/09 06:11:48 xtraeme Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
SVR4_PKGNAME= mysqc
@@ -8,16 +8,15 @@
.include "Makefile.common"
+CONFIGURE_ARGS+= --without-extra-tools
CONFIGURE_ARGS+= --without-server
+CONFIGURE_ARGS+= --enable-thread-safe-client
USE_BUILDLINK3= yes
UNWRAP_FILES= scripts/mysql_config
INFO_FILES= mysql.info
post-install:
- cd ${PREFIX}/man/man1 && \
- ${RM} -f mysqld.1 mysqld_multi.1 mysqld_safe.1 safe_mysqld.1
- cd ${PREFIX}/share/mysql && ${RM} -f mysql.server
${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
.include "../../devel/readline/buildlink3.mk"
diff -r 1da843e33c22 -r a68ea7ef117a databases/mysql-client/Makefile.common
--- a/databases/mysql-client/Makefile.common Tue Nov 09 05:49:10 2004 +0000
+++ b/databases/mysql-client/Makefile.common Tue Nov 09 06:11:48 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.28 2004/10/30 08:13:51 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.29 2004/11/09 06:11:48 xtraeme Exp $
-DISTNAME= mysql-4.0.21
+DISTNAME= mysql-4.0.22
CATEGORIES= databases
MASTER_SITES= http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.0/ \
ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
@@ -53,6 +53,10 @@
CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET}
CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET}
+.if !empty(MACHINE_ARCH:Mi386)
+CONFIGURE_ARGS+= --enable-assembler
+.endif
+
# Avoid an ICE in gcc2 on sparc64
CONFIGURE_ENV+= F77=${FALSE}
@@ -65,6 +69,15 @@
CXXFLAGS+= -DHAVE_CURSES_H
.endif
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
+CFLAGS+= -DSIGNALS_DONT_BREAK_READ
+CXXFLAGS+= -DSIGNALS_DONT_BREAK_READ
+CONFIGURE_ENV+= ac_cv_func_pthread_setschedparam=no
+CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
+.endif
+
USE_LANGUAGES= c c++
USE_GNU_TOOLS+= make
USE_PERL5= # defined
@@ -85,4 +98,3 @@
.include "../../security/openssl/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
diff -r 1da843e33c22 -r a68ea7ef117a databases/mysql-client/PLIST
--- a/databases/mysql-client/PLIST Tue Nov 09 05:49:10 2004 +0000
+++ b/databases/mysql-client/PLIST Tue Nov 09 06:11:48 2004 +0000
@@ -1,15 +1,11 @@
-@comment $NetBSD: PLIST,v 1.12 2004/10/28 01:08:15 xtraeme Exp $
-bin/make_win_binary_distribution
-bin/make_win_src_distribution
+@comment $NetBSD: PLIST,v 1.13 2004/11/09 06:11:48 xtraeme Exp $
bin/msql2mysql
bin/mysql
bin/mysql_config
bin/mysql_convert_table_format
bin/mysql_explain_log
bin/mysql_find_rows
-bin/mysql_fix_extensions
bin/mysql_fix_privilege_tables
-bin/mysql_secure_installation
bin/mysql_setpermission
bin/mysql_tableinfo
bin/mysql_zap
@@ -18,7 +14,6 @@
bin/mysqlbinlog
bin/mysqlbug
bin/mysqlcheck
-bin/mysqld_multi
bin/mysqldump
bin/mysqldumpslow
bin/mysqlhotcopy
@@ -52,8 +47,7 @@
include/mysql/sslopt-longopts.h
include/mysql/sslopt-vars.h
lib/mysql/libmysqlclient.la
-man/man1/isamchk.1
-man/man1/isamlog.1
+lib/mysql/libmysqlclient_r.la
man/man1/mysql.1
man/man1/mysql_fix_privilege_tables.1
man/man1/mysql_zap.1
@@ -61,24 +55,8 @@
man/man1/mysqladmin.1
man/man1/mysqldump.1
man/man1/mysqlshow.1
-man/man1/perror.1
-man/man1/replace.1
-share/mysql/Description.plist
-share/mysql/Info.plist
-share/mysql/MySQL-shared-compat.spec
-share/mysql/StartupParameters.plist
-share/mysql/binary-configure
share/mysql/make_binary_distribution
share/mysql/make_sharedlib_distribution
-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
-share/mysql/mysql-${PKGVERSION}.spec
-share/mysql/mysql-log-rotate
-share/mysql/postinstall
-share/mysql/preinstall
@dirrm share/mysql
@dirrm lib/mysql
@dirrm include/mysql
diff -r 1da843e33c22 -r a68ea7ef117a databases/mysql-client/distinfo
--- a/databases/mysql-client/distinfo Tue Nov 09 05:49:10 2004 +0000
+++ b/databases/mysql-client/distinfo Tue Nov 09 06:11:48 2004 +0000
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.14 2004/10/28 01:08:15 xtraeme Exp $
+$NetBSD: distinfo,v 1.15 2004/11/09 06:11:48 xtraeme Exp $
-SHA1 (mysql-4.0.21.tar.gz) = 1f5059c79e0c3718e005d41c428b83f2755fc7aa
-Size (mysql-4.0.21.tar.gz) = 14107388 bytes
-SHA1 (patch-af) = 258c09335a9d675cf2367afc33f5ea0713a0b3fd
+SHA1 (mysql-4.0.22.tar.gz) = 0b43446a0fd2887c4bc69d8b30dc57f348e145cd
+Size (mysql-4.0.22.tar.gz) = 14395535 bytes
+SHA1 (patch-af) = 2f3bab4108c002420e243a4ca6c9c0c3d4bdd21b
+SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
+SHA1 (patch-av) = 684c1e2ff1f96652225045653c25707850fe0ff2
+SHA1 (patch-aw) = 67f10ae46e46bb047f4c7662af3954945590dfcc
+SHA1 (patch-ax) = d029adc40e6f80edfe090e4c3ca59bf076b9f462
diff -r 1da843e33c22 -r a68ea7ef117a databases/mysql-client/patches/patch-af
--- a/databases/mysql-client/patches/patch-af Tue Nov 09 05:49:10 2004 +0000
+++ b/databases/mysql-client/patches/patch-af Tue Nov 09 06:11:48 2004 +0000
@@ -1,12 +1,59 @@
-$NetBSD: patch-af,v 1.9 2004/10/28 01:08:15 xtraeme Exp $
+$NetBSD: patch-af,v 1.10 2004/11/09 06:11:48 xtraeme Exp $
---- configure.orig Tue Feb 10 20:16:56 2004
-+++ configure Sun Mar 7 19:58:04 2004
-@@ -32277,7 +32277,6 @@
+--- configure.orig 2004-11-08 20:11:05.000000000 +0100
++++ configure 2004-11-08 20:12:44.000000000 +0100
+@@ -22842,10 +22842,7 @@
+ return 0;
+ }
+
+-int link_test()
+-{
+ return compress(0, (unsigned long*) 0, "", 0);
+-}
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -32058,34 +32055,10 @@
+ mysqlfs=no
+ fi;
+
+-
+-echo "$as_me:$LINENO: checking for ORBit" >&5
+-echo $ECHO_N "checking for ORBit... $ECHO_C" >&6
+-orbit_config_path=`which orbit-config`
+-if test -n "$orbit_config_path" -a $? = 0
+-then
+- orbit_exec_prefix=`orbit-config --exec-prefix`
+- orbit_includes=`orbit-config --cflags server`
+- orbit_libs=`orbit-config --libs server`
+- orbit_idl="$orbit_exec_prefix/bin/orbit-idl"
+- echo "$as_me:$LINENO: result: found!" >&5
+-echo "${ECHO_T}found!" >&6
+- cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ORBIT 1
+-_ACEOF
+-
+-else
+ orbit_exec_prefix=
+ orbit_includes=
+ orbit_libs=
+ orbit_idl=
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-fi
+-
+-
+-
+-
+
+ echo "$as_me:$LINENO: checking if we should build MySQLFS" >&5
+ echo $ECHO_N "checking if we should build MySQLFS... $ECHO_C" >&6
+@@ -32358,7 +32331,7 @@
else
bench_dirs=""
fi
-bench_dirs="$bench_dirs mysql-test"
++#bench_dirs="$bench_dirs mysql-test"
# Don't build readline, i have it already
diff -r 1da843e33c22 -r a68ea7ef117a databases/mysql-client/patches/patch-au
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql-client/patches/patch-au Tue Nov 09 06:11:48 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1 2004/11/09 06:11:48 xtraeme Exp $
+
+--- include/my_global.h.orig 2003-10-17 07:29:15.000000000 +0200
++++ include/my_global.h 2003-12-11 15:13:14.000000000 +0100
+@@ -250,7 +250,7 @@
+ # endif
+ #endif /* TIME_WITH_SYS_TIME */
+ #ifdef HAVE_UNISTD_H
+-#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
++#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #define crypt unistd_crypt
+ #endif
+ #include <unistd.h>
diff -r 1da843e33c22 -r a68ea7ef117a databases/mysql-client/patches/patch-av
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql-client/patches/patch-av Tue Nov 09 06:11:48 2004 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-av,v 1.1 2004/11/09 06:11:48 xtraeme Exp $
+
+--- Makefile.in.orig 2004-11-09 06:37:21.000000000 +0100
++++ Makefile.in 2004-11-09 06:37:48.000000000 +0100
+@@ -280,12 +280,7 @@
+
+ # These are built from source in the Docs directory
+ EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
+-SUBDIRS = . include @docs_dirs@ @readline_dir@ \
+- @thread_dirs@ pstack @sql_client_dirs@ \
+- @sql_server_dirs@ scripts @man_dirs@ tests \
+- BUILD netware os2 @libmysqld_dirs@ \
+- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@
+-
++SUBDIRS = . include @sql_client_dirs@ scripts man
+
+ # Relink after clean
+ linked_sources = linked_client_sources linked_server_sources \
diff -r 1da843e33c22 -r a68ea7ef117a databases/mysql-client/patches/patch-aw
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql-client/patches/patch-aw Tue Nov 09 06:11:48 2004 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-aw,v 1.1 2004/11/09 06:11:48 xtraeme Exp $
+
+--- man/Makefile.in.orig 2004-11-09 06:38:12.000000000 +0100
++++ man/Makefile.in 2004-11-09 06:38:39.000000000 +0100
+@@ -275,10 +275,8 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+
+-man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
+- mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
+- perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
+-
++man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
++ mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
+
+ EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
+ mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
diff -r 1da843e33c22 -r a68ea7ef117a databases/mysql-client/patches/patch-ax
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysql-client/patches/patch-ax Tue Nov 09 06:11:48 2004 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-ax,v 1.1 2004/11/09 06:11:48 xtraeme Exp $
+
+--- scripts/Makefile.in.orig 2004-11-09 06:39:02.000000000 +0100
++++ scripts/Makefile.in 2004-11-09 06:40:34.000000000 +0100
+@@ -274,26 +274,11 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+
+-bin_SCRIPTS = @server_scripts@ \
+- msql2mysql \
+- mysql_config \
+- mysql_fix_privilege_tables \
+- mysql_fix_extensions \
+- mysql_setpermission \
+- mysql_secure_installation \
+- mysql_zap \
+- mysqlaccess \
Home |
Main Index |
Thread Index |
Old Index