diff options
author | taca <taca@pkgsrc.org> | 2010-03-04 16:27:18 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2010-03-04 16:27:18 +0000 |
commit | 94c5eb84de81ae60f2e1bcb7a0e1da7bc4d84d51 (patch) | |
tree | e5e648de2bf32abae3656a6452087b105ba08e02 /databases | |
parent | 846df9d28ef229a8fe117fdcd6dd49ea4b88e3b5 (diff) | |
download | pkgsrc-94c5eb84de81ae60f2e1bcb7a0e1da7bc4d84d51.tar.gz |
Importing mysql51-client 5.1.44, client part of MySQL 5.1.44.
For release MySQL 5.1 specific information please refer:
http://dev.mysql.com/doc/refman/5.1/en/mysql-nutshell.html
MySQL is a SQL (Structured Query Language) database server. SQL is the
most popular database language in the world. MySQL is a client-server
implementation that consists of a server daemon `mysqld' and many
different client programs/libraries.
The main goals of MySQL are speed and robustness.
The base upon which MySQL is built is a set of routines that have been
used in a highly demanding production environment for many years. While
MySQL is still in development it already offers a rich and highly useful
function set.
The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL).
This package contains the MySQL client programs and libraries.
Diffstat (limited to 'databases')
33 files changed, 761 insertions, 0 deletions
diff --git a/databases/mysql51-client/DESCR b/databases/mysql51-client/DESCR new file mode 100644 index 00000000000..23500c3f7ba --- /dev/null +++ b/databases/mysql51-client/DESCR @@ -0,0 +1,15 @@ +MySQL is a SQL (Structured Query Language) database server. SQL is the +most popular database language in the world. MySQL is a client-server +implementation that consists of a server daemon `mysqld' and many +different client programs/libraries. + +The main goals of MySQL are speed and robustness. + +The base upon which MySQL is built is a set of routines that have been +used in a highly demanding production environment for many years. While +MySQL is still in development it already offers a rich and highly useful +function set. + +The official way to pronounce 'MySQL' is 'My Ess Que Ell' (Not MY-SEQUEL). + +This package contains the MySQL client programs and libraries. diff --git a/databases/mysql51-client/MESSAGE b/databases/mysql51-client/MESSAGE new file mode 100644 index 00000000000..2c60bf4d662 --- /dev/null +++ b/databases/mysql51-client/MESSAGE @@ -0,0 +1,10 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +To use the ``mysqlhotcopy'' script, you'll have to install the following +packages: + + databases/p5-DBD-mysql + devel/p5-File-Temp + +=========================================================================== diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile new file mode 100644 index 00000000000..9044317c04e --- /dev/null +++ b/databases/mysql51-client/Makefile @@ -0,0 +1,42 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +PKGNAME= ${DISTNAME:S/-/-client-/} +SVR4_PKGNAME= mysqc +COMMENT= MySQL 5, a free SQL database (client) + +CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} + +PKG_DESTDIR_SUPPORT= user-destdir + +.include "Makefile.common" + +CONFIGURE_ARGS+= --without-extra-tools +CONFIGURE_ARGS+= --without-server +CONFIGURE_ARGS+= --enable-thread-safe-client +UNWRAP_FILES+= scripts/mysql_config +INFO_FILES= yes + +AUTO_MKDIRS= yes + +REPLACE_PERL= scripts/mysql_convert_table_format.sh \ + scripts/mysql_find_rows.sh \ + scripts/mysql_fix_extensions.sh \ + scripts/mysql_fix_privilege_tables.sh \ + scripts/mysql_setpermission.sh \ + scripts/mysql_zap.sh \ + scripts/mysqlaccess.sh \ + scripts/mysqldumpslow.sh \ + scripts/mysqlhotcopy.sh + +post-install: + cd ${WRKSRC}; for f in mysql.info mysql.info-[0-9]*; do \ + ${TEST} ! -f "$$f" || \ + ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};\ + done +.for f in huge large innodb-heavy-4G small medium + ${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \ + ${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf +.endfor + +.include "../../devel/readline/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql51-client/Makefile.common b/databases/mysql51-client/Makefile.common new file mode 100644 index 00000000000..50c57fd6953 --- /dev/null +++ b/databases/mysql51-client/Makefile.common @@ -0,0 +1,131 @@ +# $NetBSD: Makefile.common,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ +# +# used by databases/mysql51-client/Makefile +# used by databases/mysql51-server/Makefile +# + +DISTNAME= mysql-5.1.44 +CATEGORIES= databases +MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.1/} + +MAINTAINER= sketch@NetBSD.org +HOMEPAGE= http://www.mysql.com/ +LICENSE= gnu-gpl-v2 + +USE_LIBTOOL= yes +GNU_CONFIGURE= yes + +.include "../../mk/bsd.prefs.mk" +.include "options.mk" + +EXTRACT_USING= bsdtar + +# MYSQL_USER username of the database administrator +# MYSQL_GROUP group of the database administrator +# MYSQL_DATADIR home directory of the database administrator and +# location of the databases +MYSQL_USER?= mysql +MYSQL_GROUP?= mysql +MYSQL_DATADIR?= ${VARBASE}/mysql + +PKG_USERS_VARS+= MYSQL_USER +PKG_GROUPS_VARS+= MYSQL_GROUP + +# MYSQL_CHARSET default character set +# MYSQL_EXTRA_CHARSET additional character set to be compiled in. +# +MYSQL_CHARSET?= latin1 +MYSQL_EXTRA_CHARSET?= all + +CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q} +CONFIGURE_ARGS+= --with-named-z-libs=z +CONFIGURE_ARGS+= --without-libwrap +CONFIG_SHELL= ${TOOLS_PATH.bash} + +.if ${OPSYS} == "IRIX" +CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H +# libgen is incorrectly detected +CONFIGURE_ENV+= ac_cv_lib_gen_p2open="no" +.endif + +BUILD_DEFS+= VARBASE + +# We always use our own readline. Note that these --without-* settings +# are confusing, but they just mean "don't use the included readline +# or libedit". +# +CONFIGURE_ARGS+= --without-readline +CONFIGURE_ARGS+= --without-libedit + +# Speed up production one-time builds; see "./configure --help" for +# more information on using or disabling this option. +CONFIGURE_ARGS+= --disable-dependency-tracking + +CONFIGURE_ARGS+= --without-debug +CONFIGURE_ARGS+= --without-bench +CONFIGURE_ARGS+= --with-low-memory +CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_PREFIX.zlib:Q} +CONFIGURE_ARGS+= --with-vio + +CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q} +CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q} + +.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" && \ + ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin" +CONFIGURE_ARGS+= --enable-assembler +.endif + +CONFIGURE_ENV+= mysql_cv_compress="yes" + +CPPFLAGS+= -Dunix +CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat + +# force HAVE_CURSES_H on Solaris since the configure script is broken +# and does not properly detect this, breaking the build later on. +.if ${OPSYS} == "SunOS" +CFLAGS+= -DHAVE_CURSES_H +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_TOOLS+= autoconf bash autoheader gmake perl:run +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql + +SUBST_CLASSES= mk +SUBST_STAGE.mk= pre-configure +SUBST_FILES.mk= dbug/Makefile.in heap/Makefile.in \ + mysys/Makefile.in strings/Makefile.in +SUBST_SED.mk= -e "/^install-exec:/s/install-pkglibLIBRARIES//" +SUBST_MESSAGE.mk= Fixing Makefiles. + +SUBST_CLASSES+= scr +SUBST_STAGE.scr= pre-configure +SUBST_FILES.scr= scripts/mysql_install_db.sh scripts/mysqld_safe.sh \ + scripts/mysql_secure_installation.sh \ + support-files/mysql.server.sh +SUBST_SED.scr= -e "s,chown,${CHOWN},g" +SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" +SUBST_MESSAGE.scr= Fixing scripts. + +# Fix broken shared library detection under Mac OS X +.if ${OPSYS} == "Darwin" +SUBST_CLASSES+= dylib +SUBST_STAGE.dylib= pre-configure +SUBST_FILES.dylib= configure +SUBST_SED.dylib= -e "s|\\\$$shrext_cmds|\\.dylib|g" +.endif + +pre-configure: + ${RM} -f ${WRKSRC}/configure~ + cd ${WRKSRC} && autoconf && autoheader + +.include "../../devel/zlib/buildlink3.mk" diff --git a/databases/mysql51-client/PLIST b/databases/mysql51-client/PLIST new file mode 100644 index 00000000000..6f5d96967d7 --- /dev/null +++ b/databases/mysql51-client/PLIST @@ -0,0 +1,76 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ +bin/msql2mysql +bin/mysql +bin/mysql_config +bin/mysql_convert_table_format +bin/mysql_find_rows +bin/mysql_fix_extensions +bin/mysql_fix_privilege_tables +bin/mysql_setpermission +bin/mysql_upgrade +bin/mysql_zap +bin/mysqlaccess +bin/mysqladmin +bin/mysqlbinlog +bin/mysqlbug +bin/mysqlcheck +bin/mysqldump +bin/mysqldumpslow +bin/mysqlhotcopy +bin/mysqlimport +bin/mysqlshow +bin/mysqlslap +bin/mysqltest +include/mysql/decimal.h +include/mysql/errmsg.h +include/mysql/keycache.h +include/mysql/m_ctype.h +include/mysql/m_string.h +include/mysql/my_alloc.h +include/mysql/my_attribute.h +include/mysql/my_config.h +include/mysql/my_dbug.h +include/mysql/my_dir.h +include/mysql/my_getopt.h +include/mysql/my_global.h +include/mysql/my_list.h +include/mysql/my_net.h +include/mysql/my_no_pthread.h +include/mysql/my_pthread.h +include/mysql/my_sys.h +include/mysql/my_xml.h +include/mysql/mysql.h +include/mysql/mysql_com.h +include/mysql/mysql_embed.h +include/mysql/mysql_time.h +include/mysql/mysql_version.h +include/mysql/mysqld_ername.h +include/mysql/mysqld_error.h +include/mysql/plugin.h +include/mysql/sql_common.h +include/mysql/sql_state.h +include/mysql/sslopt-case.h +include/mysql/sslopt-longopts.h +include/mysql/sslopt-vars.h +include/mysql/typelib.h +info/mysql.info +lib/mysql/libmysqlclient.la +lib/mysql/libmysqlclient_r.la +man/man1/mysql.1 +man/man1/mysql_fix_privilege_tables.1 +man/man1/mysql_zap.1 +man/man1/mysqlaccess.1 +man/man1/mysqladmin.1 +man/man1/mysqldump.1 +man/man1/mysqlshow.1 +share/examples/mysql/my-huge.cnf +share/examples/mysql/my-innodb-heavy-4G.cnf +share/examples/mysql/my-large.cnf +share/examples/mysql/my-medium.cnf +share/examples/mysql/my-small.cnf +share/mysql/ChangeLog +share/mysql/fill_help_tables.sql +share/mysql/mysql_fix_privilege_tables.sql +share/mysql/mysql_system_tables.sql +share/mysql/mysql_system_tables_data.sql +share/mysql/mysql_test_data_timezone.sql diff --git a/databases/mysql51-client/buildlink3.mk b/databases/mysql51-client/buildlink3.mk new file mode 100644 index 00000000000..d4897d33201 --- /dev/null +++ b/databases/mysql51-client/buildlink3.mk @@ -0,0 +1,18 @@ +# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +BUILDLINK_TREE+= mysql-client + +.if !defined(MYSQL_CLIENT_BUILDLINK3_MK) +MYSQL_CLIENT_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.mysql-client+= mysql-client>=5.1.44 +BUILDLINK_ABI_DEPENDS.mysql-client+= mysql-client>=5.1.44 +BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql51-client +BUILDLINK_LIBDIRS.mysql-client?= lib/mysql +BUILDLINK_INCDIRS.mysql-client?= include/mysql + +.include "../../security/openssl/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.endif # MYSQL_CLIENT_BUILDLINK3_MK + +BUILDLINK_TREE+= -mysql-client diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo new file mode 100644 index 00000000000..329c0617143 --- /dev/null +++ b/databases/mysql51-client/distinfo @@ -0,0 +1,30 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +SHA1 (mysql-5.1.44.tar.gz) = 265fbca02b2ef62926e2845d5fdf394298eb3206 +RMD160 (mysql-5.1.44.tar.gz) = f98d25322893b422ee708d683ee73ec9e17ad40a +Size (mysql-5.1.44.tar.gz) = 23400457 bytes +SHA1 (patch-aa) = 2a5321738e637a56e57cd6b1b40908d2bf275506 +SHA1 (patch-ab) = 8bbbb84d659810031162475917ec233951c67ca4 +SHA1 (patch-ac) = 5d5f1b67eb96254b821cf4a3e99eec26dd703bf6 +SHA1 (patch-ad) = 4e98f696b8b5098456e53a8de710a6bcd547997c +SHA1 (patch-ae) = c74481e5856cbd73662495630c73baec93586e9b +SHA1 (patch-af) = 399a55ac369831757fad5aec4dbd8b76050276e4 +SHA1 (patch-ag) = bfb6eec77d7c5aa8d2b849632769005dcf2e272c +SHA1 (patch-ah) = 5fd4db0e04a97289f38a5467bbae5041f4082b51 +SHA1 (patch-ai) = 722364e59070ab2d3377a694698f32bf25427bf2 +SHA1 (patch-aj) = 476384877154dd8d2465c6c9a0e411c220d405e4 +SHA1 (patch-ak) = 5dd0982e9c9b2d0199a3a148a12a4dd219533e9d +SHA1 (patch-al) = 93ba34d66fd054fbcf9e1eb3a042770d4d6820ec +SHA1 (patch-am) = 7cced70246776a64e782e0c7d335d5948a2189f1 +SHA1 (patch-an) = a608060cee7aadaf8bcde84016a73131a75dea32 +SHA1 (patch-ao) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a +SHA1 (patch-ap) = 88dd29051ee68775cf15f3618a16c4f994e5e104 +SHA1 (patch-aq) = d04016a2ab84709aee0c08aef71c2f79e82fc6f3 +SHA1 (patch-ar) = bc0e2083ec285be8adac1027e63bf076e4c57211 +SHA1 (patch-as) = 5eb3a9308b13a25fa813db0ed4a06f8e43db74f6 +SHA1 (patch-at) = 241049f78ed4aa51497c1ebac4acea75efb0da03 +SHA1 (patch-au) = b177ebba44026ebd6ad5683f81875544c6f8746d +SHA1 (patch-av) = 8b5eb4b6535f1acb4e64496cd1228107895741a1 +SHA1 (patch-aw) = 96b2078f40a57ec5377f551b1c756473c684612e +SHA1 (patch-ax) = 390debbc31e710f5aa41fda6a8b1134a14a2ff23 +SHA1 (patch-ay) = 857758885a24d72ceb206475474b4f395543cb8e diff --git a/databases/mysql51-client/options.mk b/databases/mysql51-client/options.mk new file mode 100644 index 00000000000..d22a9222850 --- /dev/null +++ b/databases/mysql51-client/options.mk @@ -0,0 +1,28 @@ +# $NetBSD: options.mk,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.mysql5 + +PKG_SUPPORTED_OPTIONS+= embedded-server ssl +#PKG_SUGGESTED_OPTIONS+= embedded-server ssl +PKG_SUGGESTED_OPTIONS+= ssl + +.include "../../mk/bsd.options.mk" + +### +### Enable OpenSSL support +### +.if !empty(PKG_OPTIONS:Mssl) +. include "../../security/openssl/buildlink3.mk" +. if ${OPSYS} == "SunOS" +CHECK_BUILTIN.openssl:=yes +. include "../../security/openssl/builtin.mk" +CHECK_BUILTIN.openssl:=no +. if ${USE_BUILTIN.openssl} == "yes" +CONFIGURE_ARGS+= --with-ssl=yes +. endif +. else +CONFIGURE_ARGS+= --with-ssl=yes +. endif +.else +CONFIGURE_ARGS+= --without-ssl +.endif diff --git a/databases/mysql51-client/patches/patch-aa b/databases/mysql51-client/patches/patch-aa new file mode 100644 index 00000000000..751fe99f86d --- /dev/null +++ b/databases/mysql51-client/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- BUILD/compile-pentium-gcov.orig 2010-02-04 11:36:48.000000000 +0000 ++++ BUILD/compile-pentium-gcov +@@ -7,7 +7,7 @@ CCACHE_GCOV_VERSION_ENABLED=0 + if ccache -V > /dev/null 2>&1 + then + CCACHE_VER=`ccache -V | head -1 | sed s/"ccache version "//` +- if test "$CCACHE_VER" == "2.4-gcov" ++ if test "$CCACHE_VER" = "2.4-gcov" + then + CCACHE_GCOV_VERSION_ENABLED=1 + else diff --git a/databases/mysql51-client/patches/patch-ab b/databases/mysql51-client/patches/patch-ab new file mode 100644 index 00000000000..5d5fbdd968a --- /dev/null +++ b/databases/mysql51-client/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- Makefile.in.orig 2010-02-04 11:46:48.000000000 +0000 ++++ Makefile.in +@@ -407,14 +407,8 @@ AUTOMAKE_OPTIONS = foreign + EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ + README COPYING EXCEPTIONS-CLIENT CMakeLists.txt + +-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ +- @readline_topdir@ sql-common scripts \ +- @pstack_dir@ \ +- @sql_union_dirs@ unittest \ +- @sql_server@ @man_dirs@ tests \ +- netware @libmysqld_dirs@ \ +- mysql-test support-files sql-bench @tools_dirs@ \ +- win ++SUBDIRS = . include @docs_dirs@ strings extra @sql_client_dirs@ \ ++ scripts man + + DIST_SUBDIRS = . include Docs zlib \ + cmd-line-utils sql-common scripts \ diff --git a/databases/mysql51-client/patches/patch-ac b/databases/mysql51-client/patches/patch-ac new file mode 100644 index 00000000000..fdc3e435575 --- /dev/null +++ b/databases/mysql51-client/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- client/completion_hash.cc.orig 2010-02-04 11:36:51.000000000 +0000 ++++ client/completion_hash.cc +@@ -22,6 +22,10 @@ + + #include <my_global.h> + #include <m_string.h> ++#ifdef NEEDS_BSTRING_H // defines bzero() ++#include <bstring.h> ++#endif ++ + #undef SAFEMALLOC // Speed things up + #include <my_sys.h> + #include "completion_hash.h" diff --git a/databases/mysql51-client/patches/patch-ad b/databases/mysql51-client/patches/patch-ad new file mode 100644 index 00000000000..ea4a1e2fe2f --- /dev/null +++ b/databases/mysql51-client/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- client/mysqladmin.cc.orig 2010-02-04 11:36:52.000000000 +0000 ++++ client/mysqladmin.cc +@@ -328,8 +328,14 @@ int main(int argc,char *argv[]) + if (tty_password) + opt_password = get_tty_password(NullS); + +- VOID(signal(SIGINT,endprog)); /* Here if abort */ +- VOID(signal(SIGTERM,endprog)); /* Here if abort */ ++#ifdef IRIX5 ++#define _MYSQL_END_TYPE (void (*)(...)) ++#else ++#define _MYSQL_END_TYPE ++#endif ++ ++ VOID(signal(SIGINT,_MYSQL_END_TYPE endprog)); /* Here if abort */ ++ VOID(signal(SIGTERM,_MYSQL_END_TYPE endprog));/* Here if abort */ + + if (opt_compress) + mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS); diff --git a/databases/mysql51-client/patches/patch-ae b/databases/mysql51-client/patches/patch-ae new file mode 100644 index 00000000000..a6bbf45fe11 --- /dev/null +++ b/databases/mysql51-client/patches/patch-ae @@ -0,0 +1,14 @@ +$NetBSD: patch-ae,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- client/mysqlbinlog.cc.orig 2010-02-04 11:36:52.000000000 +0000 ++++ client/mysqlbinlog.cc +@@ -34,6 +34,9 @@ + #include "mysql_priv.h" + #include "log_event.h" + #include "sql_common.h" ++#ifdef NEEDS_BSTRING_H ++#include <bstring.h> /* defines bzero() */ ++#endif + + #define BIN_LOG_HEADER_SIZE 4 + #define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4) diff --git a/databases/mysql51-client/patches/patch-af b/databases/mysql51-client/patches/patch-af new file mode 100644 index 00000000000..dec461e4b40 --- /dev/null +++ b/databases/mysql51-client/patches/patch-af @@ -0,0 +1,15 @@ +$NetBSD: patch-af,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- client/sql_string.cc.orig 2010-02-04 11:36:53.000000000 +0000 ++++ client/sql_string.cc +@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr); + + #include "sql_string.h" + ++#ifdef NEEDS_BSTRING_H ++#include <bstring.h> /* defines bzero() */ ++#endif ++ + /***************************************************************************** + ** String functions + *****************************************************************************/ diff --git a/databases/mysql51-client/patches/patch-ag b/databases/mysql51-client/patches/patch-ag new file mode 100644 index 00000000000..2262dd3db9c --- /dev/null +++ b/databases/mysql51-client/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- config/ac-macros/readline.m4.orig 2010-02-04 11:36:58.000000000 +0000 ++++ config/ac-macros/readline.m4 +@@ -26,7 +26,7 @@ AC_DEFUN([MYSQL_CHECK_LIBEDIT_INTERFACE] + #include "readline/readline.h" + ], + [ +- char res= *(*rl_completion_entry_function)(0,0); ++ char res= (*rl_completion_entry_function)(0,0); + completion_matches(0,0); + ], + [ diff --git a/databases/mysql51-client/patches/patch-ah b/databases/mysql51-client/patches/patch-ah new file mode 100644 index 00000000000..84184c766f9 --- /dev/null +++ b/databases/mysql51-client/patches/patch-ah @@ -0,0 +1,22 @@ +$NetBSD: patch-ah,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- config/ac-macros/ssl.m4.orig 2010-02-04 11:36:58.000000000 +0000 ++++ config/ac-macros/ssl.m4 +@@ -105,7 +105,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ + openssl_libs="-L$location/lib/ -lssl -lcrypto" + MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs]) + +- if test "$mysql_ssl_found" == "no" ++ if test "$mysql_ssl_found" = "no" + then + # + # BUG 764: Compile failure with OpenSSL on Red Hat Linux (krb5.h missing) +@@ -115,7 +115,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ + MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs]) + fi + +- if test "$mysql_ssl_found" == "no" ++ if test "$mysql_ssl_found" = "no" + then + AC_MSG_ERROR([Could not link with SSL libs at $location]) + fi diff --git a/databases/mysql51-client/patches/patch-ai b/databases/mysql51-client/patches/patch-ai new file mode 100644 index 00000000000..826aec45dde --- /dev/null +++ b/databases/mysql51-client/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- configure.in.orig 2010-02-04 11:36:59.000000000 +0000 ++++ configure.in +@@ -2784,7 +2784,7 @@ server_scripts= + + dnl This probably should be cleaned up more - for now the threaded + dnl client is just using plain-old libs. +-sql_client_dirs="strings mysys dbug extra regex libmysql" ++sql_client_dirs="strings mysys regex libmysql" + + AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no") + diff --git a/databases/mysql51-client/patches/patch-aj b/databases/mysql51-client/patches/patch-aj new file mode 100644 index 00000000000..d7d06072905 --- /dev/null +++ b/databases/mysql51-client/patches/patch-aj @@ -0,0 +1,22 @@ +$NetBSD: patch-aj,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- extra/Makefile.in.orig 2010-02-04 11:46:15.000000000 +0000 ++++ extra/Makefile.in +@@ -818,7 +818,7 @@ distdir: $(DISTFILES) + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-recursive +-all-am: Makefile $(PROGRAMS) $(HEADERS) ++all-am: Makefile $(HEADERS) + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \ +@@ -876,7 +876,7 @@ install-data-am: install-pkgincludeHEADE + + install-dvi: install-dvi-recursive + +-install-exec-am: install-binPROGRAMS ++install-exec-am: + + install-html: install-html-recursive + diff --git a/databases/mysql51-client/patches/patch-ak b/databases/mysql51-client/patches/patch-ak new file mode 100644 index 00000000000..9d868be46d4 --- /dev/null +++ b/databases/mysql51-client/patches/patch-ak @@ -0,0 +1,12 @@ +$NetBSD: patch-ak,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- include/Makefile.in.orig 2010-02-04 11:46:18.000000000 +0000 ++++ include/Makefile.in +@@ -393,6 +393,7 @@ BUILT_SOURCES = $(HEADERS_GEN_MAKE) link + HEADERS_GEN_CONFIGURE = mysql_version.h + HEADERS_GEN_MAKE = 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 mysql/plugin.h + + pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \ diff --git a/databases/mysql51-client/patches/patch-al b/databases/mysql51-client/patches/patch-al new file mode 100644 index 00000000000..f97a3b71713 --- /dev/null +++ b/databases/mysql51-client/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- include/my_handler.h.orig 2010-02-04 11:37:06.000000000 +0000 ++++ include/my_handler.h +@@ -39,7 +39,7 @@ extern "C" { + But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. + */ + +-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ ++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ + #define HA_MAX_KEY_SEG 16 /* Max segments for key */ + + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) diff --git a/databases/mysql51-client/patches/patch-am b/databases/mysql51-client/patches/patch-am new file mode 100644 index 00000000000..c95363a014c --- /dev/null +++ b/databases/mysql51-client/patches/patch-am @@ -0,0 +1,20 @@ +$NetBSD: patch-am,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- include/my_net.h.orig 2010-02-04 11:37:06.000000000 +0000 ++++ include/my_net.h +@@ -64,6 +64,15 @@ C_MODE_START + + #endif + ++#if defined(__sgi) && !defined(SHUT_RDWR) ++ ++/* ++ IRIX 5 does not define SHUT_RDWR ++*/ ++ ++#define SHUT_RDWR 2 ++#endif ++ + /* + On OSes which don't have the in_addr_t, we guess that using uint32 is the best + possible choice. We guess this from the fact that on HP-UX64bit & FreeBSD64bit diff --git a/databases/mysql51-client/patches/patch-an b/databases/mysql51-client/patches/patch-an new file mode 100644 index 00000000000..d2e72a7ba94 --- /dev/null +++ b/databases/mysql51-client/patches/patch-an @@ -0,0 +1,26 @@ +$NetBSD: patch-an,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- include/my_no_pthread.h.orig 2010-02-04 11:37:06.000000000 +0000 ++++ include/my_no_pthread.h +@@ -37,9 +37,21 @@ + to make thread safe code, that should also work in single thread + environment, easier to use. + */ ++#ifdef pthread_mutex_init ++#undef pthread_mutex_init ++#endif + #define pthread_mutex_init(A,B) ++#ifdef pthread_mutex_lock ++#undef pthread_mutex_lock ++#endif + #define pthread_mutex_lock(A) ++#ifdef pthread_mutex_unlock ++#undef pthread_mutex_unlock ++#endif + #define pthread_mutex_unlock(A) ++#ifdef pthread_mutex_destroy ++#undef pthread_mutex_destroy ++#endif + #define pthread_mutex_destroy(A) + #define my_rwlock_init(A,B) + #define rw_rdlock(A) diff --git a/databases/mysql51-client/patches/patch-ao b/databases/mysql51-client/patches/patch-ao new file mode 100644 index 00000000000..25509d467ae --- /dev/null +++ b/databases/mysql51-client/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD: patch-ao,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- include/myisam.h.orig 2010-02-04 11:37:06.000000000 +0000 ++++ include/myisam.h +@@ -48,7 +48,7 @@ extern "C" { + The following defines can be increased if necessary. + But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. + */ +-#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */ ++#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */ + #define MI_MAX_KEY_SEG 16 /* Max segments for key */ + + #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8) diff --git a/databases/mysql51-client/patches/patch-ap b/databases/mysql51-client/patches/patch-ap new file mode 100644 index 00000000000..c0ca8749743 --- /dev/null +++ b/databases/mysql51-client/patches/patch-ap @@ -0,0 +1,16 @@ +$NetBSD: patch-ap,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- man/Makefile.in.orig 2010-02-04 11:46:19.000000000 +0000 ++++ man/Makefile.in +@@ -380,8 +380,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@ +-man1_MANS = @man1_files@ +-man8_MANS = @man8_files@ ++man1_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \ ++ mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1 ++man8_MANS = + EXTRA_DIST = $(man1_MANS) $(man8_MANS) + all: all-am + diff --git a/databases/mysql51-client/patches/patch-aq b/databases/mysql51-client/patches/patch-aq new file mode 100644 index 00000000000..82848a975ef --- /dev/null +++ b/databases/mysql51-client/patches/patch-aq @@ -0,0 +1,13 @@ +$NetBSD: patch-aq,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- mysys/Makefile.in.orig 2010-02-04 11:46:20.000000000 +0000 ++++ mysys/Makefile.in +@@ -888,7 +888,7 @@ install-data-am: + + install-dvi: install-dvi-am + +-install-exec-am: install-pkglibLIBRARIES ++install-exec-am: + + install-html: install-html-am + diff --git a/databases/mysql51-client/patches/patch-ar b/databases/mysql51-client/patches/patch-ar new file mode 100644 index 00000000000..7d3258f0c9e --- /dev/null +++ b/databases/mysql51-client/patches/patch-ar @@ -0,0 +1,21 @@ +$NetBSD: patch-ar,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- scripts/Makefile.in.orig 2010-02-04 11:46:23.000000000 +0000 ++++ scripts/Makefile.in +@@ -414,15 +414,13 @@ bin_SCRIPTS = @server_scripts@ \ + mysql_fix_privilege_tables \ + mysql_fix_extensions \ + mysql_setpermission \ +- mysql_secure_installation \ + mysql_zap \ + mysqlaccess \ + mysqlbug \ + mysql_convert_table_format \ + mysql_find_rows \ + mysqlhotcopy \ +- mysqldumpslow \ +- mysqld_multi ++ mysqldumpslow + + noinst_SCRIPTS = make_binary_distribution \ + make_sharedlib_distribution diff --git a/databases/mysql51-client/patches/patch-as b/databases/mysql51-client/patches/patch-as new file mode 100644 index 00000000000..a8ba10d8c4e --- /dev/null +++ b/databases/mysql51-client/patches/patch-as @@ -0,0 +1,24 @@ +$NetBSD: patch-as,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- sql/Makefile.in.orig 2010-02-04 11:46:24.000000000 +0000 ++++ sql/Makefile.in +@@ -527,10 +527,8 @@ SUBDIRS = share + noinst_LTLIBRARIES = libndb.la \ + udf_example.la + +-SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \ ++SUPPORTING_LIBS = \ + $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/regex/libregex.a \ + $(top_builddir)/strings/libmystrings.a + + mysqld_DEPENDENCIES = @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la +@@ -646,7 +644,6 @@ AM_YFLAGS = -d --verbose + udf_example_la_SOURCES = udf_example.c + udf_example_la_LDFLAGS = -module -rpath $(pkglibdir) + all: $(BUILT_SOURCES) +- $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: + .SUFFIXES: .c .cc .lo .o .obj .yy diff --git a/databases/mysql51-client/patches/patch-at b/databases/mysql51-client/patches/patch-at new file mode 100644 index 00000000000..f8305a485c0 --- /dev/null +++ b/databases/mysql51-client/patches/patch-at @@ -0,0 +1,14 @@ +$NetBSD: patch-at,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- sql/log_event.cc.orig 2010-02-04 11:39:50.000000000 +0000 ++++ sql/log_event.cc +@@ -32,6 +32,9 @@ + #include "rpl_utility.h" + #include "rpl_record.h" + #include <my_dir.h> ++#ifdef NEEDS_BSTRING_H ++#include <bstring.h> /* defines bcmp() */ ++#endif + + #endif /* MYSQL_CLIENT */ + diff --git a/databases/mysql51-client/patches/patch-au b/databases/mysql51-client/patches/patch-au new file mode 100644 index 00000000000..4e45b5b5ea2 --- /dev/null +++ b/databases/mysql51-client/patches/patch-au @@ -0,0 +1,15 @@ +$NetBSD: patch-au,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- sql/log_event.h.orig 2010-02-04 11:39:50.000000000 +0000 ++++ sql/log_event.h +@@ -28,6 +28,10 @@ + #ifndef _log_event_h + #define _log_event_h + ++#ifdef NEEDS_BSTRING_H ++#include <bstring.h> /* defines bzero() */ ++#endif ++ + #if defined(USE_PRAGMA_INTERFACE) && !defined(MYSQL_CLIENT) + #pragma interface /* gcc class implementation */ + #endif diff --git a/databases/mysql51-client/patches/patch-av b/databases/mysql51-client/patches/patch-av new file mode 100644 index 00000000000..13fad7ed923 --- /dev/null +++ b/databases/mysql51-client/patches/patch-av @@ -0,0 +1,13 @@ +$NetBSD: patch-av,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- sql/mysqld.cc.orig 2010-02-04 11:39:50.000000000 +0000 ++++ sql/mysqld.cc +@@ -173,7 +173,7 @@ static void getvolumeID(BYTE *volumeName + int initgroups(const char *,unsigned int); + #endif + +-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) ++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H) + #include <ieeefp.h> + #ifdef HAVE_FP_EXCEPT // Fix type conflict + typedef fp_except fp_except_t; diff --git a/databases/mysql51-client/patches/patch-aw b/databases/mysql51-client/patches/patch-aw new file mode 100644 index 00000000000..d8feb4bc2ac --- /dev/null +++ b/databases/mysql51-client/patches/patch-aw @@ -0,0 +1,15 @@ +$NetBSD: patch-aw,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- sql/sql_string.cc.orig 2010-02-04 11:39:53.000000000 +0000 ++++ sql/sql_string.cc +@@ -37,6 +37,10 @@ extern void sql_element_free(void *ptr); + + #include "sql_string.h" + ++#ifdef NEEDS_BSTRING_H ++#include <bstring.h> /* defines bzero() */ ++#endif ++ + /***************************************************************************** + ** String functions + *****************************************************************************/ diff --git a/databases/mysql51-client/patches/patch-ax b/databases/mysql51-client/patches/patch-ax new file mode 100644 index 00000000000..d8fde2d4c83 --- /dev/null +++ b/databases/mysql51-client/patches/patch-ax @@ -0,0 +1,13 @@ +$NetBSD: patch-ax,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- strings/Makefile.in.orig 2010-02-04 11:46:44.000000000 +0000 ++++ strings/Makefile.in +@@ -927,7 +927,7 @@ install-data-am: + + install-dvi: install-dvi-am + +-install-exec-am: install-pkglibLIBRARIES ++install-exec-am: + + install-html: install-html-am + diff --git a/databases/mysql51-client/patches/patch-ay b/databases/mysql51-client/patches/patch-ay new file mode 100644 index 00000000000..6605e9ddc02 --- /dev/null +++ b/databases/mysql51-client/patches/patch-ay @@ -0,0 +1,14 @@ +$NetBSD: patch-ay,v 1.1.1.1 2010/03/04 16:27:18 taca Exp $ + +--- strings/decimal.c.orig 2010-02-04 11:40:24.000000000 +0000 ++++ strings/decimal.c +@@ -105,6 +105,9 @@ + #include <my_sys.h> /* for my_alloca */ + #include <m_string.h> + #include <decimal.h> ++#ifdef NEEDS_BSTRING_H ++#include <bstring.h> /* defines bzero() */ ++#endif + + /* + Internally decimal numbers are stored base 10^9 (see DIG_BASE below) |