diff options
| author | adam <adam> | 2007-03-11 18:42:27 +0000 |
|---|---|---|
| committer | adam <adam> | 2007-03-11 18:42:27 +0000 |
| commit | 51f6ceae6416f9978398d728ef006af99e43b6f1 (patch) | |
| tree | aa7387385ccc354202de04b4f73a52e635b67af9 /databases | |
| parent | abf8b5aba15b5b0f53d9d6da6239b6c0e488a3e9 (diff) | |
| download | pkgsrc-51f6ceae6416f9978398d728ef006af99e43b6f1.tar.gz | |
Changes 5.0.37:
* Added the SHOW PROFILES and SHOW PROFILE statements to display statement
profile data, and the accompanying INFORMATION_SCHEMA.PROFILING table.
* Added the Uptime_since_flush_status status variable, which indicates the
number of seconds since the most recent FLUSH STATUS statement.
* Incompatible change in DATE_FORMAT().
* NDB Cluster: The LockPagesInMainMemory configuration parameter has changed
its type and possible values.
* The bundled yaSSL library was upgraded to version 1.5.8.
* The --skip-thread-priority option now is enabled by default for binary Mac
OS X distributions. Use of thread priorities degrades performance on Mac OS X.
* Added the --disable-grant-options option to configure.
* Bug fixes.
Diffstat (limited to 'databases')
42 files changed, 316 insertions, 262 deletions
diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile index fdbcb1bdb39..c759ead5cad 100644 --- a/databases/mysql5-client/Makefile +++ b/databases/mysql5-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/08/06 16:30:40 tron Exp $ +# $NetBSD: Makefile,v 1.9 2007/03/11 18:42:27 adam Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} SVR4_PKGNAME= mysqc @@ -14,12 +14,13 @@ CONFIGURE_ARGS+= --enable-thread-safe-client UNWRAP_FILES+= scripts/mysql_config INFO_FILES= # PLIST +INSTALLATION_DIRS+= share/examples/mysql + post-install: cd ${WRKSRC}; for f in mysql.info mysql.info-[0-9]*; do \ ${TEST} ! -f "$$f" || \ ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR}; \ done - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mysql .for f in huge large innodb-heavy-4G small medium ${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \ ${PREFIX}/share/examples/mysql/my-${f}.cnf diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common index 7da403fcc26..cb9bbf5ecc8 100644 --- a/databases/mysql5-client/Makefile.common +++ b/databases/mysql5-client/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.19 2007/02/22 19:30:03 wiz Exp $ +# $NetBSD: Makefile.common,v 1.20 2007/03/11 18:42:27 adam Exp $ -DISTNAME= mysql-5.0.27 +DISTNAME= mysql-5.0.37 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.0/} diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo index ace2973ea01..71ab9884b05 100644 --- a/databases/mysql5-client/distinfo +++ b/databases/mysql5-client/distinfo @@ -1,27 +1,27 @@ -$NetBSD: distinfo,v 1.15 2006/12/10 04:12:17 xtraeme Exp $ +$NetBSD: distinfo,v 1.16 2007/03/11 18:42:27 adam Exp $ -SHA1 (mysql-5.0.27.tar.gz) = 656de9c03f07c2371f40277076ec2fc6eac51ec8 -RMD160 (mysql-5.0.27.tar.gz) = 3de75b959d04e002b2e4cfe322abdb48bf2f80fd -Size (mysql-5.0.27.tar.gz) = 25867740 bytes +SHA1 (mysql-5.0.37.tar.gz) = 7c957d4337156c7f98b0617fd5a63f3a838a9bc4 +RMD160 (mysql-5.0.37.tar.gz) = 132d3886a81fcec9be50cdc8d97c868928f5424f +Size (mysql-5.0.37.tar.gz) = 23239518 bytes SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec -SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f -SHA1 (patch-ac) = a186d330698f1d6e178aacc8b91f942b41cdb878 -SHA1 (patch-ad) = 47e79812178e022e85ea522d3c15618b6c245318 -SHA1 (patch-ae) = f94e786b15089174b33045cdcdc76ba195609f34 -SHA1 (patch-af) = fee9e6d92a6657145a197edbaa11be8f331a921e -SHA1 (patch-ag) = 52fb37b6f0db7eefd9ca9102451d13a365dd0816 -SHA1 (patch-ah) = 69d3fe4d997b3494ed7237a55efdf1a45970fefa -SHA1 (patch-ai) = 242c97ab4658838a6001d9c288e01209abfcee77 -SHA1 (patch-aj) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a -SHA1 (patch-ak) = a09c2bf961d0e40e328d246e821efc36461dbdf8 -SHA1 (patch-al) = 56bb803eecfde5052fecae365d5fcad369ce954c -SHA1 (patch-am) = 3ea8da131278d25d0626e6be244ab47a6dcb7a62 -SHA1 (patch-an) = c64818c07c7f3dc9382aa1deb2e067013ceec13e -SHA1 (patch-ao) = b45f206a4e74f5c271f2582d3c2da3de2bb80efe -SHA1 (patch-ap) = fccb45abcff3c851c9337899560f2f7625d1b42b -SHA1 (patch-aq) = 00725240bad2eee5c6359200d64fe00cffa14739 -SHA1 (patch-ar) = b47e229122e8468014b6428843512f7dceb2a6ad -SHA1 (patch-as) = d1b6e02e428919f2eb8ba9c430da9a262de1e1a4 -SHA1 (patch-at) = d429fed148591ca609efa07146b8e0c9f5015354 -SHA1 (patch-au) = 03a02286c7d9d3d977d2464580cab0b754ecd72a -SHA1 (patch-bf) = c63133d40c2008ba57a968af693173a1fd97a927 +SHA1 (patch-ab) = 9635c85a7c553ae6ab3cdd09f04d09ee1f537381 +SHA1 (patch-ac) = ec63621ba908b9da9e1d6dacba9a7894c21e9f5b +SHA1 (patch-ad) = e8e04a6beca500a0fd96b95b19fac13d7a662500 +SHA1 (patch-ae) = aba6fc15aae07d501d3366553acb735d0137f1a8 +SHA1 (patch-af) = 06cb76ad50ed0de3e82f682bf57a75441f68da26 +SHA1 (patch-ag) = 212f9c0a2e2eb6feb013e4a72eaf658951b995b5 +SHA1 (patch-ah) = 18f9bb2c6d9b88d04b9ade6177212ab2ed21b4d7 +SHA1 (patch-ai) = 317c20011478c631b7d150bf84e82c9c5fbb0a76 +SHA1 (patch-aj) = 9961c99cc90bf5a0e5ef7a6313030128403a1f55 +SHA1 (patch-ak) = 76e361240f4e62e98cebcb25ef913de1aecddc1f +SHA1 (patch-al) = 5189fee50cd16a620fb1ccb3fe529c26b5e72356 +SHA1 (patch-am) = 7fc6533477e6a0e826765106dd8d1b27cbc5695e +SHA1 (patch-an) = 49d1c45e549c7f39a2830401621458f9a5eb46bc +SHA1 (patch-ao) = f69d47177787bd4b69fc8f81344b6e43fcdc5d88 +SHA1 (patch-ap) = fc4246e829a3b53b27ff2c6f5572eb4b13a277e5 +SHA1 (patch-aq) = 18ed036f2df801124b8c717822ffc9c1224b27e3 +SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923 +SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d +SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156 +SHA1 (patch-au) = 1bdfa4599f92d5911e321e19b29593f971beb561 +SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299 diff --git a/databases/mysql5-client/patches/patch-ab b/databases/mysql5-client/patches/patch-ab index 43a4d4ea843..446170613e3 100644 --- a/databases/mysql5-client/patches/patch-ab +++ b/databases/mysql5-client/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $ +$NetBSD: patch-ab,v 1.2 2007/03/11 18:42:28 adam Exp $ ---- sql/mysqld.cc.orig 2005-10-14 10:21:12.000000000 +0000 +--- sql/mysqld.cc.orig 2007-03-05 20:21:11.000000000 +0100 +++ sql/mysqld.cc -@@ -182,7 +182,7 @@ static void getvolumeID(BYTE *volumeName +@@ -171,7 +171,7 @@ static void getvolumeID(BYTE *volumeName int initgroups(const char *,unsigned int); #endif diff --git a/databases/mysql5-client/patches/patch-ac b/databases/mysql5-client/patches/patch-ac index 4684d1221a7..416f708312b 100644 --- a/databases/mysql5-client/patches/patch-ac +++ b/databases/mysql5-client/patches/patch-ac @@ -1,10 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2006/10/14 18:41:34 xtraeme Exp $ +$NetBSD: patch-ac,v 1.4 2007/03/11 18:42:28 adam Exp $ -Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4 - ---- configure.in.orig 2006-10-14 18:56:35.000000000 +0200 -+++ configure.in 2006-10-14 18:58:41.000000000 +0200 -@@ -475,7 +475,7 @@ +--- configure.in.orig 2007-03-05 20:21:13.000000000 +0100 ++++ configure.in +@@ -487,7 +487,7 @@ then FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null" else case $SYSTEM_TYPE in @@ -13,7 +11,7 @@ Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4 FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null" ;; *darwin*) -@@ -752,6 +752,8 @@ +@@ -794,6 +794,8 @@ AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(H # For sem_xxx functions on Solaris 2.6 AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init)) @@ -22,7 +20,7 @@ Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4 MYSQL_CHECK_ZLIB_WITH_COMPRESS # For large pages support -@@ -1077,7 +1079,7 @@ +@@ -1119,7 +1121,7 @@ case $SYSTEM_TYPE in MAX_C_OPTIMIZE="-O" fi ;; diff --git a/databases/mysql5-client/patches/patch-ad b/databases/mysql5-client/patches/patch-ad index 5987535bc13..ac95931cbbe 100644 --- a/databases/mysql5-client/patches/patch-ad +++ b/databases/mysql5-client/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.4 2006/10/15 08:58:15 salo Exp $ +$NetBSD: patch-ad,v 1.5 2007/03/11 18:42:28 adam Exp $ ---- Makefile.in.orig 2006-10-14 18:55:43.000000000 +0200 -+++ Makefile.in 2006-10-14 18:55:59.000000000 +0200 -@@ -370,12 +370,7 @@ +--- Makefile.in.orig 2007-03-05 20:23:25.000000000 +0100 ++++ Makefile.in +@@ -372,12 +372,7 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ README COPYING EXCEPTIONS-CLIENT CMakeLists.txt diff --git a/databases/mysql5-client/patches/patch-ae b/databases/mysql5-client/patches/patch-ae index 4dad72cff0b..20426b0046e 100644 --- a/databases/mysql5-client/patches/patch-ae +++ b/databases/mysql5-client/patches/patch-ae @@ -1,10 +1,8 @@ -$NetBSD: patch-ae,v 1.6 2006/08/06 16:30:40 tron Exp $ +$NetBSD: patch-ae,v 1.7 2007/03/11 18:42:28 adam Exp $ -Don't install scripts handled by mysql-server. - ---- scripts/Makefile.in.orig 2006-07-27 19:53:32.000000000 +0100 -+++ scripts/Makefile.in 2006-08-06 15:11:56.000000000 +0100 -@@ -351,13 +351,12 @@ +--- scripts/Makefile.in.orig 2007-03-05 20:23:19.000000000 +0100 ++++ scripts/Makefile.in +@@ -355,13 +355,12 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ @@ -19,7 +17,7 @@ Don't install scripts handled by mysql-server. mysql_zap \ mysqlaccess \ mysqlbug \ -@@ -368,7 +367,6 @@ +@@ -372,7 +371,6 @@ bin_SCRIPTS = @server_scripts@ \ mysql_explain_log \ mysql_tableinfo \ mysql_upgrade_shell \ diff --git a/databases/mysql5-client/patches/patch-af b/databases/mysql5-client/patches/patch-af index 749f96118a8..ba726f27c6e 100644 --- a/databases/mysql5-client/patches/patch-af +++ b/databases/mysql5-client/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.5 2006/10/14 18:41:34 xtraeme Exp $ +$NetBSD: patch-af,v 1.6 2007/03/11 18:42:28 adam Exp $ ---- man/Makefile.in.orig 2006-10-04 13:25:43.000000000 +0200 -+++ man/Makefile.in 2006-10-14 19:20:57.000000000 +0200 -@@ -344,8 +344,9 @@ +--- man/Makefile.in.orig 2007-03-05 20:22:54.000000000 +0100 ++++ man/Makefile.in +@@ -348,8 +348,9 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ diff --git a/databases/mysql5-client/patches/patch-ag b/databases/mysql5-client/patches/patch-ag index 8942c73a25a..f2897508fbc 100644 --- a/databases/mysql5-client/patches/patch-ag +++ b/databases/mysql5-client/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.2 2006/05/18 16:11:15 cube Exp $ +$NetBSD: patch-ag,v 1.3 2007/03/11 18:42:28 adam Exp $ ---- strings/Makefile.in.orig 2006-04-26 20:32:24.000000000 +0200 +--- strings/Makefile.in.orig 2007-03-05 20:23:22.000000000 +0100 +++ strings/Makefile.in -@@ -609,7 +609,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR +@@ -616,7 +616,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR if test -f $$p; then \ f=$(am__strip_dir) \ echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ @@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.2 2006/05/18 16:11:15 cube Exp $ else :; fi; \ done @$(POST_INSTALL) -@@ -617,7 +616,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR +@@ -624,7 +623,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR if test -f $$p; then \ p=$(am__strip_dir) \ echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \ @@ -18,7 +18,7 @@ $NetBSD: patch-ag,v 1.2 2006/05/18 16:11:15 cube Exp $ else :; fi; \ done -@@ -626,7 +624,6 @@ uninstall-pkglibLIBRARIES: +@@ -633,7 +631,6 @@ uninstall-pkglibLIBRARIES: @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ diff --git a/databases/mysql5-client/patches/patch-ah b/databases/mysql5-client/patches/patch-ah index 8eb669d0db3..e8a8a55ec0b 100644 --- a/databases/mysql5-client/patches/patch-ah +++ b/databases/mysql5-client/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.3 2006/10/28 07:45:51 schwarz Exp $ +$NetBSD: patch-ah,v 1.4 2007/03/11 18:42:28 adam Exp $ ---- include/my_net.h.orig 2006-10-23 21:21:16.000000000 +0200 -+++ include/my_net.h 2006-10-23 21:24:11.000000000 +0200 -@@ -71,6 +71,15 @@ +--- include/my_net.h.orig 2007-03-05 20:21:13.000000000 +0100 ++++ include/my_net.h +@@ -70,6 +70,15 @@ C_MODE_START #endif diff --git a/databases/mysql5-client/patches/patch-ai b/databases/mysql5-client/patches/patch-ai index f8031132936..02bb1cf96b9 100644 --- a/databases/mysql5-client/patches/patch-ai +++ b/databases/mysql5-client/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $ +$NetBSD: patch-ai,v 1.2 2007/03/11 18:42:28 adam Exp $ ---- client/completion_hash.cc.orig 2005-02-18 01:38:24.000000000 +0100 -+++ client/completion_hash.cc 2005-02-18 01:38:47.000000000 +0100 -@@ -23,6 +23,10 @@ +--- client/completion_hash.cc.orig 2007-03-05 20:21:39.000000000 +0100 ++++ client/completion_hash.cc +@@ -22,6 +22,10 @@ #include <my_global.h> #include <m_string.h> diff --git a/databases/mysql5-client/patches/patch-aj b/databases/mysql5-client/patches/patch-aj index 11ced7f7eb8..2c7bfd0df27 100644 --- a/databases/mysql5-client/patches/patch-aj +++ b/databases/mysql5-client/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $ +$NetBSD: patch-aj,v 1.2 2007/03/11 18:42:28 adam Exp $ ---- client/mysqladmin.cc.orig 2005-02-18 01:39:09.000000000 +0100 -+++ client/mysqladmin.cc 2005-02-18 01:40:21.000000000 +0100 -@@ -326,8 +326,14 @@ +--- client/mysqladmin.cc.orig 2007-03-05 20:21:42.000000000 +0100 ++++ client/mysqladmin.cc +@@ -325,8 +325,14 @@ int main(int argc,char *argv[]) if (tty_password) opt_password = get_tty_password(NullS); diff --git a/databases/mysql5-client/patches/patch-ak b/databases/mysql5-client/patches/patch-ak index fbaf8e1d64d..c2342d538b2 100644 --- a/databases/mysql5-client/patches/patch-ak +++ b/databases/mysql5-client/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1 2005/12/02 08:13:26 xtraeme Exp $ +$NetBSD: patch-ak,v 1.2 2007/03/11 18:42:28 adam Exp $ ---- mysys/Makefile.in.orig 2005-12-02 08:52:03.000000000 +0100 -+++ mysys/Makefile.in 2005-12-02 08:52:12.000000000 +0100 -@@ -473,7 +473,7 @@ +--- mysys/Makefile.in.orig 2007-03-05 20:22:57.000000000 +0100 ++++ mysys/Makefile.in +@@ -428,7 +428,7 @@ MYSQLBASEdir = $(prefix) INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ -I$(top_srcdir)/include -I$(srcdir) diff --git a/databases/mysql5-client/patches/patch-al b/databases/mysql5-client/patches/patch-al index cb43f773d12..79e04eb77dc 100644 --- a/databases/mysql5-client/patches/patch-al +++ b/databases/mysql5-client/patches/patch-al @@ -1,14 +1,12 @@ -$NetBSD: patch-al,v 1.1 2006/01/08 17:45:23 xtraeme Exp $ +$NetBSD: patch-al,v 1.2 2007/03/11 18:42:28 adam Exp $ ---- include/Makefile.in.orig 2006-01-08 18:09:19.000000000 +0100 -+++ include/Makefile.in 2006-01-08 18:11:16.000000000 +0100 -@@ -349,7 +349,8 @@ - errmsg.h my_global.h my_net.h my_alloc.h \ - my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ - sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ -- mysql_time.h $(BUILT_SOURCES) -+ mysql_time.h $(BUILT_SOURCES) mysqld_ername.h \ -+ mysqld_error.h sql_state.h +--- include/Makefile.in.orig 2007-03-11 09:24:33.000000000 +0100 ++++ include/Makefile.in +@@ -360,6 +360,7 @@ zlib_dir = @zlib_dir@ + BUILT_SOURCES = $(HEADERS_GEN) abi_check + HEADERS_GEN = mysql_version.h my_config.h + HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ ++ mysqld_ername.h mysqld_error.h sql_state.h \ + my_list.h my_alloc.h typelib.h - noinst_HEADERS = config-win.h config-os2.h config-netware.h \ - heap.h my_bitmap.h\ + pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ diff --git a/databases/mysql5-client/patches/patch-am b/databases/mysql5-client/patches/patch-am index 474c7304c31..60b6c36d8f0 100644 --- a/databases/mysql5-client/patches/patch-am +++ b/databases/mysql5-client/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.1 2006/10/28 07:45:51 schwarz Exp $ +$NetBSD: patch-am,v 1.2 2007/03/11 18:42:28 adam Exp $ ---- sql/sql_string.cc.orig 2006-10-23 23:22:28.000000000 +0200 -+++ sql/sql_string.cc 2006-10-23 23:24:07.000000000 +0200 -@@ -38,6 +38,10 @@ +--- sql/sql_string.cc.orig 2007-03-05 20:21:11.000000000 +0100 ++++ sql/sql_string.cc +@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr); #include "sql_string.h" diff --git a/databases/mysql5-client/patches/patch-an b/databases/mysql5-client/patches/patch-an index 07751694a25..437760246f4 100644 --- a/databases/mysql5-client/patches/patch-an +++ b/databases/mysql5-client/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.1 2006/10/28 07:45:51 schwarz Exp $ +$NetBSD: patch-an,v 1.2 2007/03/11 18:42:28 adam Exp $ ---- client/sql_string.cc.orig 2006-10-23 23:26:59.000000000 +0200 -+++ client/sql_string.cc 2006-10-23 23:27:27.000000000 +0200 -@@ -38,6 +38,10 @@ +--- client/sql_string.cc.orig 2007-03-05 20:21:11.000000000 +0100 ++++ client/sql_string.cc +@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr); #include "sql_string.h" diff --git a/databases/mysql5-client/patches/patch-ao b/databases/mysql5-client/patches/patch-ao index 73ef59e5ce6..00704f2bc4a 100644 --- a/databases/mysql5-client/patches/patch-ao +++ b/databases/mysql5-client/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.1 2006/10/28 07:45:51 schwarz Exp $ +$NetBSD: patch-ao,v 1.2 2007/03/11 18:42:28 adam Exp $ ---- libmysqld/sql_string.cc.orig 2006-10-23 23:29:34.000000000 +0200 -+++ libmysqld/sql_string.cc 2006-10-23 23:29:54.000000000 +0200 -@@ -38,6 +38,10 @@ +--- libmysqld/sql_string.cc.orig 2007-03-05 20:21:11.000000000 +0100 ++++ libmysqld/sql_string.cc +@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr); #include "sql_string.h" diff --git a/databases/mysql5-client/patches/patch-ap b/databases/mysql5-client/patches/patch-ap index 693bb99fe16..91de78e00ab 100644 --- a/databases/mysql5-client/patches/patch-ap +++ b/databases/mysql5-client/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.1 2006/10/28 07:45:51 schwarz Exp $ +$NetBSD: patch-ap,v 1.2 2007/03/11 18:42:28 adam Exp $ ---- client/mysqlbinlog.cc.orig 2006-10-23 23:42:07.000000000 +0200 -+++ client/mysqlbinlog.cc 2006-10-23 23:42:55.000000000 +0200 -@@ -37,6 +37,9 @@ +--- client/mysqlbinlog.cc.orig 2007-03-05 20:21:42.000000000 +0100 ++++ client/mysqlbinlog.cc +@@ -36,6 +36,9 @@ #include "mysql_priv.h" #include "log_event.h" #include "sql_common.h" diff --git a/databases/mysql5-client/patches/patch-aq b/databases/mysql5-client/patches/patch-aq index f0662ac791c..a76e3933d70 100644 --- a/databases/mysql5-client/patches/patch-aq +++ b/databases/mysql5-client/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.1 2006/10/28 07:45:51 schwarz Exp $ +$NetBSD: patch-aq,v 1.2 2007/03/11 18:42:28 adam Exp $ ---- strings/decimal.c.orig 2006-10-23 23:45:14.000000000 +0200 -+++ strings/decimal.c 2006-10-23 23:45:46.000000000 +0200 -@@ -106,6 +106,9 @@ +--- strings/decimal.c.orig 2007-03-05 20:21:12.000000000 +0100 ++++ strings/decimal.c +@@ -105,6 +105,9 @@ #include <my_sys.h> /* for my_alloca */ #include <m_string.h> #include <decimal.h> diff --git a/databases/mysql5-client/patches/patch-ar b/databases/mysql5-client/patches/patch-ar index 1ad34ceb605..3969fcb9239 100644 --- a/databases/mysql5-client/patches/patch-ar +++ b/databases/mysql5-client/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.1 2006/10/28 07:45:51 schwarz Exp $ +$NetBSD: patch-ar,v 1.2 2007/03/11 18:42:28 adam Exp $ ---- sql/log_event.cc.orig 2006-10-23 23:49:26.000000000 +0200 -+++ sql/log_event.cc 2006-10-23 23:50:20.000000000 +0200 -@@ -24,6 +24,9 @@ +--- sql/log_event.cc.orig 2007-03-05 20:21:39.000000000 +0100 ++++ sql/log_event.cc +@@ -23,6 +23,9 @@ #include "mysql_priv.h" #include "slave.h" #include <my_dir.h> diff --git a/databases/mysql5-client/patches/patch-as b/databases/mysql5-client/patches/patch-as index edba7011826..78d4681446e 100644 --- a/databases/mysql5-client/patches/patch-as +++ b/databases/mysql5-client/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.1 2006/10/28 07:45:51 schwarz Exp $ +$NetBSD: patch-as,v 1.2 2007/03/11 18:42:29 adam Exp $ ---- libmysqld/log_event.cc.orig 2006-10-23 23:52:01.000000000 +0200 -+++ libmysqld/log_event.cc 2006-10-23 23:52:30.000000000 +0200 -@@ -24,6 +24,9 @@ +--- libmysqld/log_event.cc.orig 2007-03-05 20:21:39.000000000 +0100 ++++ libmysqld/log_event.cc +@@ -23,6 +23,9 @@ #include "mysql_priv.h" #include "slave.h" #include <my_dir.h> diff --git a/databases/mysql5-client/patches/patch-at b/databases/mysql5-client/patches/patch-at index 0fd2f6292fb..6185810fadd 100644 --- a/databases/mysql5-client/patches/patch-at +++ b/databases/mysql5-client/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.1 2006/10/28 07:45:51 schwarz Exp $ +$NetBSD: patch-at,v 1.2 2007/03/11 18:42:29 adam Exp $ ---- sql/log_event.h.orig 2006-10-24 00:00:12.000000000 +0200 -+++ sql/log_event.h 2006-10-24 00:00:43.000000000 +0200 -@@ -18,6 +18,10 @@ +--- sql/log_event.h.orig 2007-03-05 20:21:40.000000000 +0100 ++++ sql/log_event.h +@@ -17,6 +17,10 @@ #ifndef _log_event_h #define _log_event_h diff --git a/databases/mysql5-client/patches/patch-au b/databases/mysql5-client/patches/patch-au index c0c31abbefe..d3f831b0cb7 100644 --- a/databases/mysql5-client/patches/patch-au +++ b/databases/mysql5-client/patches/patch-au @@ -1,8 +1,8 @@ -$NetBSD: patch-au,v 1.1 2006/10/28 07:45:51 schwarz Exp $ +$NetBSD: patch-au,v 1.2 2007/03/11 18:42:29 adam Exp $ ---- client/mysql.cc.orig Tue Oct 24 00:24:08 2006 -+++ client/mysql.cc Mon Oct 23 23:11:25 2006 -@@ -38,7 +38,15 @@ +--- client/mysql.cc.orig 2007-03-05 20:21:21.000000000 +0100 ++++ client/mysql.cc +@@ -37,7 +37,15 @@ #endif #include "my_readline.h" #include <signal.h> @@ -18,7 +18,7 @@ $NetBSD: patch-au,v 1.1 2006/10/28 07:45:51 schwarz Exp $ #if defined(USE_LIBEDIT_INTERFACE) && defined(HAVE_LOCALE_H) #include <locale.h> -@@ -420,10 +428,10 @@ +@@ -438,10 +446,10 @@ int main(int argc,char *argv[]) ignore_errors=1; // Don't abort monitor if (opt_sigint_ignore) @@ -32,7 +32,7 @@ $NetBSD: patch-au,v 1.1 2006/10/28 07:45:51 schwarz Exp $ /* Run in interactive mode like the ingres/postgres monitor -@@ -495,7 +503,7 @@ +@@ -513,7 +521,7 @@ sig_handler mysql_sigint(int sig) char kill_buffer[40]; MYSQL *kill_mysql= NULL; diff --git a/databases/mysql5-client/patches/patch-bf b/databases/mysql5-client/patches/patch-bf index d7c162f7bd5..3a4d3a98d97 100644 --- a/databases/mysql5-client/patches/patch-bf +++ b/databases/mysql5-client/patches/patch-bf @@ -1,8 +1,8 @@ -$NetBSD: patch-bf,v 1.1 2006/10/08 13:30:59 rillig Exp $ +$NetBSD: patch-bf,v 1.2 2007/03/11 18:42:29 adam Exp $ ---- bdb/dist/configure.orig 2006-10-08 15:25:31.000000000 +0200 -+++ bdb/dist/configure 2006-10-08 15:26:39.000000000 +0200 -@@ -5038,7 +5038,7 @@ fi +--- bdb/dist/configure.orig 2007-03-05 20:23:33.000000000 +0100 ++++ bdb/dist/configure +@@ -5039,7 +5039,7 @@ fi # we're using. case "$host_os" in sysv5UnixWare*|sysv5OpenUNIX8*) diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile index fbf9abb833b..079a6f2b9c7 100644 --- a/databases/mysql5-server/Makefile +++ b/databases/mysql5-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:50 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2007/03/11 18:42:49 adam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} SVR4_PKGNAME= mysqs @@ -32,7 +32,7 @@ FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \ MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \ MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} BUILD_DEFS+= MYSQL_DATADIR -BUILD_DIRS= ${WRKSRC} ${WRKSRC}/man +BUILD_DIRS= . man REPLACE_PERL+= mysql-test/mysql-test-run.pl @@ -49,17 +49,16 @@ BUILDLINK_DEPMETHOD.readline=build .include "../../security/tcp_wrappers/buildlink3.mk" post-configure: - cd ${WRKSRC} && ${CP} -f config.h include/my_config.h + cd ${WRKSRC} && cp -f config.h include/my_config.h post-build: - cd ${WRKSRC}/scripts && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ + cd ${WRKSRC}/scripts && env ${MAKE_ENV} ${MAKE_PROGRAM} \ ${MAKE_FLAGS} mysqld_safe mysql_install_db post-install: ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysqld_safe ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_install_db ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/support-files/mysql.server ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/mysqld.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_MAN} ${WRKSRC}/man/mysqld_multi.1 ${PREFIX}/${PKGMANDIR}/man1 #${INSTALL_MAN} ${WRKSRC}/man/mysqld_safe.1 ${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mysql_secure_installation.sh \ diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST index 534189b07db..8aba6382e6b 100644 --- a/databases/mysql5-server/PLIST +++ b/databases/mysql5-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2006/10/14 18:41:34 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.9 2007/03/11 18:42:49 adam Exp $ bin/comp_err bin/innochecksum bin/my_print_defaults @@ -25,7 +25,6 @@ lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libvio.a libexec/mysqld -man/man1/mysqld.1 man/man1/mysqld_multi.1 man/man8/mysqld.8 man/man8/mysqlmanager.8 @@ -34,7 +33,9 @@ share/mysql-test/README share/mysql-test/cacert.pem share/mysql-test/client-cert.pem share/mysql-test/client-key.pem +share/mysql-test/include/analyze_failure_sync_with_master.test share/mysql-test/include/big_test.inc +share/mysql-test/include/check-testcase.test share/mysql-test/include/check_var_limit.inc share/mysql-test/include/common-tests.inc share/mysql-test/include/ctype_common.inc @@ -78,11 +79,11 @@ share/mysql-test/include/have_ucs2.inc share/mysql-test/include/have_udf.inc share/mysql-test/include/have_ujis.inc share/mysql-test/include/im_check_env.inc +share/mysql-test/include/innodb_rollback_on_timeout.inc share/mysql-test/include/is_debug_build.inc share/mysql-test/include/loaddata_autocom.inc share/mysql-test/include/master-slave.inc share/mysql-test/include/mysqltest-x.inc -share/mysql-test/include/mysqltest_while.inc share/mysql-test/include/ndb_default_cluster.inc share/mysql-test/include/not_as_root.inc share/mysql-test/include/not_embedded.inc @@ -94,17 +95,18 @@ share/mysql-test/include/ps_modify.inc share/mysql-test/include/ps_modify1.inc share/mysql-test/include/ps_query.inc share/mysql-test/include/ps_renew.inc +share/mysql-test/include/report-features.test share/mysql-test/include/rpl_stmt_seq.inc share/mysql-test/include/show_msg.inc share/mysql-test/include/show_msg80.inc -share/mysql-test/include/sourced.inc -share/mysql-test/include/sourced1.inc share/mysql-test/include/sp-vars.inc share/mysql-test/include/strict_autoinc.inc share/mysql-test/include/system_db_struct.inc share/mysql-test/include/test_outfile.inc share/mysql-test/include/testdb_only.inc share/mysql-test/include/varchar.inc +share/mysql-test/include/wait_for_query_to_suceed.inc +share/mysql-test/include/wait_show_pattern.inc share/mysql-test/include/wait_slave_status.inc share/mysql-test/include/windows.inc share/mysql-test/install_test_db @@ -113,6 +115,7 @@ share/mysql-test/lib/mtr_cases.pl share/mysql-test/lib/mtr_diff.pl share/mysql-test/lib/mtr_gcov.pl share/mysql-test/lib/mtr_gprof.pl +share/mysql-test/lib/mtr_im.pl share/mysql-test/lib/mtr_io.pl share/mysql-test/lib/mtr_match.pl share/mysql-test/lib/mtr_misc.pl @@ -120,10 +123,13 @@ share/mysql-test/lib/mtr_process.pl share/mysql-test/lib/mtr_report.pl share/mysql-test/lib/mtr_stress.pl share/mysql-test/lib/mtr_timer.pl +share/mysql-test/lib/mtr_unique.pl share/mysql-test/mtr share/mysql-test/mysql-test-run +share/mysql-test/mysql-test-run-shell share/mysql-test/mysql-test-run.pl share/mysql-test/r/alias.result +share/mysql-test/r/alter_table-big.result share/mysql-test/r/alter_table.result share/mysql-test/r/analyse.result share/mysql-test/r/analyze.result @@ -139,6 +145,7 @@ share/mysql-test/r/bdb-deadlock.result share/mysql-test/r/bdb.result share/mysql-test/r/bdb_cache.result share/mysql-test/r/bdb_gis.result +share/mysql-test/r/bdb_notembedded.result share/mysql-test/r/bench_count_distinct.result share/mysql-test/r/big_test.require share/mysql-test/r/bigint.result @@ -178,6 +185,7 @@ share/mysql-test/r/ctype_eucjpms.result share/mysql-test/r/ctype_euckr.result share/mysql-test/r/ctype_gb2312.result share/mysql-test/r/ctype_gbk.result +share/mysql-test/r/ctype_hebrew.result share/mysql-test/r/ctype_latin1.result share/mysql-test/r/ctype_latin1_de.result share/mysql-test/r/ctype_latin2.result @@ -206,12 +214,17 @@ share/mysql-test/r/empty_table.result share/mysql-test/r/endspace.result share/mysql-test/r/errors.result share/mysql-test/r/exampledb.result +share/mysql-test/r/execution_constants.result share/mysql-test/r/explain.result share/mysql-test/r/federated.result share/mysql-test/r/federated_archive.result share/mysql-test/r/federated_bug_13118.result +share/mysql-test/r/fix_priv_tables.result +share/mysql-test/r/fix_priv_tabs.result share/mysql-test/r/flush.result +share/mysql-test/r/flush2.result share/mysql-test/r/flush_block_commit.result +share/mysql-test/r/flush_block_commit_notembedded.result share/mysql-test/r/flush_read_lock_kill.result share/mysql-test/r/flush_table.result share/mysql-test/r/foreign_key.result @@ -282,6 +295,7 @@ share/mysql-test/r/have_innodb.require share/mysql-test/r/have_latin2_ch.require share/mysql-test/r/have_met_timezone.require share/mysql-test/r/have_moscow_leap_timezone.require +share/mysql-test/r/have_mysql_upgrade.result share/mysql-test/r/have_ndb.require share/mysql-test/r/have_ndb_status_ok.require share/mysql-test/r/have_openssl.require @@ -329,8 +343,10 @@ share/mysql-test/r/innodb_gis.result share/mysql-test/r/innodb_handler.result share/mysql-test/r/innodb_mysql.result share/mysql-test/r/innodb_notembedded.result +share/mysql-test/r/innodb_timeout_rollback.result share/mysql-test/r/innodb_unsafe_binlog.result share/mysql-test/r/insert.result +share/mysql-test/r/insert_notembedded.result share/mysql-test/r/insert_select-binlog.result share/mysql-test/r/insert_select.result share/mysql-test/r/insert_update.result @@ -372,6 +388,8 @@ share/mysql-test/r/myisam.result share/mysql-test/r/mysql.result share/mysql-test/r/mysql_client_test.result share/mysql-test/r/mysql_protocols.result +share/mysql-test/r/mysql_upgrade.result +share/mysql-test/r/mysqladmin.result share/mysql-test/r/mysqlbinlog.result share/mysql-test/r/mysqlbinlog2.result share/mysql-test/r/mysqlcheck.result @@ -436,6 +454,7 @@ share/mysql-test/r/overflow.result share/mysql-test/r/packet.result share/mysql-test/r/perror.result share/mysql-test/r/preload.result +share/mysql-test/r/profiling.result share/mysql-test/r/ps.result share/mysql-test/r/ps_10nestset.result share/mysql-test/r/ps_11bugs.result @@ -457,6 +476,7 @@ share/mysql-test/r/rename.result share/mysql-test/r/repair.result share/mysql-test/r/replace.result share/mysql-test/r/rollback.result +share/mysql-test/r/round.result share/mysql-test/r/row.result share/mysql-test/r/rowid_order_bdb.result share/mysql-test/r/rowid_order_innodb.result @@ -473,14 +493,13 @@ share/mysql-test/r/rpl000012.result share/mysql-test/r/rpl000013.result share/mysql-test/r/rpl000015.result share/mysql-test/r/rpl000017.result -share/mysql-test/r/rpl000018.result share/mysql-test/r/rpl_EE_error.result share/mysql-test/r/rpl_alter.result share/mysql-test/r/rpl_auto_increment.result share/mysql-test/r/rpl_auto_increment_11932.result -share/mysql-test/r/rpl_chain_temp_table.result share/mysql-test/r/rpl_change_master.result share/mysql-test/r/rpl_charset.result +share/mysql-test/r/rpl_charset_sjis.result share/mysql-test/r/rpl_commit_after_flush.result share/mysql-test/r/rpl_create_database.result share/mysql-test/r/rpl_ddl.result @@ -494,12 +513,10 @@ share/mysql-test/r/rpl_dual_pos_advance.result share/mysql-test/r/rpl_empty_master_crash.result share/mysql-test/r/rpl_error_ignored_table.result share/mysql-test/r/rpl_failed_optimize.result -share/mysql-test/r/rpl_failsafe.result share/mysql-test/r/rpl_flush_log_loop.result share/mysql-test/r/rpl_flush_tables.result share/mysql-test/r/rpl_free_items.result share/mysql-test/r/rpl_get_lock.result -share/mysql-test/r/rpl_heap.result share/mysql-test/r/rpl_ignore_grant.result share/mysql-test/r/rpl_ignore_revoke.result share/mysql-test/r/rpl_ignore_table.result @@ -512,6 +529,7 @@ share/mysql-test/r/rpl_loaddata.result share/mysql-test/r/rpl_loaddata_rule_m.result share/mysql-test/r/rpl_loaddata_rule_s.result share/mysql-test/r/rpl_loaddatalocal.result +share/mysql-test/r/rpl_locale.result share/mysql-test/r/rpl_log.result share/mysql-test/r/rpl_log_pos.result share/mysql-test/r/rpl_many_optimize.result @@ -529,6 +547,7 @@ share/mysql-test/r/rpl_mystery22.result share/mysql-test/r/rpl_ndb_innodb_trans.result share/mysql-test/r/rpl_openssl.result share/mysql-test/r/rpl_optimize.result +share/mysql-test/r/rpl_packet.result share/mysql-test/r/rpl_ps.result share/mysql-test/r/rpl_redirect.result share/mysql-test/r/rpl_relayrotate.result @@ -577,10 +596,13 @@ share/mysql-test/r/sp-threads.result share/mysql-test/r/sp-vars.result share/mysql-test/r/sp.result share/mysql-test/r/sp_notembedded.result +share/mysql-test/r/sp_stress_case.result share/mysql-test/r/sp_trans.result share/mysql-test/r/sql_mode.result share/mysql-test/r/ssl.result share/mysql-test/r/ssl_compress.result +share/mysql-test/r/ssl_connect.result +share/mysql-test/r/ssl_des.result share/mysql-test/r/status.result share/mysql-test/r/strict.result share/mysql-test/r/strict_autoinc_1myisam.result @@ -590,6 +612,7 @@ share/mysql-test/r/strict_autoinc_4bdb.result share/mysql-test/r/strict_autoinc_5ndb.result share/mysql-test/r/subselect.result share/mysql-test/r/subselect2.result +share/mysql-test/r/subselect3.result share/mysql-test/r/subselect_gis.result share/mysql-test/r/subselect_innodb.result share/mysql-test/r/subselect_notembedded.result @@ -606,6 +629,7 @@ share/mysql-test/r/testdb_only.require share/mysql-test/r/timezone.result share/mysql-test/r/timezone2.result share/mysql-test/r/timezone3.result +share/mysql-test/r/timezone4.result share/mysql-test/r/timezone_grant.result share/mysql-test/r/trigger-compat.result share/mysql-test/r/trigger-grant.result @@ -651,8 +675,12 @@ share/mysql-test/server-cert.pem share/mysql-test/server-key.pem share/mysql-test/std_data/14897.frm share/mysql-test/std_data/Moscow_leap +share/mysql-test/std_data/bad_gis_data.dat share/mysql-test/std_data/bug15328.cnf share/mysql-test/std_data/bug16266.000001 +share/mysql-test/std_data/bug19371.MYD +share/mysql-test/std_data/bug19371.MYI +share/mysql-test/std_data/bug19371.frm share/mysql-test/std_data/cacert.pem share/mysql-test/std_data/client-cert.pem share/mysql-test/std_data/client-key.pem @@ -671,7 +699,9 @@ share/mysql-test/std_data/ndb_config_mycnf2.cnf share/mysql-test/std_data/rpl_loaddata.dat share/mysql-test/std_data/rpl_loaddata2.dat share/mysql-test/std_data/rpl_timezone.dat +share/mysql-test/std_data/server-cert-des.pem share/mysql-test/std_data/server-cert.pem +share/mysql-test/std_data/server-key-des.pem share/mysql-test/std_data/server-key.pem share/mysql-test/std_data/trunc_binlog.000001 share/mysql-test/std_data/untrusted-cacert.pem @@ -679,6 +709,7 @@ share/mysql-test/std_data/vchar.frm share/mysql-test/std_data/warnings_loaddata.dat share/mysql-test/std_data/words.dat share/mysql-test/t/alias.test +share/mysql-test/t/alter_table-big.test share/mysql-test/t/alter_table.test share/mysql-test/t/analyse.test share/mysql-test/t/analyze.test @@ -697,6 +728,7 @@ share/mysql-test/t/bdb.test share/mysql-test/t/bdb_cache-master.opt share/mysql-test/t/bdb_cache.test share/mysql-test/t/bdb_gis.test +share/mysql-test/t/bdb_notembedded.test share/mysql-test/t/bench_count_distinct.test share/mysql-test/t/bigint.test share/mysql-test/t/binary.test @@ -735,6 +767,7 @@ share/mysql-test/t/ctype_eucjpms.test share/mysql-test/t/ctype_euckr.test share/mysql-test/t/ctype_gb2312.test share/mysql-test/t/ctype_gbk.test +share/mysql-test/t/ctype_hebrew.test share/mysql-test/t/ctype_latin1.test share/mysql-test/t/ctype_latin1_de-master.opt share/mysql-test/t/ctype_latin1_de.test @@ -767,12 +800,17 @@ share/mysql-test/t/empty_table.test share/mysql-test/t/endspace.test share/mysql-test/t/errors.test share/mysql-test/t/exampledb.test +share/mysql-test/t/execution_constants.test share/mysql-test/t/explain.test share/mysql-test/t/federated.test share/mysql-test/t/federated_archive.test share/mysql-test/t/federated_bug_13118.test +share/mysql-test/t/fix_priv_tables.test share/mysql-test/t/flush.test +share/mysql-test/t/flush2-master.opt +share/mysql-test/t/flush2.test share/mysql-test/t/flush_block_commit.test +share/mysql-test/t/flush_block_commit_notembedded.test share/mysql-test/t/flush_read_lock_kill-master.opt share/mysql-test/t/flush_read_lock_kill.test share/mysql-test/t/flush_table.test @@ -863,11 +901,15 @@ share/mysql-test/t/innodb_cache-master.opt share/mysql-test/t/innodb_cache.test share/mysql-test/t/innodb_gis.test share/mysql-test/t/innodb_handler.test +share/mysql-test/t/innodb_mysql-master.opt share/mysql-test/t/innodb_mysql.test share/mysql-test/t/innodb_notembedded.test +share/mysql-test/t/innodb_timeout_rollback-master.opt +share/mysql-test/t/innodb_timeout_rollback.test share/mysql-test/t/innodb_unsafe_binlog-master.opt share/mysql-test/t/innodb_unsafe_binlog.test share/mysql-test/t/insert.test +share/mysql-test/t/insert_notembedded.test share/mysql-test/t/insert_select-binlog.test share/mysql-test/t/insert_select.test share/mysql-test/t/insert_update.test @@ -891,6 +933,7 @@ share/mysql-test/t/lock.test share/mysql-test/t/lock_multi.test share/mysql-test/t/lock_tables_lost_commit-master.opt share/mysql-test/t/lock_tables_lost_commit.test +share/mysql-test/t/log.sh share/mysql-test/t/lowercase_fs_off.test share/mysql-test/t/lowercase_table-master.opt share/mysql-test/t/lowercase_table.test @@ -918,8 +961,11 @@ share/mysql-test/t/mysql.test share/mysql-test/t/mysql_client_test.opt share/mysql-test/t/mysql_client_test.test share/mysql-test/t/mysql_delimiter.sql +share/mysql-test/t/mysql_delimiter_19799.sql share/mysql-test/t/mysql_delimiter_source.sql share/mysql-test/t/mysql_protocols.test +share/mysql-test/t/mysql_upgrade.test +share/mysql-test/t/mysqladmin.test share/mysql-test/t/mysqlbinlog-master.opt share/mysql-test/t/mysqlbinlog.test share/mysql-test/t/mysqlbinlog2.test @@ -982,6 +1028,8 @@ share/mysql-test/t/overflow.test share/mysql-test/t/packet.test share/mysql-test/t/perror.test share/mysql-test/t/preload.test +share/mysql-test/t/profiling.test +share/mysql-test/t/ps-master.opt share/mysql-test/t/ps.test share/mysql-test/t/ps_10nestset.test share/mysql-test/t/ps_11bugs.test @@ -1003,6 +1051,7 @@ share/mysql-test/t/rename.test share/mysql-test/t/repair.test share/mysql-test/t/replace.test share/mysql-test/t/rollback.test +share/mysql-test/t/round.test share/mysql-test/t/row.test share/mysql-test/t/rowid_order_bdb.test share/mysql-test/t/rowid_order_innodb.test @@ -1030,15 +1079,14 @@ share/mysql-test/t/rpl000017-slave.sh share/mysql-test/t/rpl000017.test share/mysql-test/t/rpl000018-master.opt share/mysql-test/t/rpl000018-slave.opt -share/mysql-test/t/rpl000018.test share/mysql-test/t/rpl_EE_error.test share/mysql-test/t/rpl_alter.test share/mysql-test/t/rpl_auto_increment-master.opt share/mysql-test/t/rpl_auto_increment.test share/mysql-test/t/rpl_auto_increment_11932.test -share/mysql-test/t/rpl_chain_temp_table.test share/mysql-test/t/rpl_change_master.test share/mysql-test/t/rpl_charset.test +share/mysql-test/t/rpl_charset_sjis.test share/mysql-test/t/rpl_commit_after_flush.test share/mysql-test/t/rpl_create_database-master.opt share/mysql-test/t/rpl_create_database-slave.opt @@ -1054,12 +1102,12 @@ share/mysql-test/t/rpl_drop_temp-slave.opt share/mysql-test/t/rpl_drop_temp.test share/mysql-test/t/rpl_dual_pos_advance-master.opt share/mysql-test/t/rpl_dual_pos_advance.test +share/mysql-test/t/rpl_empty_master_crash-master.opt share/mysql-test/t/rpl_empty_master_crash.test share/mysql-test/t/rpl_error_ignored_table-slave.opt share/mysql-test/t/rpl_error_ignored_table.test share/mysql-test/t/rpl_failed_optimize-master.opt share/mysql-test/t/rpl_failed_optimize.test -share/mysql-test/t/rpl_failsafe.test share/mysql-test/t/rpl_flush_log_loop-master.opt share/mysql-test/t/rpl_flush_log_loop-master.sh share/mysql-test/t/rpl_flush_log_loop-slave.opt @@ -1069,7 +1117,6 @@ share/mysql-test/t/rpl_flush_tables.test share/mysql-test/t/rpl_free_items-slave.opt share/mysql-test/t/rpl_free_items.test share/mysql-test/t/rpl_get_lock.test -share/mysql-test/t/rpl_heap.test share/mysql-test/t/rpl_ignore_grant-slave.opt share/mysql-test/t/rpl_ignore_grant.test share/mysql-test/t/rpl_ignore_revoke-slave.opt @@ -1090,6 +1137,7 @@ share/mysql-test/t/rpl_loaddata_rule_m.test share/mysql-test/t/rpl_loaddata_rule_s-slave.opt share/mysql-test/t/rpl_loaddata_rule_s.test share/mysql-test/t/rpl_loaddatalocal.test +share/mysql-test/t/rpl_locale.test share/mysql-test/t/rpl_log-master.opt share/mysql-test/t/rpl_log-slave.opt share/mysql-test/t/rpl_log.test @@ -1115,6 +1163,9 @@ share/mysql-test/t/rpl_ndb_innodb_trans-slave.opt share/mysql-test/t/rpl_ndb_innodb_trans.test share/mysql-test/t/rpl_openssl.test share/mysql-test/t/rpl_optimize.test +share/mysql-test/t/rpl_packet-master.opt +share/mysql-test/t/rpl_packet-slave.opt +share/mysql-test/t/rpl_packet.test share/mysql-test/t/rpl_ps.test share/mysql-test/t/rpl_redirect.test share/mysql-test/t/rpl_relayrotate-slave.opt @@ -1163,6 +1214,7 @@ share/mysql-test/t/schema.test share/mysql-test/t/select.test share/mysql-test/t/select_found.test share/mysql-test/t/select_safe.test +share/mysql-test/t/show_check-master.opt share/mysql-test/t/show_check.test share/mysql-test/t/skip_grants-master.opt share/mysql-test/t/skip_grants.test @@ -1179,10 +1231,14 @@ share/mysql-test/t/sp-threads.test share/mysql-test/t/sp-vars.test share/mysql-test/t/sp.test share/mysql-test/t/sp_notembedded.test +share/mysql-test/t/sp_stress_case.test share/mysql-test/t/sp_trans.test share/mysql-test/t/sql_mode.test share/mysql-test/t/ssl.test share/mysql-test/t/ssl_compress.test +share/mysql-test/t/ssl_connect.test +share/mysql-test/t/ssl_des-master.opt +share/mysql-test/t/ssl_des.test share/mysql-test/t/status.test share/mysql-test/t/strict.test share/mysql-test/t/strict_autoinc_1myisam.test @@ -1192,6 +1248,7 @@ share/mysql-test/t/strict_autoinc_4bdb.test share/mysql-test/t/strict_autoinc_5ndb.test share/mysql-test/t/subselect.test share/mysql-test/t/subselect2.test +share/mysql-test/t/subselect3.test share/mysql-test/t/subselect_gis.test share/mysql-test/t/subselect_innodb.test share/mysql-test/t/subselect_notembedded.test @@ -1202,8 +1259,10 @@ share/mysql-test/t/synchronization.test share/mysql-test/t/sysdate_is_now-master.opt share/mysql-test/t/sysdate_is_now.test share/mysql-test/t/system_mysql_db.test -share/mysql-test/t/system_mysql_db_fix-master.opt -share/mysql-test/t/system_mysql_db_fix.test +share/mysql-test/t/system_mysql_db_fix30020-master.opt +share/mysql-test/t/system_mysql_db_fix30020.test +share/mysql-test/t/system_mysql_db_fix40123-master.opt +share/mysql-test/t/system_mysql_db_fix40123.test share/mysql-test/t/system_mysql_db_refs.test share/mysql-test/t/tablelock.test share/mysql-test/t/temp_table-master.opt @@ -1213,6 +1272,8 @@ share/mysql-test/t/timezone.test share/mysql-test/t/timezone2.test share/mysql-test/t/timezone3-master.opt share/mysql-test/t/timezone3.test +share/mysql-test/t/timezone4-master.opt +share/mysql-test/t/timezone4.test share/mysql-test/t/timezone_grant.test share/mysql-test/t/trigger-compat.test share/mysql-test/t/trigger-grant.test @@ -1245,12 +1306,14 @@ share/mysql-test/t/update.test share/mysql-test/t/user_limits.test share/mysql-test/t/user_var-binlog.test share/mysql-test/t/user_var.test +share/mysql-test/t/utils.sh share/mysql-test/t/varbinary.test share/mysql-test/t/variables.test share/mysql-test/t/view.test share/mysql-test/t/view_grant.test share/mysql-test/t/view_query_cache.test share/mysql-test/t/wait_for_process.sh +share/mysql-test/t/wait_for_socket.sh share/mysql-test/t/wait_timeout-master.opt share/mysql-test/t/wait_timeout.test share/mysql-test/t/warnings-master.opt diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo index 954c8e1ea80..0865c72a7f0 100644 --- a/databases/mysql5-server/distinfo +++ b/databases/mysql5-server/distinfo @@ -1,21 +1,21 @@ -$NetBSD: distinfo,v 1.13 2006/12/10 04:12:17 xtraeme Exp $ +$NetBSD: distinfo,v 1.14 2007/03/11 18:42:49 adam Exp $ -SHA1 (mysql-5.0.27.tar.gz) = 656de9c03f07c2371f40277076ec2fc6eac51ec8 -RMD160 (mysql-5.0.27.tar.gz) = 3de75b959d04e002b2e4cfe322abdb48bf2f80fd -Size (mysql-5.0.27.tar.gz) = 25867740 bytes -SHA1 (patch-aa) = 82be9c02ebb483ac0fd2eac1e6e086d17b156794 -SHA1 (patch-ab) = 147f8afd19634e62d6a794b0b96f29ebfd920895 -SHA1 (patch-ac) = e75a01f7efe477060cb6e1639c9a7b68a832761d -SHA1 (patch-ad) = 36fb22fa10f2d379decf8e6fc86fc966472930e2 -SHA1 (patch-ae) = adc6956d4be304db61aa0323061143fffc1b9751 +SHA1 (mysql-5.0.37.tar.gz) = 7c957d4337156c7f98b0617fd5a63f3a838a9bc4 +RMD160 (mysql-5.0.37.tar.gz) = 132d3886a81fcec9be50cdc8d97c868928f5424f +Size (mysql-5.0.37.tar.gz) = 23239518 bytes +SHA1 (patch-aa) = 9dcc34093f425024755d32346524117d72f00943 +SHA1 (patch-ab) = d79d5eb4c9e8c939da4bf34e8d7f3f5a52e41a10 +SHA1 (patch-ac) = 22e2fe1a978eeeb03aa98afd24207c7719a6112c +SHA1 (patch-ad) = 2956a12d9a5a053fd5dd380f856475242e8c1199 +SHA1 (patch-ae) = dc67ad03f9ea370b17a45f73e974013e0ac48d71 SHA1 (patch-af) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec -SHA1 (patch-ag) = ec9e2465b14d16b0479427548a9a0150cbea78ac -SHA1 (patch-ah) = 81a8cdd4f3ebea640ee5fa75ab8884c452ed3cd7 -SHA1 (patch-ai) = 725a3a6e06d39b26efb706bebbe3ff95da82be96 -SHA1 (patch-aj) = c4e27a4332df3079891935fe963a86c2cbdced20 -SHA1 (patch-ak) = 516460b0aa9f641d74f83c5514f258a980033e41 -SHA1 (patch-al) = 6deee284643a474d5bc0674d149b49e36913fe12 -SHA1 (patch-am) = 999bb2dbca518a7e19a96b53678de35c0b227434 -SHA1 (patch-an) = a186d330698f1d6e178aacc8b91f942b41cdb878 -SHA1 (patch-ao) = c6c56cbff6fbb7ff809b9b544c28ea28fcd18517 -SHA1 (patch-bf) = c63133d40c2008ba57a968af693173a1fd97a927 +SHA1 (patch-ag) = 7c12975196f504c76954bfe92ffff0a98ba63019 +SHA1 (patch-ah) = b7002140ed0ebc24e5df5f92b1c0ceaf8e2a6211 +SHA1 (patch-ai) = c8ba7dfe00f37682e3f521314fe4225aa0b8e4a3 +SHA1 (patch-aj) = c3a0d3df30775e19017ca0835fbc15ea879b0c55 +SHA1 (patch-ak) = 2930b7fae228e02de593dd8deb083d373ca75e5a +SHA1 (patch-al) = 3b58ef9a835dc9cf39ff720516e5319d332f08f1 +SHA1 (patch-am) = 977d37ec5eba241bbad61481143de59e49b7892e +SHA1 (patch-an) = ec63621ba908b9da9e1d6dacba9a7894c21e9f5b +SHA1 (patch-ao) = 235f7d6bfdf609abf14441b1432b00dc5744fed8 +SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299 diff --git a/databases/mysql5-server/patches/patch-aa b/databases/mysql5-server/patches/patch-aa index 0d3c787ef1b..05504a2dc51 100644 --- a/databases/mysql5-server/patches/patch-aa +++ b/databases/mysql5-server/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2006/10/14 18:41:34 xtraeme Exp $ +$NetBSD: patch-aa,v 1.4 2007/03/11 18:42:49 adam Exp $ ---- Makefile.in.orig 2006-10-14 19:47:57.000000000 +0200 -+++ Makefile.in 2006-10-14 19:48:09.000000000 +0200 -@@ -370,12 +370,8 @@ +--- Makefile.in.orig 2007-03-05 20:23:25.000000000 +0100 ++++ Makefile.in +@@ -372,12 +372,8 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ README COPYING EXCEPTIONS-CLIENT CMakeLists.txt diff --git a/databases/mysql5-server/patches/patch-ab b/databases/mysql5-server/patches/patch-ab index bdf83f77a54..fce429272ff 100644 --- a/databases/mysql5-server/patches/patch-ab +++ b/databases/mysql5-server/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.3 2006/10/14 18:41:34 xtraeme Exp $ +$NetBSD: patch-ab,v 1.4 2007/03/11 18:42:49 adam Exp $ ---- tests/Makefile.in.orig 2006-10-14 19:48:42.000000000 +0200 -+++ tests/Makefile.in 2006-10-14 19:49:16.000000000 +0200 -@@ -99,7 +99,7 @@ +--- tests/Makefile.in.orig 2007-03-05 20:23:23.000000000 +0100 ++++ tests/Makefile.in +@@ -93,7 +93,7 @@ insert_test_LDADD = $(LDADD) am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \ - $(am__objects_1) my_memmem.$(OBJEXT) + my_memmem.$(OBJEXT) mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/libmysql/libmysqlclient.la +am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) -@@ -111,7 +111,7 @@ +@@ -103,7 +103,7 @@ select_test_LDADD = $(LDADD) thread_test_SOURCES = thread_test.c thread_test_OBJECTS = thread_test.$(OBJEXT) thread_test_LDADD = $(LDADD) @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2006/10/14 18:41:34 xtraeme Exp $ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -416,8 +416,7 @@ +@@ -397,8 +397,7 @@ EXTRA_DIST = auto_increment.res auto_inc INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) @@ -29,4 +29,4 @@ $NetBSD: patch-ab,v 1.3 2006/10/14 18:41:34 xtraeme Exp $ +LDADD = @CLIENT_EXTRA_LDFLAGS@ -lmysqlclient mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS) - mysql_client_test_SOURCES = mysql_client_test.c $(yassl_dummy_link_fix) \ + mysql_client_test_SOURCES = mysql_client_test.c\ diff --git a/databases/mysql5-server/patches/patch-ac b/databases/mysql5-server/patches/patch-ac index 17d4508e0dd..c8da422b493 100644 --- a/databases/mysql5-server/patches/patch-ac +++ b/databases/mysql5-server/patches/patch-ac @@ -1,17 +1,17 @@ -$NetBSD: patch-ac,v 1.4 2006/10/14 18:41:34 xtraeme Exp $ +$NetBSD: patch-ac,v 1.5 2007/03/11 18:42:49 adam Exp $ ---- mysql-test/Makefile.in.orig 2006-10-14 19:50:21.000000000 +0200 -+++ mysql-test/Makefile.in 2006-10-14 19:51:30.000000000 +0200 -@@ -389,7 +389,7 @@ +--- mysql-test/Makefile.in.orig 2007-03-05 20:22:56.000000000 +0100 ++++ mysql-test/Makefile.in +@@ -374,7 +374,7 @@ zlib_dir = @zlib_dir@ @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\" @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\" benchdir_root = $(prefix) -testdir = $(benchdir_root)/mysql-test +testdir = $(benchdir_root)/share/mysql-test - EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS) - EXTRA_DIST = $(EXTRA_SCRIPTS) - GENSCRIPTS = mysql-test-run install_test_db mtr -@@ -820,12 +820,11 @@ + EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS) + EXTRA_DIST = $(EXTRA_SCRIPTS) + GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr +@@ -770,12 +770,11 @@ dist-hook: $(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib install-data-local: diff --git a/databases/mysql5-server/patches/patch-ad b/databases/mysql5-server/patches/patch-ad index 0f1603af9b9..59a5744ad6d 100644 --- a/databases/mysql5-server/patches/patch-ad +++ b/databases/mysql5-server/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ +$NetBSD: patch-ad,v 1.2 2007/03/11 18:42:49 adam Exp $ ---- sql/mysqld.cc.orig 2005-10-17 03:27:30.000000000 +0200 -+++ sql/mysqld.cc 2005-10-31 09:57:13.000000000 +0100 -@@ -171,7 +171,7 @@ +--- sql/mysqld.cc.orig 2007-03-05 20:21:11.000000000 +0100 ++++ sql/mysqld.cc +@@ -171,7 +171,7 @@ static void getvolumeID(BYTE *volumeName int initgroups(const char *,unsigned int); #endif @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ #include <ieeefp.h> #ifdef HAVE_FP_EXCEPT // Fix type conflict typedef fp_except fp_except_t; -@@ -3276,7 +3276,7 @@ +@@ -3431,7 +3431,7 @@ int main(int argc, char **argv) init_ssl(); #ifdef HAVE_LIBWRAP diff --git a/databases/mysql5-server/patches/patch-ae b/databases/mysql5-server/patches/patch-ae index 7545d80c591..85d8a80ff69 100644 --- a/databases/mysql5-server/patches/patch-ae +++ b/databases/mysql5-server/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ +$NetBSD: patch-ae,v 1.2 2007/03/11 18:42:49 adam Exp $ ---- mysys/my_gethwaddr.c.orig 2005-10-14 10:21:10.000000000 +0000 +--- mysys/my_gethwaddr.c.orig 2007-03-05 20:21:11.000000000 +0100 +++ mysys/my_gethwaddr.c -@@ -31,7 +31,7 @@ static my_bool memcpy_and_test(uchar *to +@@ -30,7 +30,7 @@ static my_bool memcpy_and_test(uchar *to return res; } diff --git a/databases/mysql5-server/patches/patch-ag b/databases/mysql5-server/patches/patch-ag index ca41472f5ea..30404561ceb 100644 --- a/databases/mysql5-server/patches/patch-ag +++ b/databases/mysql5-server/patches/patch-ag @@ -1,13 +1,13 @@ -$NetBSD: patch-ag,v 1.5 2006/10/14 18:41:34 xtraeme Exp $ +$NetBSD: patch-ag,v 1.6 2007/03/11 18:42:49 adam Exp $ ---- man/Makefile.in.orig 2006-10-04 13:25:43.000000000 +0200 -+++ man/Makefile.in 2006-10-14 20:17:36.000000000 +0200 -@@ -344,7 +344,7 @@ +--- man/Makefile.in.orig 2007-03-05 20:22:54.000000000 +0100 ++++ man/Makefile.in +@@ -348,7 +348,7 @@ yassl_h_ln_cmd = @yassl_h_ln_cmd@ yassl_libs = @yassl_libs@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ zlib_dir = @zlib_dir@ -man1_MANS = @man1_files@ -+man1_MANS = mysqld.1 mysqld_multi.1 ++man1_MANS = mysqld_multi.1 man8_MANS = @man8_files@ EXTRA_DIST = $(man1_MANS) $(man8_MANS) all: all-am diff --git a/databases/mysql5-server/patches/patch-ah b/databases/mysql5-server/patches/patch-ah index c1a061c57cf..8a05691d7a6 100644 --- a/databases/mysql5-server/patches/patch-ah +++ b/databases/mysql5-server/patches/patch-ah @@ -1,20 +1,19 @@ -$NetBSD: patch-ah,v 1.3 2006/01/09 16:25:01 xtraeme Exp $ +$NetBSD: patch-ah,v 1.4 2007/03/11 18:42:49 adam Exp $ ---- include/Makefile.in.orig 2006-01-09 16:47:58.000000000 +0100 -+++ include/Makefile.in 2006-01-09 16:48:13.000000000 +0100 -@@ -343,14 +343,7 @@ - yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ - zlib_dir = @zlib_dir@ - BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h --pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ -- mysql.h mysql_com.h mysql_embed.h \ -- my_semaphore.h my_pthread.h my_no_pthread.h raid.h \ -- errmsg.h my_global.h my_net.h my_alloc.h \ -- my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ +--- include/Makefile.in.orig 2007-03-05 20:22:51.000000000 +0100 ++++ include/Makefile.in +@@ -362,13 +362,7 @@ HEADERS_GEN = mysql_version.h my_config. + HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ + my_list.h my_alloc.h typelib.h + +-pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ +- my_xml.h mysql_embed.h \ +- my_semaphore.h my_pthread.h my_no_pthread.h raid.h \ +- errmsg.h my_global.h my_net.h \ +- my_getopt.h sslopt-longopts.h my_dir.h \ - sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ -- mysql_time.h $(BUILT_SOURCES) -- +- m_ctype.h $(HEADERS_GEN) +pkginclude_HEADERS = + noinst_HEADERS = config-win.h config-os2.h config-netware.h \ heap.h my_bitmap.h\ - myisam.h myisampack.h myisammrg.h ft_global.h\ diff --git a/databases/mysql5-server/patches/patch-ai b/databases/mysql5-server/patches/patch-ai index 82c7c4cdc5d..1ee4fd0978e 100644 --- a/databases/mysql5-server/patches/patch-ai +++ b/databases/mysql5-server/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ +$NetBSD: patch-ai,v 1.2 2007/03/11 18:42:49 adam Exp $ ---- include/my_pthread.h.orig 2003-12-14 21:23:47.000000000 +0000 -+++ include/my_pthread.h 2003-12-20 12:09:31.000000000 +0000 -@@ -19,7 +19,13 @@ +--- include/my_pthread.h.orig 2007-03-05 20:21:12.000000000 +0100 ++++ include/my_pthread.h +@@ -18,7 +18,13 @@ #ifndef _my_pthread_h #define _my_pthread_h @@ -16,7 +16,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ #ifndef ETIME #define ETIME ETIMEDOUT /* For FreeBSD */ #endif -@@ -301,7 +307,11 @@ +@@ -338,7 +344,11 @@ int sigwait(sigset_t *set, int *sig); #endif #ifndef HAVE_NONPOSIX_SIGWAIT diff --git a/databases/mysql5-server/patches/patch-aj b/databases/mysql5-server/patches/patch-aj index 4b21020e764..37613199cef 100644 --- a/databases/mysql5-server/patches/patch-aj +++ b/databases/mysql5-server/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $ +$NetBSD: patch-aj,v 1.3 2007/03/11 18:42:50 adam Exp $ ---- scripts/mysqld_safe.sh.orig 2006-10-14 19:56:04.000000000 +0200 -+++ scripts/mysqld_safe.sh 2006-10-14 19:59:48.000000000 +0200 -@@ -330,6 +330,14 @@ +--- scripts/mysqld_safe.sh.orig 2007-03-05 20:21:13.000000000 +0100 ++++ scripts/mysqld_safe.sh +@@ -331,6 +331,14 @@ then ulimit -c $core_file_size fi @@ -17,7 +17,7 @@ $NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $ # # If there exists an old pid file, check if the daemon is already running # Note: The switches to 'ps' may depend on your operating system -@@ -340,18 +348,16 @@ +@@ -341,18 +349,16 @@ then then if @FIND_PROC@ then # The pid contains a mysqld process @@ -40,7 +40,7 @@ $NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $ exit 1 fi fi -@@ -364,11 +370,11 @@ +@@ -365,11 +371,11 @@ fi # Alternatively, you can start mysqld with the "myisam-recover" option. See # the manual for details. # @@ -54,7 +54,7 @@ $NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $ # Does this work on all systems? #if type ulimit | grep "shell builtin" > /dev/null -@@ -376,7 +382,7 @@ +@@ -377,7 +383,7 @@ echo "Starting $MYSQLD daemon with datab # ulimit -n 256 > /dev/null 2>&1 # Fix for BSD and FreeBSD systems #fi @@ -63,7 +63,7 @@ $NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $ while true do rm -f $safe_mysql_unix_port $pid_file # Some extra safety -@@ -388,7 +394,7 @@ +@@ -389,7 +395,7 @@ do fi if test ! -f $pid_file # This is removed if normal shutdown then @@ -72,7 +72,7 @@ $NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $ break fi -@@ -401,7 +407,7 @@ +@@ -402,7 +408,7 @@ do # kill -9 is used or the process won't react on the kill. numofproces=`ps xaww | grep -v "grep" | grep "$ledir/$MYSQLD\>" | grep -c "pid-file=$pid_file"` @@ -81,7 +81,7 @@ $NetBSD: patch-aj,v 1.2 2006/10/14 18:41:34 xtraeme Exp $ I=1 while test "$I" -le "$numofproces" do -@@ -414,16 +420,14 @@ +@@ -415,16 +421,14 @@ do # echo "TEST $I - $T **" if kill -9 $T then diff --git a/databases/mysql5-server/patches/patch-ak b/databases/mysql5-server/patches/patch-ak index 61a880cbaca..4a21ef03772 100644 --- a/databases/mysql5-server/patches/patch-ak +++ b/databases/mysql5-server/patches/patch-ak @@ -1,16 +1,16 @@ -$NetBSD: patch-ak,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $ +$NetBSD: patch-ak,v 1.2 2007/03/11 18:42:50 adam Exp $ ---- support-files/Makefile.in.orig 2005-09-27 00:00:34.000000000 +0200 -+++ support-files/Makefile.in 2005-09-27 00:00:57.000000000 +0200 -@@ -345,14 +345,7 @@ +--- support-files/Makefile.in.orig 2007-03-05 20:23:22.000000000 +0100 ++++ support-files/Makefile.in +@@ -379,14 +379,7 @@ EXTRA_DIST = mysql.spec.sh \ ndb-config-2-node.ini.sh - SUBDIRS = MacOSX + SUBDIRS = MacOSX RHEL4-SElinux -pkgdata_DATA = my-small.cnf \ - my-medium.cnf \ - my-large.cnf \ - my-huge.cnf \ -- my-innodb-heavy-4G.cnf \ +- my-innodb-heavy-4G.cnf \ - mysql-log-rotate \ - binary-configure \ - ndb-config-2-node.ini diff --git a/databases/mysql5-server/patches/patch-al b/databases/mysql5-server/patches/patch-al index 0985afee7f1..7b96ff49296 100644 --- a/databases/mysql5-server/patches/patch-al +++ b/databases/mysql5-server/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.2 2006/05/18 16:11:15 cube Exp $ +$NetBSD: patch-al,v 1.3 2007/03/11 18:42:50 adam Exp $ ---- myisam/Makefile.in.orig 2006-04-26 20:31:56.000000000 +0200 +--- myisam/Makefile.in.orig 2007-03-05 20:22:55.000000000 +0100 +++ myisam/Makefile.in -@@ -157,7 +157,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD +@@ -156,7 +156,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) diff --git a/databases/mysql5-server/patches/patch-am b/databases/mysql5-server/patches/patch-am index bd99b0b84d9..9c4b08489cd 100644 --- a/databases/mysql5-server/patches/patch-am +++ b/databases/mysql5-server/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.1 2006/01/08 17:43:58 xtraeme Exp $ +$NetBSD: patch-am,v 1.2 2007/03/11 18:42:50 adam Exp $ ---- extra/Makefile.in.orig 2006-01-08 18:36:49.000000000 +0100 -+++ extra/Makefile.in 2006-01-08 18:37:00.000000000 +0100 -@@ -431,9 +431,7 @@ +--- extra/Makefile.in.orig 2007-03-05 20:22:41.000000000 +0100 ++++ extra/Makefile.in +@@ -434,9 +434,7 @@ INCLUDES = -I$(top_builddir)/include -I$ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ ../dbug/libdbug.a ../strings/libmystrings.a @@ -12,4 +12,4 @@ $NetBSD: patch-am,v 1.1 2006/01/08 17:43:58 xtraeme Exp $ +BUILT_SOURCES = pkginclude_HEADERS = $(BUILT_SOURCES) - CLEANFILES = $(BUILT_SOURCES) + DISTCLEANFILES = $(BUILT_SOURCES) diff --git a/databases/mysql5-server/patches/patch-an b/databases/mysql5-server/patches/patch-an index a41c60a0607..9c7a7dd1772 100644 --- a/databases/mysql5-server/patches/patch-an +++ b/databases/mysql5-server/patches/patch-an @@ -1,10 +1,8 @@ -$NetBSD: patch-an,v 1.1 2006/10/14 18:41:34 xtraeme Exp $ +$NetBSD: patch-an,v 1.2 2007/03/11 18:42:50 adam Exp $ -Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4 - ---- configure.in.orig 2006-10-14 18:56:35.000000000 +0200 -+++ configure.in 2006-10-14 18:58:41.000000000 +0200 -@@ -475,7 +475,7 @@ +--- configure.in.orig 2007-03-05 20:21:13.000000000 +0100 ++++ configure.in +@@ -487,7 +487,7 @@ then FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null" else case $SYSTEM_TYPE in @@ -13,7 +11,7 @@ Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4 FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null" ;; *darwin*) -@@ -752,6 +752,8 @@ +@@ -794,6 +794,8 @@ AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(H # For sem_xxx functions on Solaris 2.6 AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init)) @@ -22,7 +20,7 @@ Patch reported: http://bugs.mysql.com/bug.php?id=23294&thanks=4 MYSQL_CHECK_ZLIB_WITH_COMPRESS # For large pages support -@@ -1077,7 +1079,7 @@ +@@ -1119,7 +1121,7 @@ case $SYSTEM_TYPE in MAX_C_OPTIMIZE="-O" fi ;; diff --git a/databases/mysql5-server/patches/patch-ao b/databases/mysql5-server/patches/patch-ao index ce93f87d60d..0779dcec2e2 100644 --- a/databases/mysql5-server/patches/patch-ao +++ b/databases/mysql5-server/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.1 2006/04/17 11:21:41 tron Exp $ +$NetBSD: patch-ao,v 1.2 2007/03/11 18:42:50 adam Exp $ ---- sql/sql_lex.cc.orig 2006-03-31 18:10:45.000000000 +0100 -+++ sql/sql_lex.cc 2006-04-17 12:09:26.000000000 +0100 -@@ -960,6 +960,9 @@ +--- sql/sql_lex.cc.orig 2007-03-05 20:21:11.000000000 +0100 ++++ sql/sql_lex.cc +@@ -931,6 +931,9 @@ int MYSQLlex(void *arg, void *yythd) while (lex->ptr != lex->end_of_query && ((c=yyGet()) != '*' || yyPeek() != '/')) { diff --git a/databases/mysql5-server/patches/patch-bf b/databases/mysql5-server/patches/patch-bf index 78b8659f30a..213259fc610 100644 --- a/databases/mysql5-server/patches/patch-bf +++ b/databases/mysql5-server/patches/patch-bf @@ -1,8 +1,8 @@ -$NetBSD: patch-bf,v 1.1 2006/10/14 18:41:34 xtraeme Exp $ +$NetBSD: patch-bf,v 1.2 2007/03/11 18:42:50 adam Exp $ ---- bdb/dist/configure.orig 2006-10-08 15:25:31.000000000 +0200 -+++ bdb/dist/configure 2006-10-08 15:26:39.000000000 +0200 -@@ -5038,7 +5038,7 @@ fi +--- bdb/dist/configure.orig 2007-03-05 20:23:33.000000000 +0100 ++++ bdb/dist/configure +@@ -5039,7 +5039,7 @@ fi # we're using. case "$host_os" in sysv5UnixWare*|sysv5OpenUNIX8*) |