diff options
| author | adam <adam> | 2011-04-25 21:12:52 +0000 |
|---|---|---|
| committer | adam <adam> | 2011-04-25 21:12:52 +0000 |
| commit | cc29a1be6ab453d2bbc32d68447372858b1dbb4c (patch) | |
| tree | 0fedf54840f4aac5d81f3a02835064812cf90373 /databases/mysql55-client | |
| parent | 22a4a056d1b7643cb5894591fae34766bd6bf1ab (diff) | |
| download | pkgsrc-cc29a1be6ab453d2bbc32d68447372858b1dbb4c.tar.gz | |
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/mysql55-client')
32 files changed, 829 insertions, 0 deletions
diff --git a/databases/mysql55-client/DESCR b/databases/mysql55-client/DESCR new file mode 100644 index 00000000000..a3ace9ed801 --- /dev/null +++ b/databases/mysql55-client/DESCR @@ -0,0 +1,14 @@ +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/mysql55-client/MESSAGE b/databases/mysql55-client/MESSAGE new file mode 100644 index 00000000000..7cec073bede --- /dev/null +++ b/databases/mysql55-client/MESSAGE @@ -0,0 +1,10 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1.1.1 2011/04/25 21:12:53 adam 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/mysql55-client/Makefile b/databases/mysql55-client/Makefile new file mode 100644 index 00000000000..7f93626ba5b --- /dev/null +++ b/databases/mysql55-client/Makefile @@ -0,0 +1,28 @@ +# $NetBSD: Makefile,v 1.1.1.1 2011/04/25 21:12:52 adam 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]*} + +.include "Makefile.common" + +CMAKE_ARGS+= -DWITHOUT_SERVER=ON +UNWRAP_FILES+= scripts/mysql_config +INFO_FILES= yes +INSTALL_DIRS+= client include libmysql man scripts tests + +REPLACE_PERL= scripts/mysql_convert_table_format.sh +REPLACE_PERL+= scripts/mysql_find_rows.sh +REPLACE_PERL+= scripts/mysql_fix_extensions.sh +REPLACE_PERL+= scripts/mysql_fix_privilege_tables.sh +REPLACE_PERL+= scripts/mysql_setpermission.sh +REPLACE_PERL+= scripts/mysql_zap.sh +REPLACE_PERL+= scripts/mysqlaccess.sh +REPLACE_PERL+= scripts/mysqld_multi.sh +REPLACE_PERL+= scripts/mysqldumpslow.sh +REPLACE_PERL+= scripts/mysqlhotcopy.sh + +.include "../../devel/readline/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql55-client/Makefile.common b/databases/mysql55-client/Makefile.common new file mode 100644 index 00000000000..3fac89224d4 --- /dev/null +++ b/databases/mysql55-client/Makefile.common @@ -0,0 +1,110 @@ +# $NetBSD: Makefile.common,v 1.1.1.1 2011/04/25 21:12:52 adam Exp $ +# +# used by databases/mysql55-client/Makefile +# used by databases/mysql55-server/Makefile + +DISTNAME= mysql-5.5.11 +CATEGORIES= databases +MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.5/} + +MAINTAINER?= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.mysql.com/ +LICENSE= gnu-gpl-v2 + +PKG_DESTDIR_SUPPORT= user-destdir + +DISTINFO_FILE?= ${.CURDIR}/../../databases/mysql55-client/distinfo +PATCHDIR?= ${.CURDIR}/../../databases/mysql55-client/patches + +USE_CMAKE= yes +USE_GNU_READLINE= yes +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes +USE_TOOLS+= bash gmake perl:run + +.include "../../mk/bsd.prefs.mk" + +.include "options.mk" + +# MYSQL_USER username of the database administrator +# MYSQL_GROUP group of the database administrator +# MYSQL_DATADIR home directory (location of the databases) +# MYSQL_CHARSET default character set +# MYSQL_EXTRA_CHARSET additional character set to be compiled in +MYSQL_USER?= mysql +MYSQL_GROUP?= mysql +MYSQL_DATADIR?= ${VARBASE}/mysql +MYSQL_CHARSET?= latin1 +MYSQL_EXTRA_CHARSET?= all + +PKG_USERS_VARS+= MYSQL_USER +PKG_GROUPS_VARS+= MYSQL_GROUP + +CONFIG_SHELL= ${TOOLS_PATH.bash} + +.if ${OPSYS} == "IRIX" +CFLAGS+= -DIRIX5 -DNEEDS_BSTRING_H +.endif + +BUILD_DEFS+= VARBASE + +# paths +CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" +CMAKE_ARGS+= -DINSTALL_DOCREADMEDIR="share/doc/mysql" +CMAKE_ARGS+= -DINSTALL_INCLUDEDIR="include/mysql" +CMAKE_ARGS+= -DINSTALL_INFODIR="info" +CMAKE_ARGS+= -DINSTALL_MYSQLSHAREDIR="share/mysql" +CMAKE_ARGS+= -DINSTALL_MYSQLTESTDIR="share/mysql/test" +CMAKE_ARGS+= -DINSTALL_PLUGINDIR="lib/mysql/plugin" +CMAKE_ARGS+= -DINSTALL_SBINDIR="sbin" +CMAKE_ARGS+= -DINSTALL_SCRIPTDIR="bin" +CMAKE_ARGS+= -DINSTALL_SQLBENCHDIR="share/mysql/sql-bench" +CMAKE_ARGS+= -DINSTALL_SUPPORTFILESDIR="share/mysql" +CMAKE_ARGS+= -DMYSQL_DATADIR=${MYSQL_DATADIR} + +# always use our own readline, not MySQL bundled one +CMAKE_ARGS+= -DWITH_LIBEDIT=OFF +CMAKE_ARGS+= -DWITH_READLINE=OFF +CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET:Q} +CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET:Q} + +# MySQL 5 depends on builtin functions enabled with i486 and later with GCC. +.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386) +GNU_ARCH.i386= i486 +CFLAGS+= -march=i486 +.endif + +CPPFLAGS+= -Dunix +CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat + +.if ${OPSYS} != "Interix" +CFLAGS+= -fPIC -DPIC +CXXFLAGS+= -fPIC -DPIC +.endif + +# 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 +.endif + +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql + +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. + +.include "../../devel/zlib/buildlink3.mk" diff --git a/databases/mysql55-client/PLIST b/databases/mysql55-client/PLIST new file mode 100644 index 00000000000..a5023072b95 --- /dev/null +++ b/databases/mysql55-client/PLIST @@ -0,0 +1,137 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ +bin/msql2mysql +bin/mysql +bin/mysql_client_test +bin/mysql_config +bin/mysql_convert_table_format +bin/mysql_find_rows +bin/mysql_fix_extensions +bin/mysql_install_db +bin/mysql_secure_installation +bin/mysql_setpermission +bin/mysql_upgrade +bin/mysql_zap +bin/mysqlaccess +bin/mysqlaccess.conf +bin/mysqladmin +bin/mysqlbinlog +bin/mysqlbug +bin/mysqlcheck +bin/mysqld_multi +bin/mysqld_safe +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_compiler.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_pthread.h +include/mysql/my_sys.h +include/mysql/my_xml.h +include/mysql/mysql.h +include/mysql/mysql/client_plugin.h +include/mysql/mysql/innodb_priv.h +include/mysql/mysql/plugin.h +include/mysql/mysql/plugin_audit.h +include/mysql/mysql/plugin_auth.h +include/mysql/mysql/plugin_auth_common.h +include/mysql/mysql/plugin_ftparser.h +include/mysql/mysql/psi/mysql_file.h +include/mysql/mysql/psi/mysql_thread.h +include/mysql/mysql/psi/psi.h +include/mysql/mysql/psi/psi_abi_v1.h +include/mysql/mysql/psi/psi_abi_v2.h +include/mysql/mysql/service_my_snprintf.h +include/mysql/mysql/service_thd_alloc.h +include/mysql/mysql/service_thd_wait.h +include/mysql/mysql/service_thread_scheduler.h +include/mysql/mysql/services.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/plugin_audit.h +include/mysql/plugin_ftparser.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 +lib/libmysqlclient.a +lib/libmysqlclient.so +lib/libmysqlclient.so.18 +lib/libmysqlclient.so.18.0.0 +lib/libmysqlclient_r.a +lib/libmysqlclient_r.so +lib/libmysqlclient_r.so.18 +lib/libmysqlclient_r.so.18.0.0 +man/man1/comp_err.1 +man/man1/innochecksum.1 +man/man1/msql2mysql.1 +man/man1/my_print_defaults.1 +man/man1/myisam_ftdump.1 +man/man1/myisamchk.1 +man/man1/myisamlog.1 +man/man1/myisampack.1 +man/man1/mysql-stress-test.pl.1 +man/man1/mysql-test-run.pl.1 +man/man1/mysql.1 +man/man1/mysql.server.1 +man/man1/mysql_client_test.1 +man/man1/mysql_client_test_embedded.1 +man/man1/mysql_config.1 +man/man1/mysql_convert_table_format.1 +man/man1/mysql_find_rows.1 +man/man1/mysql_fix_extensions.1 +man/man1/mysql_install_db.1 +man/man1/mysql_secure_installation.1 +man/man1/mysql_setpermission.1 +man/man1/mysql_tzinfo_to_sql.1 +man/man1/mysql_upgrade.1 +man/man1/mysql_waitpid.1 +man/man1/mysql_zap.1 +man/man1/mysqlaccess.1 +man/man1/mysqladmin.1 +man/man1/mysqlbinlog.1 +man/man1/mysqlbug.1 +man/man1/mysqlcheck.1 +man/man1/mysqld_multi.1 +man/man1/mysqld_safe.1 +man/man1/mysqldump.1 +man/man1/mysqldumpslow.1 +man/man1/mysqlhotcopy.1 +man/man1/mysqlimport.1 +man/man1/mysqlman.1 +man/man1/mysqlshow.1 +man/man1/mysqlslap.1 +man/man1/mysqltest.1 +man/man1/mysqltest_embedded.1 +man/man1/perror.1 +man/man1/replace.1 +man/man1/resolve_stack_dump.1 +man/man1/resolveip.1 +man/man8/mysqld.8 +share/mysql/fill_help_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/mysql55-client/buildlink3.mk b/databases/mysql55-client/buildlink3.mk new file mode 100644 index 00000000000..99c0a548005 --- /dev/null +++ b/databases/mysql55-client/buildlink3.mk @@ -0,0 +1,18 @@ +# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/04/25 21:12:52 adam Exp $ + +BUILDLINK_TREE+= mysql-client + +.if !defined(MYSQL_CLIENT_BUILDLINK3_MK) +MYSQL_CLIENT_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.mysql-client+= mysql-client>=5.5.10 +BUILDLINK_ABI_DEPENDS.mysql-client+= mysql-client>=5.5.10 +BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql55-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/mysql55-client/distinfo b/databases/mysql55-client/distinfo new file mode 100644 index 00000000000..b212b5b4183 --- /dev/null +++ b/databases/mysql55-client/distinfo @@ -0,0 +1,29 @@ +$NetBSD: distinfo,v 1.1.1.1 2011/04/25 21:12:52 adam Exp $ + +SHA1 (mysql-5.5.11.tar.gz) = f6a9ccf00fe723e7f18027cfd64527d1e71c8322 +RMD160 (mysql-5.5.11.tar.gz) = e220a2b105d43de0544b097ffae954e2d0829da6 +Size (mysql-5.5.11.tar.gz) = 23664849 bytes +SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6 +SHA1 (patch-CMakeLists.txt) = eaf78f2198945b5010dc3e67e13bdb37fd9c12c7 +SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb +SHA1 (patch-client_mysqladmin.cc) = 901c2b675cff7589ab629e591dabf26d17e4d8a7 +SHA1 (patch-client_mysqlbinlog.cc) = f78dd6538b978e1ae95bb720e8baa91087ecc149 +SHA1 (patch-client_sql_string.cc) = 4a18442fa16ccbc8f34c11a460209209017c3bc5 +SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09 +SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847 +SHA1 (patch-include_my_handler.h) = 323c1624457c96269a138c8a7fc810162f6187cd +SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af +SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86 +SHA1 (patch-include_myisam.h) = cfbec9eee43282c5ebc38a64add97218c74279a0 +SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892 +SHA1 (patch-mysys_stacktrace.c) = c7633ab86f02e345e95564536882e09a9ef19f8d +SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59 +SHA1 (patch-scripts_mysqld_safe.sh) = 74879fe38b74e3a51db1dd1233b29a05e9edad28 +SHA1 (patch-sql_CMakeLists.txt) = 9ad00a281976d5e96a95e17ba7387a8835b43e55 +SHA1 (patch-sql_log_event.cc) = e8d0dd7dc876b0e386be138cd5f569b4af8eca8a +SHA1 (patch-sql_log_event.h) = eb9e38bbf50914ee504501b0723b57f80849ef48 +SHA1 (patch-sql_mysqld.cc) = 19d96c430e126994c27e7f2eb507793f6b9ce094 +SHA1 (patch-sql_sql_string.cc) = 00368733072803d59473410badb82e92673de0a7 +SHA1 (patch-storage_innobase_include_os0sync.h) = 5c3548113f8e52375e036e37885ae9c797daf3d4 +SHA1 (patch-storage_ndb_include_util_Parser.hpp) = ca9406a8b01dffb3f515f132fa7aaef66c78f2be +SHA1 (patch-strings_decimal.c) = 4d2a3d8acb3b0af56180f3a1faa8735d692be5b9 diff --git a/databases/mysql55-client/options.mk b/databases/mysql55-client/options.mk new file mode 100644 index 00000000000..464126d097d --- /dev/null +++ b/databases/mysql55-client/options.mk @@ -0,0 +1,28 @@ +# $NetBSD: options.mk,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.mysql5 + +# ndb-cluster does not configure with cmake +PKG_SUPPORTED_OPTIONS+= embedded-server ndb-cluster ssl +PKG_SUGGESTED_OPTIONS+= embedded-server 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" +CMAKE_ARGS+= -DWITH_SSL=system +. endif +. else +CMAKE_ARGS+= -DWITH_SSL=system +. endif +.else +CMAKE_ARGS+= -DWITH_SSL=no +.endif diff --git a/databases/mysql55-client/patches/patch-BUILD_compile-pentium-gcov b/databases/mysql55-client/patches/patch-BUILD_compile-pentium-gcov new file mode 100644 index 00000000000..595547719d4 --- /dev/null +++ b/databases/mysql55-client/patches/patch-BUILD_compile-pentium-gcov @@ -0,0 +1,15 @@ +$NetBSD: patch-BUILD_compile-pentium-gcov,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +* Don't use "==" in test(1). + +--- BUILD/compile-pentium-gcov.orig 2010-02-04 11:36:48.000000000 +0000 ++++ BUILD/compile-pentium-gcov +@@ -22,7 +22,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/mysql55-client/patches/patch-CMakeLists.txt b/databases/mysql55-client/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..f425bf8ed7c --- /dev/null +++ b/databases/mysql55-client/patches/patch-CMakeLists.txt @@ -0,0 +1,42 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +Split configuration between mysql-client and mysql-server. + +--- CMakeLists.txt.orig 2011-03-31 13:36:18.000000000 +0000 ++++ CMakeLists.txt +@@ -274,7 +274,6 @@ ADD_SUBDIRECTORY(strings) + ADD_SUBDIRECTORY(vio) + ADD_SUBDIRECTORY(regex) + ADD_SUBDIRECTORY(mysys) +-ADD_SUBDIRECTORY(libmysql) + + + IF(WITH_UNIT_TESTS) +@@ -286,9 +285,13 @@ IF(WITH_UNIT_TESTS) + ENDIF() + + ADD_SUBDIRECTORY(extra) +-IF(NOT WITHOUT_SERVER) +- ADD_SUBDIRECTORY(tests) ++IF(WITHOUT_SERVER) ++ ADD_SUBDIRECTORY(libmysql) + ADD_SUBDIRECTORY(client) ++ ADD_SUBDIRECTORY(scripts) ++ ADD_SUBDIRECTORY(man) ++ ADD_SUBDIRECTORY(tests) ++ELSE() + ADD_SUBDIRECTORY(sql) + ADD_SUBDIRECTORY(sql/share) + ADD_SUBDIRECTORY(libservices) +@@ -301,11 +304,7 @@ IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(mysql-test) + ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) + ADD_SUBDIRECTORY(support-files) +- ADD_SUBDIRECTORY(scripts) + ADD_SUBDIRECTORY(sql-bench) +- IF(UNIX) +- ADD_SUBDIRECTORY(man) +- ENDIF() + ENDIF() + + INCLUDE(cmake/abi_check.cmake) diff --git a/databases/mysql55-client/patches/patch-client_completion_hash.cc b/databases/mysql55-client/patches/patch-client_completion_hash.cc new file mode 100644 index 00000000000..ae4b458be09 --- /dev/null +++ b/databases/mysql55-client/patches/patch-client_completion_hash.cc @@ -0,0 +1,17 @@ +$NetBSD: patch-client_completion_hash.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +* Portability: include <bstring.h> if exists. + +--- 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 ++ + #include <my_sys.h> + #include "completion_hash.h" + diff --git a/databases/mysql55-client/patches/patch-client_mysqladmin.cc b/databases/mysql55-client/patches/patch-client_mysqladmin.cc new file mode 100644 index 00000000000..dda037c16a6 --- /dev/null +++ b/databases/mysql55-client/patches/patch-client_mysqladmin.cc @@ -0,0 +1,23 @@ +$NetBSD: patch-client_mysqladmin.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +Redefine signals for Irix. + +--- client/mysqladmin.cc.orig 2010-02-04 11:36:52.000000000 +0000 ++++ client/mysqladmin.cc +@@ -322,8 +322,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/mysql55-client/patches/patch-client_mysqlbinlog.cc b/databases/mysql55-client/patches/patch-client_mysqlbinlog.cc new file mode 100644 index 00000000000..5a65da17ba6 --- /dev/null +++ b/databases/mysql55-client/patches/patch-client_mysqlbinlog.cc @@ -0,0 +1,16 @@ +$NetBSD: patch-client_mysqlbinlog.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +* Portability: include <bstring.h> if exists. + +--- client/mysqlbinlog.cc.orig 2010-02-04 11:36:52.000000000 +0000 ++++ client/mysqlbinlog.cc +@@ -35,6 +35,9 @@ + #include "log_event.h" + #include "sql_common.h" + #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE ++#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/mysql55-client/patches/patch-client_sql_string.cc b/databases/mysql55-client/patches/patch-client_sql_string.cc new file mode 100644 index 00000000000..a0d257dd7a1 --- /dev/null +++ b/databases/mysql55-client/patches/patch-client_sql_string.cc @@ -0,0 +1,17 @@ +$NetBSD: patch-client_sql_string.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +* Portability: include <bstring.h> if exists. + +--- client/sql_string.cc.orig 2010-02-04 11:36:53.000000000 +0000 ++++ client/sql_string.cc +@@ -27,6 +27,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/mysql55-client/patches/patch-cmake_libutils.cmake b/databases/mysql55-client/patches/patch-cmake_libutils.cmake new file mode 100644 index 00000000000..873332b8c0f --- /dev/null +++ b/databases/mysql55-client/patches/patch-cmake_libutils.cmake @@ -0,0 +1,15 @@ +$NetBSD: patch-cmake_libutils.cmake,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +On Mac OS X, use PkgSrc libtool. + +--- cmake/libutils.cmake.orig 2011-04-05 12:38:41.000000000 +0000 ++++ cmake/libutils.cmake +@@ -178,7 +178,7 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NA + "${LINKER_EXTRA_FLAGS}") + ELSE() + GET_TARGET_PROPERTY(TARGET_LOCATION ${TARGET} LOCATION) +- IF(APPLE) ++ IF(0) + # Use OSX's libtool to merge archives (ihandles universal + # binaries properly) + ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD diff --git a/databases/mysql55-client/patches/patch-include_CMakeLists.txt b/databases/mysql55-client/patches/patch-include_CMakeLists.txt new file mode 100644 index 00000000000..4fb5f7037ec --- /dev/null +++ b/databases/mysql55-client/patches/patch-include_CMakeLists.txt @@ -0,0 +1,16 @@ +$NetBSD: patch-include_CMakeLists.txt,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +Only mysql-client installs includes. + +--- include/CMakeLists.txt.orig 2011-04-25 17:42:52.000000000 +0000 ++++ include/CMakeLists.txt +@@ -56,6 +56,8 @@ SET(HEADERS + my_compiler.h + ${HEADERS_GEN_CONFIGURE} + ) +- ++ ++IF(WITHOUT_SERVER) + INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) + INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h") ++ENDIF() diff --git a/databases/mysql55-client/patches/patch-include_my_handler.h b/databases/mysql55-client/patches/patch-include_my_handler.h new file mode 100644 index 00000000000..3830d1912d5 --- /dev/null +++ b/databases/mysql55-client/patches/patch-include_my_handler.h @@ -0,0 +1,15 @@ +$NetBSD: patch-include_my_handler.h,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +Adjust HA_MAX_KEY_LENGTH x4. + +--- include/my_handler.h.orig 2010-02-04 11:37:06.000000000 +0000 ++++ include/my_handler.h +@@ -41,7 +41,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/mysql55-client/patches/patch-include_my_net.h b/databases/mysql55-client/patches/patch-include_my_net.h new file mode 100644 index 00000000000..34eeb715ef9 --- /dev/null +++ b/databases/mysql55-client/patches/patch-include_my_net.h @@ -0,0 +1,22 @@ +$NetBSD: patch-include_my_net.h,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +* Define SHUT_RDWR for Irix 5. + +--- 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/mysql55-client/patches/patch-include_my_pthread.h b/databases/mysql55-client/patches/patch-include_my_pthread.h new file mode 100644 index 00000000000..02d01b234f8 --- /dev/null +++ b/databases/mysql55-client/patches/patch-include_my_pthread.h @@ -0,0 +1,29 @@ +$NetBSD: patch-include_my_pthread.h,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +--- include/my_pthread.h.orig 2011-04-16 09:13:17.000000000 +0000 ++++ include/my_pthread.h +@@ -20,6 +20,13 @@ + + #include "my_global.h" /* myf */ + ++/* defines __NetBSD_Version__ */ ++#if defined(__NetBSD__) ++#include <sys/param.h> ++#endif ++ ++#include <signal.h> ++ + #ifndef ETIME + #define ETIME ETIMEDOUT /* For FreeBSD */ + #endif +@@ -238,6 +245,10 @@ int sigwait(sigset_t *set, int *sig); + #endif + + #ifndef HAVE_NONPOSIX_SIGWAIT ++#if defined (__NetBSD__) && (__NetBSD_Version__ < 106130000) ++#define my_sigwait(A,B) __pthread_sigwait((A),(B)) ++#else ++#endif + #define my_sigwait(A,B) sigwait((A),(B)) + #else + int my_sigwait(const sigset_t *set,int *sig); diff --git a/databases/mysql55-client/patches/patch-include_myisam.h b/databases/mysql55-client/patches/patch-include_myisam.h new file mode 100644 index 00000000000..5e6dd48a6bf --- /dev/null +++ b/databases/mysql55-client/patches/patch-include_myisam.h @@ -0,0 +1,15 @@ +$NetBSD: patch-include_myisam.h,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +Adjust MI_MAX_KEY_LENGTH x4. + +--- 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/mysql55-client/patches/patch-mysql-test_CMakeLists.txt b/databases/mysql55-client/patches/patch-mysql-test_CMakeLists.txt new file mode 100644 index 00000000000..ae398312ae3 --- /dev/null +++ b/databases/mysql55-client/patches/patch-mysql-test_CMakeLists.txt @@ -0,0 +1,18 @@ +$NetBSD: patch-mysql-test_CMakeLists.txt,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +Exclude some unwated files. + +--- mysql-test/CMakeLists.txt.orig 2011-04-25 19:43:51.000000000 +0000 ++++ mysql-test/CMakeLists.txt +@@ -24,9 +24,11 @@ INSTALL( + PATTERN "lib/t*" EXCLUDE + PATTERN "CPack" EXCLUDE + PATTERN "CMake*" EXCLUDE ++ PATTERN "Makefile" EXCLUDE + PATTERN "mtr.out*" EXCLUDE + PATTERN ".cvsignore" EXCLUDE + PATTERN "*.am" EXCLUDE ++ PATTERN "*.cmake" EXCLUDE + PATTERN "*.in" EXCLUDE + ) + ENDIF() diff --git a/databases/mysql55-client/patches/patch-mysys_stacktrace.c b/databases/mysql55-client/patches/patch-mysys_stacktrace.c new file mode 100644 index 00000000000..1542b4d79a3 --- /dev/null +++ b/databases/mysql55-client/patches/patch-mysys_stacktrace.c @@ -0,0 +1,13 @@ +$NetBSD: patch-mysys_stacktrace.c,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +--- mysys/stacktrace.c.orig 2011-03-31 13:36:16.000000000 +0000 ++++ mysys/stacktrace.c +@@ -421,7 +421,7 @@ void my_write_core(int sig) + __gcov_flush(); + #endif + pthread_kill(pthread_self(), sig); +-#if defined(P_MYID) && !defined(SCO) ++#if HAVE_SIGSEND && defined(P_MYID) && !defined(SCO) + /* On Solaris, the above kill is not enough */ + sigsend(P_PID,P_MYID,sig); + #endif diff --git a/databases/mysql55-client/patches/patch-scripts_CMakeLists.txt b/databases/mysql55-client/patches/patch-scripts_CMakeLists.txt new file mode 100644 index 00000000000..3214cd28e95 --- /dev/null +++ b/databases/mysql55-client/patches/patch-scripts_CMakeLists.txt @@ -0,0 +1,29 @@ +$NetBSD: patch-scripts_CMakeLists.txt,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +Fix paths. + +--- scripts/CMakeLists.txt.orig 2011-03-31 13:36:18.000000000 +0000 ++++ scripts/CMakeLists.txt +@@ -181,22 +181,14 @@ ENDIF(UNIX) + # i.e. makes access relative the current directory. This matches + # the documentation, so better not change this. + +-IF(INSTALL_LAYOUT MATCHES "STANDALONE") +- SET(prefix ".") +-ELSE() + SET(prefix "${CMAKE_INSTALL_PREFIX}") +-ENDIF() + + SET(bindir ${prefix}/${INSTALL_BINDIR}) + SET(sbindir ${prefix}/${INSTALL_SBINDIR}) + SET(scriptdir ${prefix}/${INSTALL_BINDIR}) + SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) + SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) +-IF(INSTALL_LAYOUT MATCHES "STANDALONE") +- SET(localstatedir ${prefix}/data) +-ELSE() + SET(localstatedir ${MYSQL_DATADIR}) +-ENDIF() + + IF(UNIX) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh diff --git a/databases/mysql55-client/patches/patch-scripts_mysqld_safe.sh b/databases/mysql55-client/patches/patch-scripts_mysqld_safe.sh new file mode 100644 index 00000000000..9f6a5bab5d7 --- /dev/null +++ b/databases/mysql55-client/patches/patch-scripts_mysqld_safe.sh @@ -0,0 +1,13 @@ +$NetBSD: patch-scripts_mysqld_safe.sh,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +--- scripts/mysqld_safe.sh.orig 2011-03-31 13:36:18.000000000 +0000 ++++ scripts/mysqld_safe.sh +@@ -715,7 +715,7 @@ fi + # Alternatively, you can start mysqld with the "myisam-recover" option. See + # the manual for details. + # +-# echo "Checking tables in $DATADIR" ++# log_notice "Checking tables in $DATADIR" + # $MY_BASEDIR_VERSION/bin/myisamchk --silent --force --fast --medium-check $DATADIR/*/*.MYI + # $MY_BASEDIR_VERSION/bin/isamchk --silent --force $DATADIR/*/*.ISM + diff --git a/databases/mysql55-client/patches/patch-sql_CMakeLists.txt b/databases/mysql55-client/patches/patch-sql_CMakeLists.txt new file mode 100644 index 00000000000..2207c0ae296 --- /dev/null +++ b/databases/mysql55-client/patches/patch-sql_CMakeLists.txt @@ -0,0 +1,15 @@ +$NetBSD: patch-sql_CMakeLists.txt,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +Do not install files in MYSQL_DATADIR. + +--- sql/CMakeLists.txt.orig 2011-04-25 19:03:50.000000000 +0000 ++++ sql/CMakeLists.txt +@@ -243,7 +243,7 @@ ADD_CUSTOM_TARGET(distclean + VERBATIM + ) + +-IF(INSTALL_LAYOUT STREQUAL "STANDALONE") ++IF(FALSE) + + # We need to create empty directories (data/test) the installation. + # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767 diff --git a/databases/mysql55-client/patches/patch-sql_log_event.cc b/databases/mysql55-client/patches/patch-sql_log_event.cc new file mode 100644 index 00000000000..e07424187d1 --- /dev/null +++ b/databases/mysql55-client/patches/patch-sql_log_event.cc @@ -0,0 +1,16 @@ +$NetBSD: patch-sql_log_event.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +* Portability: include <bstring.h> if exists. + +--- sql/log_event.cc.orig 2011-03-09 15:11:38.000000000 +0000 ++++ sql/log_event.cc +@@ -44,6 +44,9 @@ + #include "rpl_record.h" + #include "transaction.h" + #include <my_dir.h> ++#ifdef NEEDS_BSTRING_H ++#include <bstring.h> /* defines bcmp() */ ++#endif + + #endif /* MYSQL_CLIENT */ + diff --git a/databases/mysql55-client/patches/patch-sql_log_event.h b/databases/mysql55-client/patches/patch-sql_log_event.h new file mode 100644 index 00000000000..a36fcb187fb --- /dev/null +++ b/databases/mysql55-client/patches/patch-sql_log_event.h @@ -0,0 +1,17 @@ +$NetBSD: patch-sql_log_event.h,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +* Portability: include <bstring.h> if exists. + +--- 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_SERVER) + #pragma interface /* gcc class implementation */ + #endif diff --git a/databases/mysql55-client/patches/patch-sql_mysqld.cc b/databases/mysql55-client/patches/patch-sql_mysqld.cc new file mode 100644 index 00000000000..6d3c2b69fb4 --- /dev/null +++ b/databases/mysql55-client/patches/patch-sql_mysqld.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-sql_mysqld.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +* Handle DragonFly as the same as FreeBSD. + +--- sql/mysqld.cc.orig 2010-02-04 11:39:50.000000000 +0000 ++++ sql/mysqld.cc +@@ -163,7 +163,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/mysql55-client/patches/patch-sql_sql_string.cc b/databases/mysql55-client/patches/patch-sql_sql_string.cc new file mode 100644 index 00000000000..1784351a238 --- /dev/null +++ b/databases/mysql55-client/patches/patch-sql_sql_string.cc @@ -0,0 +1,17 @@ +$NetBSD: patch-sql_sql_string.cc,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +* Portability: include <bstring.h> if exists. + +--- sql/sql_string.cc.orig 2010-02-04 11:39:53.000000000 +0000 ++++ sql/sql_string.cc +@@ -27,6 +27,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/mysql55-client/patches/patch-storage_innobase_include_os0sync.h b/databases/mysql55-client/patches/patch-storage_innobase_include_os0sync.h new file mode 100644 index 00000000000..afc41b0a07d --- /dev/null +++ b/databases/mysql55-client/patches/patch-storage_innobase_include_os0sync.h @@ -0,0 +1,22 @@ +$NetBSD: patch-storage_innobase_include_os0sync.h,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +--- storage/innobase/include/os0sync.h.orig 2011-03-31 13:36:18.000000000 +0000 ++++ storage/innobase/include/os0sync.h +@@ -330,7 +330,7 @@ compare to, new_val is the value to swap + (atomic_cas_ulong(ptr, old_val, new_val) == old_val) + + # define os_compare_and_swap_lint(ptr, old_val, new_val) \ +- ((lint)atomic_cas_ulong((ulong_t*) ptr, old_val, new_val) == old_val) ++ ((lint)atomic_cas_ulong((unsigned long*) ptr, old_val, new_val) == old_val) + + # ifdef HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS + # if SIZEOF_PTHREAD_T == 4 +@@ -355,7 +355,7 @@ Returns the resulting value, ptr is poin + amount of increment. */ + + # define os_atomic_increment_lint(ptr, amount) \ +- atomic_add_long_nv((ulong_t*) ptr, amount) ++ atomic_add_long_nv((unsigned long *) ptr, amount) + + # define os_atomic_increment_ulint(ptr, amount) \ + atomic_add_long_nv(ptr, amount) diff --git a/databases/mysql55-client/patches/patch-storage_ndb_include_util_Parser.hpp b/databases/mysql55-client/patches/patch-storage_ndb_include_util_Parser.hpp new file mode 100644 index 00000000000..b41f3df3f02 --- /dev/null +++ b/databases/mysql55-client/patches/patch-storage_ndb_include_util_Parser.hpp @@ -0,0 +1,22 @@ +$NetBSD: patch-storage_ndb_include_util_Parser.hpp,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +Avoid C++ error (needed for Clang). + +--- storage/ndb/include/util/Parser.hpp.orig 2011-03-17 13:15:30.000000000 +0000 ++++ storage/ndb/include/util/Parser.hpp +@@ -148,12 +148,12 @@ public: + static const DummyRow* matchArg(Context*, const char *, const DummyRow *); + static bool parseArg(Context*, char*, const DummyRow*, Properties*); + static bool checkMandatory(Context*, const Properties*); +-private: +- const DummyRow * const m_rows; +- class ParseInputStream & input; + bool m_breakOnEmpty; + bool m_breakOnCmd; + bool m_breakOnInvalidArg; ++private: ++ const DummyRow * const m_rows; ++ class ParseInputStream & input; + }; + + template<class T> diff --git a/databases/mysql55-client/patches/patch-strings_decimal.c b/databases/mysql55-client/patches/patch-strings_decimal.c new file mode 100644 index 00000000000..a4ea7713258 --- /dev/null +++ b/databases/mysql55-client/patches/patch-strings_decimal.c @@ -0,0 +1,16 @@ +$NetBSD: patch-strings_decimal.c,v 1.1.1.1 2011/04/25 21:12:53 adam Exp $ + +* Portability: include <bstring.h> if exists. + +--- strings/decimal.c.orig 2010-02-04 11:40:24.000000000 +0000 ++++ strings/decimal.c +@@ -103,6 +103,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) |