From 6e450a90e88196d5de1b63efe8b7c9e66ace48e2 Mon Sep 17 00:00:00 2001 From: martti Date: Wed, 23 May 2007 08:11:48 +0000 Subject: Updated MySQL to 4.1.22 Lots of bug fixes, see http://dev.mysql.com/doc/refman/4.1/en/news-4-1-22.html --- databases/mysql4-client/Makefile.common | 4 ++-- databases/mysql4-client/buildlink3.mk | 10 +++++----- databases/mysql4-client/distinfo | 26 +++++++++++++------------- databases/mysql4-client/patches/patch-ab | 8 ++++---- databases/mysql4-client/patches/patch-af | 16 ++++++++-------- databases/mysql4-client/patches/patch-av | 8 ++++---- databases/mysql4-client/patches/patch-aw | 12 +++++++----- databases/mysql4-client/patches/patch-ax | 8 ++++---- databases/mysql4-client/patches/patch-ay | 10 +++++----- databases/mysql4-client/patches/patch-ba | 8 ++++---- databases/mysql4-client/patches/patch-bd | 12 ++++++------ databases/mysql4-client/patches/patch-be | 8 ++++---- 12 files changed, 66 insertions(+), 64 deletions(-) (limited to 'databases/mysql4-client') diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index 6468ff64c33..e167c5ff47b 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.56 2007/05/22 10:47:37 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.57 2007/05/23 08:11:48 martti Exp $ -DISTNAME= mysql-4.1.21 +DISTNAME= mysql-4.1.22 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-4.1/} diff --git a/databases/mysql4-client/buildlink3.mk b/databases/mysql4-client/buildlink3.mk index 7d712a29a0f..1a24f3dbe36 100644 --- a/databases/mysql4-client/buildlink3.mk +++ b/databases/mysql4-client/buildlink3.mk @@ -1,9 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.17 2006/07/08 23:10:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2007/05/23 08:11:48 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+ -.if !empty(BUILDLINK_DEPTH:M+) +.if ${BUILDLINK_DEPTH} == "+" BUILDLINK_DEPENDS+= mysql-client .endif @@ -11,14 +11,14 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmysql-client} BUILDLINK_PACKAGES+= mysql-client BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}mysql-client -.if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.mysql-client+= mysql-client>=4.1.7 -BUILDLINK_ABI_DEPENDS.mysql-client+= mysql-client>=4.1.15nb1 +.if ${MYSQL_CLIENT_BUILDLINK3_MK} == "+" +BUILDLINK_API_DEPENDS.mysql-client+= mysql-client>=4.1.22 BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql4-client BUILDLINK_LIBDIRS.mysql-client?= lib/mysql BUILDLINK_INCDIRS.mysql-client?= include/mysql .endif # MYSQL_CLIENT_BUILDLINK3_MK +.include "../../devel/readline/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo index a206e97601e..ffa0df556b7 100644 --- a/databases/mysql4-client/distinfo +++ b/databases/mysql4-client/distinfo @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.28 2006/10/08 13:29:06 rillig Exp $ +$NetBSD: distinfo,v 1.29 2007/05/23 08:11:49 martti Exp $ -SHA1 (mysql-4.1.21.tar.gz) = ec761b42d640e4dd051bff939fdcd2895b0e2591 -RMD160 (mysql-4.1.21.tar.gz) = a8e92bb3b1371cde3fd938482b34cb597403debf -Size (mysql-4.1.21.tar.gz) = 17624947 bytes +SHA1 (mysql-4.1.22.tar.gz) = 857e942cc3207caf56e2aa48961fc1ed66d932e6 +RMD160 (mysql-4.1.22.tar.gz) = bfcf5058e4247cf4d7d1550ea54c64ebc8bc615e +Size (mysql-4.1.22.tar.gz) = 17761101 bytes SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751 -SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f -SHA1 (patch-af) = fd55cd066ac78601dc12002959d2bfafe243f65b -SHA1 (patch-av) = 5bb6b9e90b6537d4fad71fb575986b49e56161e0 -SHA1 (patch-aw) = 8e7ad98457ab0b2b96d18cc414b6a773eb564dcc -SHA1 (patch-ax) = 9ad64516523d6052dca586c6a427a1c64921b891 -SHA1 (patch-ay) = fa4a55fa0df5b92823f2390e42fe46e728aadb25 -SHA1 (patch-ba) = bd34391e522ae12ee63ec6a734f7a31116b2918d +SHA1 (patch-ab) = ca126aec7649dbe12663df30fc2223e256df5883 +SHA1 (patch-af) = 0164d5c00600720591cae36b71625660cdb97625 +SHA1 (patch-av) = e1578d1e9742a8317565986bd6ae9a38e0dd5fad +SHA1 (patch-aw) = 35b3aafe923d44d287abd9d30b2a39b347386102 +SHA1 (patch-ax) = 719c1fdd38f494d097c9340f77e1c3264e084b8c +SHA1 (patch-ay) = 3edcdd5b6e5a3d9e87f4fc83ff91dfebbeaf3b61 +SHA1 (patch-ba) = 73f89008fc6a1f37c573dce00fdde3965234e211 SHA1 (patch-bb) = 242c97ab4658838a6001d9c288e01209abfcee77 SHA1 (patch-bc) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a -SHA1 (patch-bd) = 2070c5946ceea4c1b79ce290d359a811996ce454 -SHA1 (patch-be) = 1ba51c75cec53cb4bd6d1b5e71f776869cc340ac +SHA1 (patch-bd) = 32186a1f75d25f4feb95ba9d934dfcb526882681 +SHA1 (patch-be) = 977348504adeea29afb211cf0da8aa42e9c096d9 SHA1 (patch-bf) = c63133d40c2008ba57a968af693173a1fd97a927 diff --git a/databases/mysql4-client/patches/patch-ab b/databases/mysql4-client/patches/patch-ab index 54f0371d946..7d166ba04de 100644 --- a/databases/mysql4-client/patches/patch-ab +++ b/databases/mysql4-client/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2005/10/26 17:33:49 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2007/05/23 08:11:49 martti Exp $ ---- sql/mysqld.cc.orig 2005-10-14 10:21:12.000000000 +0000 -+++ sql/mysqld.cc -@@ -182,7 +182,7 @@ static void getvolumeID(BYTE *volumeName +--- sql/mysqld.cc.orig 2006-11-03 04:15:29.000000000 +0200 ++++ sql/mysqld.cc 2007-05-23 08:20:22.000000000 +0300 +@@ -183,7 +183,7 @@ int initgroups(const char *,unsigned int); #endif diff --git a/databases/mysql4-client/patches/patch-af b/databases/mysql4-client/patches/patch-af index 64f314edc27..06bb5dc80a3 100644 --- a/databases/mysql4-client/patches/patch-af +++ b/databases/mysql4-client/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.8 2006/05/26 18:25:34 seb Exp $ +$NetBSD: patch-af,v 1.9 2007/05/23 08:11:49 martti Exp $ ---- configure.orig 2006-05-23 01:12:19.000000000 +0000 -+++ configure -@@ -20463,7 +20463,7 @@ then +--- configure.orig 2006-11-03 04:19:18.000000000 +0200 ++++ configure 2007-05-23 08:20:46.000000000 +0300 +@@ -20547,7 +20547,7 @@ FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null" else case $SYSTEM_TYPE in @@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.8 2006/05/26 18:25:34 seb Exp $ FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null" ;; *darwin*) -@@ -24651,6 +24651,10 @@ case $SYSTEM_TYPE in +@@ -24736,6 +24736,10 @@ MAX_C_OPTIMIZE="-O" fi ;; @@ -22,7 +22,7 @@ $NetBSD: patch-af,v 1.8 2006/05/26 18:25:34 seb Exp $ *freebsd*) echo "Adding fix for interrupted reads" OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'` -@@ -36551,30 +36555,10 @@ else +@@ -36636,30 +36640,10 @@ fi; @@ -53,7 +53,7 @@ $NetBSD: patch-af,v 1.8 2006/05/26 18:25:34 seb Exp $ -@@ -36864,7 +36848,7 @@ then +@@ -36954,7 +36938,7 @@ else bench_dirs="" fi @@ -62,7 +62,7 @@ $NetBSD: patch-af,v 1.8 2006/05/26 18:25:34 seb Exp $ # Don't build readline, i have it already -@@ -36981,7 +36965,7 @@ int +@@ -37071,7 +37055,7 @@ main () { diff --git a/databases/mysql4-client/patches/patch-av b/databases/mysql4-client/patches/patch-av index 9419ccbcf79..f72ef918c7f 100644 --- a/databases/mysql4-client/patches/patch-av +++ b/databases/mysql4-client/patches/patch-av @@ -1,8 +1,8 @@ -$NetBSD: patch-av,v 1.5 2006/05/26 18:25:34 seb Exp $ +$NetBSD: patch-av,v 1.6 2007/05/23 08:11:49 martti Exp $ ---- Makefile.in.orig 2006-04-29 05:36:56.000000000 +0000 -+++ Makefile.in -@@ -352,13 +352,7 @@ AUTOMAKE_OPTIONS = foreign +--- Makefile.in.orig 2006-11-03 04:19:15.000000000 +0200 ++++ Makefile.in 2007-05-23 08:21:08.000000000 +0300 +@@ -353,13 +353,7 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ README COPYING EXCEPTIONS-CLIENT diff --git a/databases/mysql4-client/patches/patch-aw b/databases/mysql4-client/patches/patch-aw index fa0017bd0d3..c7dc06f56ff 100644 --- a/databases/mysql4-client/patches/patch-aw +++ b/databases/mysql4-client/patches/patch-aw @@ -1,13 +1,15 @@ -$NetBSD: patch-aw,v 1.3 2006/05/26 18:25:34 seb Exp $ +$NetBSD: patch-aw,v 1.4 2007/05/23 08:11:49 martti Exp $ ---- man/Makefile.in.orig 2006-04-29 05:36:31.000000000 +0000 -+++ man/Makefile.in -@@ -325,7 +325,7 @@ uname_prog = @uname_prog@ +--- man/Makefile.in.orig 2006-11-03 04:18:34.000000000 +0200 ++++ man/Makefile.in 2007-05-23 08:40:58.000000000 +0300 +@@ -327,8 +327,8 @@ vio_dir = @vio_dir@ vio_libs = @vio_libs@ zlib_dir = @zlib_dir@ -man1_MANS = @man1_files@ +-man8_MANS = @man8_files@ +man1_MANS = msql2mysql.1 mysql.1 mysql_config.1 mysql_fix_privilege_tables.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlshow.1 - EXTRA_DIST = $(man1_MANS) ++man8_MANS = + EXTRA_DIST = $(man1_MANS) $(man8_MANS) all: all-am diff --git a/databases/mysql4-client/patches/patch-ax b/databases/mysql4-client/patches/patch-ax index 59383de546a..681b1996d00 100644 --- a/databases/mysql4-client/patches/patch-ax +++ b/databases/mysql4-client/patches/patch-ax @@ -1,8 +1,8 @@ -$NetBSD: patch-ax,v 1.5 2006/08/31 12:42:42 seb Exp $ +$NetBSD: patch-ax,v 1.6 2007/05/23 08:11:49 martti Exp $ ---- scripts/Makefile.in.orig 2005-09-26 23:51:54.000000000 +0200 -+++ scripts/Makefile.in 2005-09-26 23:52:22.000000000 +0200 -@@ -322,23 +322,10 @@ +--- scripts/Makefile.in.orig 2006-11-03 04:19:06.000000000 +0200 ++++ scripts/Makefile.in 2007-05-23 08:24:33.000000000 +0300 +@@ -335,23 +335,10 @@ vio_dir = @vio_dir@ vio_libs = @vio_libs@ zlib_dir = @zlib_dir@ diff --git a/databases/mysql4-client/patches/patch-ay b/databases/mysql4-client/patches/patch-ay index 5b63e44efd9..c84a9cf0de1 100644 --- a/databases/mysql4-client/patches/patch-ay +++ b/databases/mysql4-client/patches/patch-ay @@ -1,8 +1,8 @@ -$NetBSD: patch-ay,v 1.3 2006/05/26 18:25:34 seb Exp $ +$NetBSD: patch-ay,v 1.4 2007/05/23 08:11:49 martti Exp $ ---- strings/Makefile.in.orig 2006-04-29 05:36:54.000000000 +0000 -+++ strings/Makefile.in -@@ -583,7 +583,7 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR +--- strings/Makefile.in.orig 2006-11-03 04:19:10.000000000 +0200 ++++ strings/Makefile.in 2007-05-23 08:24:57.000000000 +0300 +@@ -584,7 +584,7 @@ @$(NORMAL_INSTALL) test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)" @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ @@ -11,7 +11,7 @@ $NetBSD: patch-ay,v 1.3 2006/05/26 18:25:34 seb Exp $ f=$(am__strip_dir) \ echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ -@@ -591,7 +591,7 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR +@@ -592,7 +592,7 @@ done @$(POST_INSTALL) @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ diff --git a/databases/mysql4-client/patches/patch-ba b/databases/mysql4-client/patches/patch-ba index a4e8b088202..ffbff48a90d 100644 --- a/databases/mysql4-client/patches/patch-ba +++ b/databases/mysql4-client/patches/patch-ba @@ -1,7 +1,7 @@ -$NetBSD: patch-ba,v 1.1 2005/02/18 00:48:05 xtraeme Exp $ +$NetBSD: patch-ba,v 1.2 2007/05/23 08:11:50 martti Exp $ ---- client/mysql.cc.orig 2005-02-18 01:36:23.000000000 +0100 -+++ client/mysql.cc 2005-02-18 01:38:00.000000000 +0100 +--- client/mysql.cc.orig 2006-11-03 04:15:47.000000000 +0200 ++++ client/mysql.cc 2007-05-23 08:25:23.000000000 +0300 @@ -39,6 +39,9 @@ #include "my_readline.h" #include @@ -12,7 +12,7 @@ $NetBSD: patch-ba,v 1.1 2005/02/18 00:48:05 xtraeme Exp $ #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H) #include -@@ -408,8 +411,13 @@ +@@ -410,8 +413,13 @@ if (opt_sigint_ignore) signal(SIGINT, SIG_IGN); else diff --git a/databases/mysql4-client/patches/patch-bd b/databases/mysql4-client/patches/patch-bd index 39e83012da2..84d2e7e389a 100644 --- a/databases/mysql4-client/patches/patch-bd +++ b/databases/mysql4-client/patches/patch-bd @@ -1,7 +1,7 @@ -$NetBSD: patch-bd,v 1.2 2006/08/31 12:42:42 seb Exp $ +$NetBSD: patch-bd,v 1.3 2007/05/23 08:11:50 martti Exp $ ---- tests/mysql_client_test.c.orig 2006-07-19 15:10:41.000000000 +0000 -+++ tests/mysql_client_test.c +--- tests/mysql_client_test.c.orig 2006-11-03 04:15:21.000000000 +0200 ++++ tests/mysql_client_test.c 2007-05-23 08:25:53.000000000 +0300 @@ -22,6 +22,7 @@ ***************************************************************************/ @@ -10,7 +10,7 @@ $NetBSD: patch-bd,v 1.2 2006/08/31 12:42:42 seb Exp $ #include #include #include -@@ -11855,6 +11856,48 @@ static void test_bug15613() +@@ -11856,6 +11857,48 @@ mysql_stmt_close(stmt); } @@ -59,11 +59,11 @@ $NetBSD: patch-bd,v 1.2 2006/08/31 12:42:42 seb Exp $ /* Bug#20152: mysql_stmt_execute() writes to MYSQL_TYPE_DATE buffer -@@ -12130,6 +12173,7 @@ static struct my_tests_st my_tests[]= { +@@ -12170,6 +12213,7 @@ { "test_bug11718", test_bug11718 }, { "test_bug12925", test_bug12925 }, { "test_bug15613", test_bug15613 }, + { "test_bug17667", test_bug17667 }, { "test_bug20152", test_bug20152 }, + { "test_bug21726", test_bug21726 }, { 0, 0 } - }; diff --git a/databases/mysql4-client/patches/patch-be b/databases/mysql4-client/patches/patch-be index 64998b911c8..fa8dc2c710b 100644 --- a/databases/mysql4-client/patches/patch-be +++ b/databases/mysql4-client/patches/patch-be @@ -1,8 +1,8 @@ -$NetBSD: patch-be,v 1.1 2006/06/19 07:53:00 seb Exp $ +$NetBSD: patch-be,v 1.2 2007/05/23 08:11:50 martti Exp $ ---- sql/sql_lex.cc.orig 2006-05-24 18:00:37.000000000 +0000 -+++ sql/sql_lex.cc -@@ -892,6 +892,8 @@ int yylex(void *arg, void *yythd) +--- sql/sql_lex.cc.orig 2006-11-03 04:15:21.000000000 +0200 ++++ sql/sql_lex.cc 2007-05-23 08:26:27.000000000 +0300 +@@ -894,6 +894,8 @@ while (lex->ptr != lex->end_of_query && ((c=yyGet()) != '*' || yyPeek() != '/')) { -- cgit v1.2.3