diff options
72 files changed, 1590 insertions, 1824 deletions
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile index a0920329cced..71098d938b2a 100644 --- a/databases/mysql50-server/Makefile +++ b/databases/mysql50-server/Makefile @@ -6,33 +6,34 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.0 -PORTREVISION?= 2 +PORTVERSION= 5.0.1 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-5.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-5.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-5.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-5.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-5.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \ - http://www.mysql.cz/Downloads/MySQL-5.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \ - http://mysql.proserve.nl/Downloads/MySQL-5.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/%SUBDIR%/ \ + http://www.softagency.co.jp/MySQL/Downloads/%SUBDIR%/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/%SUBDIR%/ \ + http://mysql.mediatraffic.fi/Downloads/%SUBDIR%/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/%SUBDIR%/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/%SUBDIR%/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/%SUBDIR%/ \ + http://www.mysql.cz/Downloads/%SUBDIR%/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/%SUBDIR%/ \ + http://mysql.proserve.nl/Downloads/%SUBDIR%/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/%SUBDIR%/ +MASTER_SITE_SUBDIR= MySQL-5.0.1-snapshot PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha - -FORBIDDEN= "http://vuxml.freebsd.org/e5e2883d-ceb9-11d8-8898-000d6111a684.html (security)" +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-snapshot MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha SLAVEDIRS= databases/mysql50-client PKGINSTALL?= ${WRKDIR}/pkg-install DB_DIR?= /var/db/mysql USE_LIBTOOL_VER=15 USE_REINPLACE= yes +USE_RC_SUBR= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ @@ -45,6 +46,7 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ + --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -111,7 +113,8 @@ LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* -PLIST_SUB= DB_DIR=${DB_DIR} +PLIST_SUB= DB_DIR=${DB_DIR} \ + VER=${PORTVERSION}-alpha MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 @@ -130,6 +133,8 @@ pre-fetch: @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." + @${ECHO} " WITH_PROC_SCOPE_PTH=yes Use process scope threads" + @${ECHO} " (try it if you use libpthread)." @${ECHO} " OVERWRITE_DB=yes Re-initialize default databases." @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations" @${ECHO} " (use it if you need speed)." @@ -139,10 +144,14 @@ pre-fetch: post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts man support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in - @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in + @${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in +.if defined(WITH_PROC_SCOPE_PTH) + @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc +.endif post-build: @${SED} "s|%%DB_DIR%%|${DB_DIR}|g" ${PKGDIR}/pkg-install > ${WRKDIR}/pkg-install @@ -163,7 +172,8 @@ post-install: .endif @${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif - @${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%DB_DIR%%|${DB_DIR}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh + @${SED} "s|%%RC_SUBR%%|${RC_SUBR}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%DB_DIR%%|${DB_DIR}|g" < \ + ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/Flags @@ -189,9 +199,13 @@ CONFIGURE_ARGS+=--without-server post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests scripts man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in +.if defined(WITH_PROC_SCOPE_PTH) + @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c +.endif post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh diff --git a/databases/mysql50-server/distinfo b/databases/mysql50-server/distinfo index 43b1f7dfb6bc..58e4ac6083af 100644 --- a/databases/mysql50-server/distinfo +++ b/databases/mysql50-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.0-alpha.tar.gz) = e31664d1172b5823fb8be83051910ee2 -SIZE (mysql-5.0.0-alpha.tar.gz) = 16311204 +MD5 (mysql-5.0.1-alpha-snapshot.tar.gz) = 2a645afc9a8396ffc0fad271367494ea +SIZE (mysql-5.0.1-alpha-snapshot.tar.gz) = 19684742 diff --git a/databases/mysql50-server/files/mysql-server.sh b/databases/mysql50-server/files/mysql-server.sh index 5180b9c0c1eb..708ad57df4b3 100644 --- a/databases/mysql50-server/files/mysql-server.sh +++ b/databases/mysql50-server/files/mysql-server.sh @@ -1,27 +1,51 @@ #!/bin/sh +# +# $FreeBSD$ +# -DB_DIR=%%DB_DIR%% -PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid - -case "$1" in - start) - if [ -x %%PREFIX%%/bin/mysqld_safe ]; then - /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & - echo -n ' mysqld' - fi - ;; - stop) - if [ -f ${PIDFILE} ]; then - /bin/kill `cat ${PIDFILE}` > /dev/null 2>&1 && echo -n ' mysqld' - else - echo "mysql-server isn't running" - fi - ;; - *) - echo "" - echo "Usage: `basename $0` { start | stop }" - echo "" - exit 64 - ;; -esac +# PROVIDE: mysql +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown + +# +# Add the following line to /etc/rc.conf to enable mysql: +# mysql_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable MySQL. +# mysqllimits_enable (bool): Set to "NO" by default. +# Set it to yes to run `limits $limits_args` +# just before mysql starts. +# mysqllimits_args (str): Default to "-e -U mysql" +# Arguments of pre-start limits run. +# + +. %%RC_SUBR%% + +name="mysql" +rcvar=`set_rcvar` +mysql_dbdir="%%DB_DIR%%" +mysql_user="mysql" +pidfile="${mysql_dbdir}/`/bin/hostname`.pid" +command="%%PREFIX%%/bin/mysqld_safe" +command_args="--user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} > /dev/null &" +procname="%%PREFIX%%/libexec/mysqld" +start_precmd="${name}_prestart" + +[ -z "$mysql_enable" ] && mysql_enable="NO" +[ -z "$mysqllimits_enable" ] && mysqllimits_enable="NO" +[ -z "$mysqllimits_args" ] && mysqllimits_args="-e -U ${mysql_user}" + +mysql_prestart() +{ + if checkyesno mysqllimits_enable; then + eval `/usr/bin/limits ${mysqllimits_args}` 2>/dev/null + else + return 0 + fi +} + +required_dirs="${mysql_dbdir}" +required_files="${mysql_dbdir}/mysql/host.frm ${mysql_dbdir}/mysql/user.frm ${mysql_dbdir}/mysql/db.frm" + +load_rc_config $name +run_rc_command "$1" diff --git a/databases/mysql50-server/files/patch-Makefile.in b/databases/mysql50-server/files/patch-Makefile.in index 94f38623fcf4..356baf88b938 100644 --- a/databases/mysql50-server/files/patch-Makefile.in +++ b/databases/mysql50-server/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Dec 1 13:55:28 2003 -+++ Makefile.in Wed Dec 10 00:18:16 2003 -@@ -209,12 +209,7 @@ +--- Makefile.in.orig Tue Jul 27 08:14:34 2004 ++++ Makefile.in Sat Oct 23 10:39:45 2004 +@@ -293,12 +293,7 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING zlib @@ -8,7 +8,7 @@ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests SSL\ -- BUILD @netware_dir@ os2 @libmysqld_dirs@ \ +- BUILD netware os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = diff --git a/databases/mysql50-server/files/patch-client::mysql.cc b/databases/mysql50-server/files/patch-client::mysql.cc new file mode 100644 index 000000000000..7e4fdfa6f22d --- /dev/null +++ b/databases/mysql50-server/files/patch-client::mysql.cc @@ -0,0 +1,11 @@ +--- client/mysql.cc.orig Sun Oct 24 15:54:36 2004 ++++ client/mysql.cc Sun Oct 24 15:55:52 2004 +@@ -294,7 +294,7 @@ + HIST_ENTRY is defined for libedit, but not for the real readline + Need to redefine it for real readline to find it + */ +-#if !defined(USE_LIBEDIT_INTERFACE) ++#if !defined(HAVE_HIST_ENTRY) + typedef struct _hist_entry { + const char *line; + const char *data; diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure index 9eed46865e83..fbbdc8efd9d1 100644 --- a/databases/mysql50-server/files/patch-configure +++ b/databases/mysql50-server/files/patch-configure @@ -9,50 +9,6 @@ # Prevent multiple expansion -@@ -9261,43 +9262,8 @@ - echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 - echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 - PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" - # BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *netware*) -- FIND_PROC= -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 @@ -12678,8 +12644,8 @@ # Some system specific hacks # @@ -64,12 +20,3 @@ case $SYSTEM_TYPE in *solaris2.7*) -@@ -23893,7 +23859,7 @@ - /* ) rel_srcdir="$srcdir" ;; - * ) rel_srcdir="../$srcdir" ;; - esac -- if test "x$enable_dependency_tracking" == xno -+ if test "x$enable_dependency_tracking" = xno - then - innodb_conf_flags=--disable-dependency-tracking - fi diff --git a/databases/mysql50-server/files/patch-scripts::Makefile.in b/databases/mysql50-server/files/patch-scripts::Makefile.in index 9010d283909f..ffef310f740c 100644 --- a/databases/mysql50-server/files/patch-scripts::Makefile.in +++ b/databases/mysql50-server/files/patch-scripts::Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Tue Mar 2 12:25:53 2004 -+++ scripts/Makefile.in Tue Mar 2 12:26:20 2004 -@@ -203,25 +203,7 @@ +--- scripts/Makefile.in.orig Tue Jul 27 08:14:44 2004 ++++ scripts/Makefile.in Sat Oct 23 10:44:33 2004 +@@ -287,26 +287,7 @@ vio_dir = @vio_dir@ vio_libs = @vio_libs@ @@ -22,12 +22,13 @@ - mysql_tableinfo \ - mysqld_multi \ - make_win_src_distribution \ +- make_win_binary_distribution \ - mysql_create_system_tables +bin_SCRIPTS = EXTRA_SCRIPTS = make_binary_distribution.sh \ -@@ -254,7 +236,7 @@ +@@ -340,7 +321,7 @@ mysqlbug @@ -36,7 +37,7 @@ # mysqlbug should be distributed built so that people can report build # failures with it. -@@ -510,8 +492,6 @@ +@@ -616,8 +597,6 @@ all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution diff --git a/databases/mysql50-server/files/patch-scripts::mysql_install_db.sh b/databases/mysql50-server/files/patch-scripts::mysql_install_db.sh deleted file mode 100644 index 1ccb78b2925a..000000000000 --- a/databases/mysql50-server/files/patch-scripts::mysql_install_db.sh +++ /dev/null @@ -1,22 +0,0 @@ ---- scripts/mysql_install_db.sh.orig Thu Mar 11 10:20:57 2004 -+++ scripts/mysql_install_db.sh Thu Mar 11 10:27:09 2004 -@@ -118,7 +118,7 @@ - if [ $? -ne 0 ] - then - resolved=`$bindir/resolveip localhost 2>&1` -- if [ $? -eq 0 ] -+ if [ $? -ne 0 ] - then - echo "Neither host '$hostname' and 'localhost' could not be looked up with" - echo "$bindir/resolveip" -@@ -128,8 +128,8 @@ - exit 1 - fi - echo "WARNING: The host '$hostname' could not be looked up with resolveip." -- echo "This probably means that your libc libraries are not 100 % compatible" -- echo "with this binary MySQL version. The MySQL daemon, mysqld, should work" -+ echo "This probably means that your host name is not listed in your" -+ echo "/etc/hosts file (as it should). The MySQL daemon, mysqld, should work" - echo "normally with the exception that host name resolving will not work." - echo "This means that you should use IP addresses instead of hostnames" - echo "when specifying MySQL privileges !" diff --git a/databases/mysql50-server/files/patch-scripts::mysqlbug.sh b/databases/mysql50-server/files/patch-scripts::mysqlbug.sh deleted file mode 100644 index fa26d2206310..000000000000 --- a/databases/mysql50-server/files/patch-scripts::mysqlbug.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- scripts/mysqlbug.sh.orig Tue May 18 10:20:19 2004 -+++ scripts/mysqlbug.sh Fri May 14 02:53:22 2004 -@@ -254,9 +254,9 @@ - if cmp -s $TEMP $TEMP.x - then - echo "File not changed, no bug report submitted." -- cp $TEMP /tmp/failed-mysql-bugreport -+ mv -f $TEMP /tmp/failed-mysql-bugreport - echo "The raw bug report exists in /tmp/failed-mysql-bugreport" -- echo "If you use this remember that the first lines of the report now is a lie.." -+ echo "If you use this remember that the first lines of the report are now a lie.." - exit 1 - fi - diff --git a/databases/mysql50-server/files/patch-scripts::mysqlhotcopy.sh b/databases/mysql50-server/files/patch-scripts::mysqlhotcopy.sh deleted file mode 100644 index 19d4395fa09f..000000000000 --- a/databases/mysql50-server/files/patch-scripts::mysqlhotcopy.sh +++ /dev/null @@ -1,49 +0,0 @@ ---- scripts/mysqlhotcopy.sh.orig Sun Dec 21 19:01:29 2003 -+++ scripts/mysqlhotcopy.sh Thu Sep 23 11:02:45 2004 -@@ -7,6 +7,7 @@ - use File::Path; - use DBI; - use Sys::Hostname; -+use File::Temp; - - =head1 NAME - -@@ -607,7 +608,6 @@ - sub copy_index - { - my ($method, $files, $source, $target) = @_; -- my $tmpfile="$opt_tmpdir/mysqlhotcopy$$"; - - print "Copying indices for ".@$files." files...\n" unless $opt{quiet}; - foreach my $file (@$files) -@@ -633,23 +633,23 @@ - } - close OUTPUT || die "Error on close of $to: $!\n"; - } -- elsif ($opt{method} eq 'scp') -+ elsif ($opt{method} =~ /^scp\b/) - { -- my $tmp=$tmpfile; -- open(OUTPUT,">$tmp") || die "Can\'t create file $tmp: $!\n"; -- if (syswrite(OUTPUT,$buff) != length($buff)) -+ my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir); -+ die "Can\'t create/open file in $opt_tmpdir\n"; -+ if (syswrite($fh,$buff) != length($buff)) - { - die "Error when writing data to $tmp: $!\n"; - } -- close OUTPUT || die "Error on close of $tmp: $!\n"; -- safe_system("scp $tmp $to"); -+ close $fh || die "Error on close of $tmp: $!\n"; -+ safe_system("$opt{method} $tmp $to"); -+ unlink $tmp; - } - else - { - die "Can't use unsupported method '$opt{method}'\n"; - } - } -- unlink "$tmpfile" if ($opt{method} eq 'scp'); - } - - diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist index b50c526d693f..be85c5051fdf 100644 --- a/databases/mysql50-server/pkg-plist +++ b/databases/mysql50-server/pkg-plist @@ -2,19 +2,54 @@ bin/comp_err bin/isamchk bin/isamlog bin/my_print_defaults +bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_create_system_tables bin/mysql_install_db +bin/mysql_tzinfo_to_sql bin/mysql_waitpid bin/mysqld_safe +bin/ndb_cpcd +bin/ndb_delete_all +bin/ndb_desc +bin/ndb_drop_index +bin/ndb_drop_table +bin/ndb_mgm +bin/ndb_restore +bin/ndb_select_all +bin/ndb_select_count +bin/ndb_show_tables +bin/ndb_waiter bin/pack_isam bin/perror bin/replace bin/resolve_stack_dump bin/resolveip etc/rc.d/mysql-server.sh +include/mysql/ndb/mgmapi/mgmapi.h +include/mysql/ndb/mgmapi/mgmapi_debug.h +include/mysql/ndb/ndb_types.h +include/mysql/ndb/ndb_version.h +include/mysql/ndb/ndbapi/Ndb.hpp +include/mysql/ndb/ndbapi/NdbApi.hpp +include/mysql/ndb/ndbapi/NdbBlob.hpp +include/mysql/ndb/ndbapi/NdbConnection.hpp +include/mysql/ndb/ndbapi/NdbCursorOperation.hpp +include/mysql/ndb/ndbapi/NdbDictionary.hpp +include/mysql/ndb/ndbapi/NdbError.hpp +include/mysql/ndb/ndbapi/NdbEventOperation.hpp +include/mysql/ndb/ndbapi/NdbIndexOperation.hpp +include/mysql/ndb/ndbapi/NdbOperation.hpp +include/mysql/ndb/ndbapi/NdbPool.hpp +include/mysql/ndb/ndbapi/NdbRecAttr.hpp +include/mysql/ndb/ndbapi/NdbReceiver.hpp +include/mysql/ndb/ndbapi/NdbResultSet.hpp +include/mysql/ndb/ndbapi/NdbScanFilter.hpp +include/mysql/ndb/ndbapi/NdbScanOperation.hpp +include/mysql/ndb/ndbapi/ndbapi_limits.h +include/mysql/ndb/ndbapi/ndberror.h lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a @@ -22,9 +57,14 @@ lib/mysql/libmyisam.a lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a +lib/mysql/libndbclient.a +lib/mysql/libndbclient.so +lib/mysql/libndbclient.so.0 lib/mysql/libnisam.a lib/mysql/libvio.a libexec/mysqld +libexec/ndb_mgmd +libexec/ndbd %%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif %%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif %%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif @@ -77,117 +117,125 @@ libexec/mysqld %%PORTDOCS%%%%DOCSDIR%%/manual.html %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/manual_toc.html -share/mysql/Description.plist -share/mysql/Info.plist -share/mysql/MySQL-shared-compat.spec -share/mysql/StartupParameters.plist -share/mysql/postinstall -share/mysql/preinstall -share/mysql/charsets/Index.xml -share/mysql/charsets/README -share/mysql/charsets/armscii8.xml -share/mysql/charsets/ascii.xml -share/mysql/charsets/cp1250.xml -share/mysql/charsets/cp1251.xml -share/mysql/charsets/cp1256.xml -share/mysql/charsets/cp1257.xml -share/mysql/charsets/cp850.xml -share/mysql/charsets/cp852.xml -share/mysql/charsets/cp866.xml -share/mysql/charsets/dec8.xml -share/mysql/charsets/geostd8.xml -share/mysql/charsets/greek.xml -share/mysql/charsets/hebrew.xml -share/mysql/charsets/hp8.xml -share/mysql/charsets/keybcs2.xml -share/mysql/charsets/koi8r.xml -share/mysql/charsets/koi8u.xml -share/mysql/charsets/latin1.xml -share/mysql/charsets/latin2.xml -share/mysql/charsets/latin5.xml -share/mysql/charsets/latin7.xml -share/mysql/charsets/macce.xml -share/mysql/charsets/macroman.xml -share/mysql/charsets/swe7.xml -share/mysql/czech/errmsg.sys -share/mysql/czech/errmsg.txt -share/mysql/danish/errmsg.sys -share/mysql/danish/errmsg.txt -share/mysql/dutch/errmsg.sys -share/mysql/dutch/errmsg.txt -share/mysql/english/errmsg.sys -share/mysql/english/errmsg.txt -share/mysql/estonian/errmsg.sys -share/mysql/estonian/errmsg.txt -share/mysql/fill_help_tables.sql -share/mysql/french/errmsg.sys -share/mysql/french/errmsg.txt -share/mysql/german/errmsg.sys -share/mysql/german/errmsg.txt -share/mysql/greek/errmsg.sys -share/mysql/greek/errmsg.txt -share/mysql/hungarian/errmsg.sys -share/mysql/hungarian/errmsg.txt -share/mysql/italian/errmsg.sys -share/mysql/italian/errmsg.txt -share/mysql/japanese/errmsg.sys -share/mysql/japanese/errmsg.txt -share/mysql/korean/errmsg.sys -share/mysql/korean/errmsg.txt -share/mysql/mi_test_all -share/mysql/mi_test_all.res -share/mysql/my-huge.cnf -share/mysql/my-large.cnf -share/mysql/my-medium.cnf -share/mysql/my-small.cnf -share/mysql/mysql-log-rotate -share/mysql/mysql.server -share/mysql/norwegian-ny/errmsg.sys -share/mysql/norwegian-ny/errmsg.txt -share/mysql/norwegian/errmsg.sys -share/mysql/norwegian/errmsg.txt -share/mysql/polish/errmsg.sys -share/mysql/polish/errmsg.txt -share/mysql/portuguese/errmsg.sys -share/mysql/portuguese/errmsg.txt -share/mysql/romanian/errmsg.sys -share/mysql/romanian/errmsg.txt -share/mysql/russian/errmsg.sys -share/mysql/russian/errmsg.txt -share/mysql/slovak/errmsg.sys -share/mysql/slovak/errmsg.txt -share/mysql/spanish/errmsg.sys -share/mysql/spanish/errmsg.txt -share/mysql/swedish/errmsg.sys -share/mysql/swedish/errmsg.txt -share/mysql/ukrainian/errmsg.sys -share/mysql/ukrainian/errmsg.txt +%%DATADIR%%/Description.plist +%%DATADIR%%/Info.plist +%%DATADIR%%/MySQL-shared-compat.spec +%%DATADIR%%/StartupParameters.plist +%%DATADIR%%/postinstall +%%DATADIR%%/preinstall +%%DATADIR%%/charsets/Index.xml +%%DATADIR%%/charsets/README +%%DATADIR%%/charsets/armscii8.xml +%%DATADIR%%/charsets/ascii.xml +%%DATADIR%%/charsets/cp1250.xml +%%DATADIR%%/charsets/cp1251.xml +%%DATADIR%%/charsets/cp1256.xml +%%DATADIR%%/charsets/cp1257.xml +%%DATADIR%%/charsets/cp850.xml +%%DATADIR%%/charsets/cp852.xml +%%DATADIR%%/charsets/cp866.xml +%%DATADIR%%/charsets/dec8.xml +%%DATADIR%%/charsets/geostd8.xml +%%DATADIR%%/charsets/greek.xml +%%DATADIR%%/charsets/hebrew.xml +%%DATADIR%%/charsets/hp8.xml +%%DATADIR%%/charsets/keybcs2.xml +%%DATADIR%%/charsets/koi8r.xml +%%DATADIR%%/charsets/koi8u.xml +%%DATADIR%%/charsets/latin1.xml +%%DATADIR%%/charsets/latin2.xml +%%DATADIR%%/charsets/latin5.xml +%%DATADIR%%/charsets/latin7.xml +%%DATADIR%%/charsets/macce.xml +%%DATADIR%%/charsets/macroman.xml +%%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/czech/errmsg.sys +%%DATADIR%%/czech/errmsg.txt +%%DATADIR%%/danish/errmsg.sys +%%DATADIR%%/danish/errmsg.txt +%%DATADIR%%/dutch/errmsg.sys +%%DATADIR%%/dutch/errmsg.txt +%%DATADIR%%/english/errmsg.sys +%%DATADIR%%/english/errmsg.txt +%%DATADIR%%/estonian/errmsg.sys +%%DATADIR%%/estonian/errmsg.txt +%%DATADIR%%/fill_help_tables.sql +%%DATADIR%%/french/errmsg.sys +%%DATADIR%%/french/errmsg.txt +%%DATADIR%%/german/errmsg.sys +%%DATADIR%%/german/errmsg.txt +%%DATADIR%%/greek/errmsg.sys +%%DATADIR%%/greek/errmsg.txt +%%DATADIR%%/hungarian/errmsg.sys +%%DATADIR%%/hungarian/errmsg.txt +%%DATADIR%%/italian/errmsg.sys +%%DATADIR%%/italian/errmsg.txt +%%DATADIR%%/japanese/errmsg.sys +%%DATADIR%%/japanese/errmsg.txt +%%DATADIR%%/korean/errmsg.sys +%%DATADIR%%/korean/errmsg.txt +%%DATADIR%%/mi_test_all +%%DATADIR%%/mi_test_all.res +%%DATADIR%%/my-huge.cnf +%%DATADIR%%/my-large.cnf +%%DATADIR%%/my-medium.cnf +%%DATADIR%%/my-small.cnf +%%DATADIR%%/mysql-log-rotate +%%DATADIR%%/mysql-%%VER%%.spec +%%DATADIR%%/mysql.server +%%DATADIR%%/norwegian-ny/errmsg.sys +%%DATADIR%%/norwegian-ny/errmsg.txt +%%DATADIR%%/norwegian/errmsg.sys +%%DATADIR%%/norwegian/errmsg.txt +%%DATADIR%%/polish/errmsg.sys +%%DATADIR%%/polish/errmsg.txt +%%DATADIR%%/portuguese/errmsg.sys +%%DATADIR%%/portuguese/errmsg.txt +%%DATADIR%%/romanian/errmsg.sys +%%DATADIR%%/romanian/errmsg.txt +%%DATADIR%%/russian/errmsg.sys +%%DATADIR%%/russian/errmsg.txt +%%DATADIR%%/serbian/errmsg.sys +%%DATADIR%%/serbian/errmsg.txt +%%DATADIR%%/slovak/errmsg.sys +%%DATADIR%%/slovak/errmsg.txt +%%DATADIR%%/spanish/errmsg.sys +%%DATADIR%%/spanish/errmsg.txt +%%DATADIR%%/swedish/errmsg.sys +%%DATADIR%%/swedish/errmsg.txt +%%DATADIR%%/ukrainian/errmsg.sys +%%DATADIR%%/ukrainian/errmsg.txt +@dirrm include/mysql/ndb/mgmapi +@dirrm include/mysql/ndb/ndbapi +@dirrm include/mysql/ndb +@unexec rmdir %D/include/mysql 2> /dev/null || true @unexec rmdir %D/lib/mysql 2> /dev/null || true %%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm share/mysql/charsets -@dirrm share/mysql/czech -@dirrm share/mysql/danish -@dirrm share/mysql/dutch -@dirrm share/mysql/english -@dirrm share/mysql/estonian -@dirrm share/mysql/french -@dirrm share/mysql/german -@dirrm share/mysql/greek -@dirrm share/mysql/hungarian -@dirrm share/mysql/italian -@dirrm share/mysql/japanese -@dirrm share/mysql/korean -@dirrm share/mysql/norwegian -@dirrm share/mysql/norwegian-ny -@dirrm share/mysql/polish -@dirrm share/mysql/portuguese -@dirrm share/mysql/romanian -@dirrm share/mysql/russian -@dirrm share/mysql/slovak -@dirrm share/mysql/spanish -@dirrm share/mysql/swedish -@dirrm share/mysql/ukrainian -@unexec rmdir %D/share/mysql 2> /dev/null || true +@dirrm %%DATADIR%%/charsets +@dirrm %%DATADIR%%/czech +@dirrm %%DATADIR%%/danish +@dirrm %%DATADIR%%/dutch +@dirrm %%DATADIR%%/english +@dirrm %%DATADIR%%/estonian +@dirrm %%DATADIR%%/french +@dirrm %%DATADIR%%/german +@dirrm %%DATADIR%%/greek +@dirrm %%DATADIR%%/hungarian +@dirrm %%DATADIR%%/italian +@dirrm %%DATADIR%%/japanese +@dirrm %%DATADIR%%/korean +@dirrm %%DATADIR%%/norwegian +@dirrm %%DATADIR%%/norwegian-ny +@dirrm %%DATADIR%%/polish +@dirrm %%DATADIR%%/portuguese +@dirrm %%DATADIR%%/romanian +@dirrm %%DATADIR%%/russian +@dirrm %%DATADIR%%/serbian +@dirrm %%DATADIR%%/slovak +@dirrm %%DATADIR%%/spanish +@dirrm %%DATADIR%%/swedish +@dirrm %%DATADIR%%/ukrainian +@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true @exec [ -d %%DB_DIR%% ] || %D/bin/mysql_install_db --ldata=%%DB_DIR%% @unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql50-server/pkg-plist.client b/databases/mysql50-server/pkg-plist.client index e260e22590c8..ab0454713675 100644 --- a/databases/mysql50-server/pkg-plist.client +++ b/databases/mysql50-server/pkg-plist.client @@ -32,6 +32,7 @@ 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_error.h include/mysql/raid.h @@ -47,7 +48,7 @@ lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.14 -share/mysql/mysql_fix_privilege_tables.sql +%%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql -@dirrm share/mysql +@dirrm %%DATADIR%% diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index a0920329cced..71098d938b2a 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -6,33 +6,34 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.0 -PORTREVISION?= 2 +PORTVERSION= 5.0.1 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-5.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-5.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-5.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-5.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-5.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \ - http://www.mysql.cz/Downloads/MySQL-5.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \ - http://mysql.proserve.nl/Downloads/MySQL-5.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/%SUBDIR%/ \ + http://www.softagency.co.jp/MySQL/Downloads/%SUBDIR%/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/%SUBDIR%/ \ + http://mysql.mediatraffic.fi/Downloads/%SUBDIR%/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/%SUBDIR%/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/%SUBDIR%/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/%SUBDIR%/ \ + http://www.mysql.cz/Downloads/%SUBDIR%/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/%SUBDIR%/ \ + http://mysql.proserve.nl/Downloads/%SUBDIR%/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/%SUBDIR%/ +MASTER_SITE_SUBDIR= MySQL-5.0.1-snapshot PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha - -FORBIDDEN= "http://vuxml.freebsd.org/e5e2883d-ceb9-11d8-8898-000d6111a684.html (security)" +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-snapshot MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha SLAVEDIRS= databases/mysql50-client PKGINSTALL?= ${WRKDIR}/pkg-install DB_DIR?= /var/db/mysql USE_LIBTOOL_VER=15 USE_REINPLACE= yes +USE_RC_SUBR= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ @@ -45,6 +46,7 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ + --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -111,7 +113,8 @@ LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* -PLIST_SUB= DB_DIR=${DB_DIR} +PLIST_SUB= DB_DIR=${DB_DIR} \ + VER=${PORTVERSION}-alpha MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 @@ -130,6 +133,8 @@ pre-fetch: @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." + @${ECHO} " WITH_PROC_SCOPE_PTH=yes Use process scope threads" + @${ECHO} " (try it if you use libpthread)." @${ECHO} " OVERWRITE_DB=yes Re-initialize default databases." @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations" @${ECHO} " (use it if you need speed)." @@ -139,10 +144,14 @@ pre-fetch: post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts man support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in - @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in + @${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in +.if defined(WITH_PROC_SCOPE_PTH) + @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc +.endif post-build: @${SED} "s|%%DB_DIR%%|${DB_DIR}|g" ${PKGDIR}/pkg-install > ${WRKDIR}/pkg-install @@ -163,7 +172,8 @@ post-install: .endif @${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif - @${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%DB_DIR%%|${DB_DIR}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh + @${SED} "s|%%RC_SUBR%%|${RC_SUBR}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%DB_DIR%%|${DB_DIR}|g" < \ + ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/Flags @@ -189,9 +199,13 @@ CONFIGURE_ARGS+=--without-server post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests scripts man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in +.if defined(WITH_PROC_SCOPE_PTH) + @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c +.endif post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo index 43b1f7dfb6bc..58e4ac6083af 100644 --- a/databases/mysql51-server/distinfo +++ b/databases/mysql51-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.0-alpha.tar.gz) = e31664d1172b5823fb8be83051910ee2 -SIZE (mysql-5.0.0-alpha.tar.gz) = 16311204 +MD5 (mysql-5.0.1-alpha-snapshot.tar.gz) = 2a645afc9a8396ffc0fad271367494ea +SIZE (mysql-5.0.1-alpha-snapshot.tar.gz) = 19684742 diff --git a/databases/mysql51-server/files/mysql-server.sh b/databases/mysql51-server/files/mysql-server.sh index 5180b9c0c1eb..708ad57df4b3 100644 --- a/databases/mysql51-server/files/mysql-server.sh +++ b/databases/mysql51-server/files/mysql-server.sh @@ -1,27 +1,51 @@ #!/bin/sh +# +# $FreeBSD$ +# -DB_DIR=%%DB_DIR%% -PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid - -case "$1" in - start) - if [ -x %%PREFIX%%/bin/mysqld_safe ]; then - /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & - echo -n ' mysqld' - fi - ;; - stop) - if [ -f ${PIDFILE} ]; then - /bin/kill `cat ${PIDFILE}` > /dev/null 2>&1 && echo -n ' mysqld' - else - echo "mysql-server isn't running" - fi - ;; - *) - echo "" - echo "Usage: `basename $0` { start | stop }" - echo "" - exit 64 - ;; -esac +# PROVIDE: mysql +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown + +# +# Add the following line to /etc/rc.conf to enable mysql: +# mysql_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable MySQL. +# mysqllimits_enable (bool): Set to "NO" by default. +# Set it to yes to run `limits $limits_args` +# just before mysql starts. +# mysqllimits_args (str): Default to "-e -U mysql" +# Arguments of pre-start limits run. +# + +. %%RC_SUBR%% + +name="mysql" +rcvar=`set_rcvar` +mysql_dbdir="%%DB_DIR%%" +mysql_user="mysql" +pidfile="${mysql_dbdir}/`/bin/hostname`.pid" +command="%%PREFIX%%/bin/mysqld_safe" +command_args="--user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} > /dev/null &" +procname="%%PREFIX%%/libexec/mysqld" +start_precmd="${name}_prestart" + +[ -z "$mysql_enable" ] && mysql_enable="NO" +[ -z "$mysqllimits_enable" ] && mysqllimits_enable="NO" +[ -z "$mysqllimits_args" ] && mysqllimits_args="-e -U ${mysql_user}" + +mysql_prestart() +{ + if checkyesno mysqllimits_enable; then + eval `/usr/bin/limits ${mysqllimits_args}` 2>/dev/null + else + return 0 + fi +} + +required_dirs="${mysql_dbdir}" +required_files="${mysql_dbdir}/mysql/host.frm ${mysql_dbdir}/mysql/user.frm ${mysql_dbdir}/mysql/db.frm" + +load_rc_config $name +run_rc_command "$1" diff --git a/databases/mysql51-server/files/patch-Makefile.in b/databases/mysql51-server/files/patch-Makefile.in index 94f38623fcf4..356baf88b938 100644 --- a/databases/mysql51-server/files/patch-Makefile.in +++ b/databases/mysql51-server/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Dec 1 13:55:28 2003 -+++ Makefile.in Wed Dec 10 00:18:16 2003 -@@ -209,12 +209,7 @@ +--- Makefile.in.orig Tue Jul 27 08:14:34 2004 ++++ Makefile.in Sat Oct 23 10:39:45 2004 +@@ -293,12 +293,7 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING zlib @@ -8,7 +8,7 @@ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests SSL\ -- BUILD @netware_dir@ os2 @libmysqld_dirs@ \ +- BUILD netware os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = diff --git a/databases/mysql51-server/files/patch-client::mysql.cc b/databases/mysql51-server/files/patch-client::mysql.cc new file mode 100644 index 000000000000..7e4fdfa6f22d --- /dev/null +++ b/databases/mysql51-server/files/patch-client::mysql.cc @@ -0,0 +1,11 @@ +--- client/mysql.cc.orig Sun Oct 24 15:54:36 2004 ++++ client/mysql.cc Sun Oct 24 15:55:52 2004 +@@ -294,7 +294,7 @@ + HIST_ENTRY is defined for libedit, but not for the real readline + Need to redefine it for real readline to find it + */ +-#if !defined(USE_LIBEDIT_INTERFACE) ++#if !defined(HAVE_HIST_ENTRY) + typedef struct _hist_entry { + const char *line; + const char *data; diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure index 9eed46865e83..fbbdc8efd9d1 100644 --- a/databases/mysql51-server/files/patch-configure +++ b/databases/mysql51-server/files/patch-configure @@ -9,50 +9,6 @@ # Prevent multiple expansion -@@ -9261,43 +9262,8 @@ - echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 - echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 - PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" - # BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *netware*) -- FIND_PROC= -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 @@ -12678,8 +12644,8 @@ # Some system specific hacks # @@ -64,12 +20,3 @@ case $SYSTEM_TYPE in *solaris2.7*) -@@ -23893,7 +23859,7 @@ - /* ) rel_srcdir="$srcdir" ;; - * ) rel_srcdir="../$srcdir" ;; - esac -- if test "x$enable_dependency_tracking" == xno -+ if test "x$enable_dependency_tracking" = xno - then - innodb_conf_flags=--disable-dependency-tracking - fi diff --git a/databases/mysql51-server/files/patch-scripts::Makefile.in b/databases/mysql51-server/files/patch-scripts::Makefile.in index 9010d283909f..ffef310f740c 100644 --- a/databases/mysql51-server/files/patch-scripts::Makefile.in +++ b/databases/mysql51-server/files/patch-scripts::Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Tue Mar 2 12:25:53 2004 -+++ scripts/Makefile.in Tue Mar 2 12:26:20 2004 -@@ -203,25 +203,7 @@ +--- scripts/Makefile.in.orig Tue Jul 27 08:14:44 2004 ++++ scripts/Makefile.in Sat Oct 23 10:44:33 2004 +@@ -287,26 +287,7 @@ vio_dir = @vio_dir@ vio_libs = @vio_libs@ @@ -22,12 +22,13 @@ - mysql_tableinfo \ - mysqld_multi \ - make_win_src_distribution \ +- make_win_binary_distribution \ - mysql_create_system_tables +bin_SCRIPTS = EXTRA_SCRIPTS = make_binary_distribution.sh \ -@@ -254,7 +236,7 @@ +@@ -340,7 +321,7 @@ mysqlbug @@ -36,7 +37,7 @@ # mysqlbug should be distributed built so that people can report build # failures with it. -@@ -510,8 +492,6 @@ +@@ -616,8 +597,6 @@ all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution diff --git a/databases/mysql51-server/files/patch-scripts::mysql_install_db.sh b/databases/mysql51-server/files/patch-scripts::mysql_install_db.sh deleted file mode 100644 index 1ccb78b2925a..000000000000 --- a/databases/mysql51-server/files/patch-scripts::mysql_install_db.sh +++ /dev/null @@ -1,22 +0,0 @@ ---- scripts/mysql_install_db.sh.orig Thu Mar 11 10:20:57 2004 -+++ scripts/mysql_install_db.sh Thu Mar 11 10:27:09 2004 -@@ -118,7 +118,7 @@ - if [ $? -ne 0 ] - then - resolved=`$bindir/resolveip localhost 2>&1` -- if [ $? -eq 0 ] -+ if [ $? -ne 0 ] - then - echo "Neither host '$hostname' and 'localhost' could not be looked up with" - echo "$bindir/resolveip" -@@ -128,8 +128,8 @@ - exit 1 - fi - echo "WARNING: The host '$hostname' could not be looked up with resolveip." -- echo "This probably means that your libc libraries are not 100 % compatible" -- echo "with this binary MySQL version. The MySQL daemon, mysqld, should work" -+ echo "This probably means that your host name is not listed in your" -+ echo "/etc/hosts file (as it should). The MySQL daemon, mysqld, should work" - echo "normally with the exception that host name resolving will not work." - echo "This means that you should use IP addresses instead of hostnames" - echo "when specifying MySQL privileges !" diff --git a/databases/mysql51-server/files/patch-scripts::mysqlbug.sh b/databases/mysql51-server/files/patch-scripts::mysqlbug.sh deleted file mode 100644 index fa26d2206310..000000000000 --- a/databases/mysql51-server/files/patch-scripts::mysqlbug.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- scripts/mysqlbug.sh.orig Tue May 18 10:20:19 2004 -+++ scripts/mysqlbug.sh Fri May 14 02:53:22 2004 -@@ -254,9 +254,9 @@ - if cmp -s $TEMP $TEMP.x - then - echo "File not changed, no bug report submitted." -- cp $TEMP /tmp/failed-mysql-bugreport -+ mv -f $TEMP /tmp/failed-mysql-bugreport - echo "The raw bug report exists in /tmp/failed-mysql-bugreport" -- echo "If you use this remember that the first lines of the report now is a lie.." -+ echo "If you use this remember that the first lines of the report are now a lie.." - exit 1 - fi - diff --git a/databases/mysql51-server/files/patch-scripts::mysqlhotcopy.sh b/databases/mysql51-server/files/patch-scripts::mysqlhotcopy.sh deleted file mode 100644 index 19d4395fa09f..000000000000 --- a/databases/mysql51-server/files/patch-scripts::mysqlhotcopy.sh +++ /dev/null @@ -1,49 +0,0 @@ ---- scripts/mysqlhotcopy.sh.orig Sun Dec 21 19:01:29 2003 -+++ scripts/mysqlhotcopy.sh Thu Sep 23 11:02:45 2004 -@@ -7,6 +7,7 @@ - use File::Path; - use DBI; - use Sys::Hostname; -+use File::Temp; - - =head1 NAME - -@@ -607,7 +608,6 @@ - sub copy_index - { - my ($method, $files, $source, $target) = @_; -- my $tmpfile="$opt_tmpdir/mysqlhotcopy$$"; - - print "Copying indices for ".@$files." files...\n" unless $opt{quiet}; - foreach my $file (@$files) -@@ -633,23 +633,23 @@ - } - close OUTPUT || die "Error on close of $to: $!\n"; - } -- elsif ($opt{method} eq 'scp') -+ elsif ($opt{method} =~ /^scp\b/) - { -- my $tmp=$tmpfile; -- open(OUTPUT,">$tmp") || die "Can\'t create file $tmp: $!\n"; -- if (syswrite(OUTPUT,$buff) != length($buff)) -+ my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir); -+ die "Can\'t create/open file in $opt_tmpdir\n"; -+ if (syswrite($fh,$buff) != length($buff)) - { - die "Error when writing data to $tmp: $!\n"; - } -- close OUTPUT || die "Error on close of $tmp: $!\n"; -- safe_system("scp $tmp $to"); -+ close $fh || die "Error on close of $tmp: $!\n"; -+ safe_system("$opt{method} $tmp $to"); -+ unlink $tmp; - } - else - { - die "Can't use unsupported method '$opt{method}'\n"; - } - } -- unlink "$tmpfile" if ($opt{method} eq 'scp'); - } - - diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist index b50c526d693f..be85c5051fdf 100644 --- a/databases/mysql51-server/pkg-plist +++ b/databases/mysql51-server/pkg-plist @@ -2,19 +2,54 @@ bin/comp_err bin/isamchk bin/isamlog bin/my_print_defaults +bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_create_system_tables bin/mysql_install_db +bin/mysql_tzinfo_to_sql bin/mysql_waitpid bin/mysqld_safe +bin/ndb_cpcd +bin/ndb_delete_all +bin/ndb_desc +bin/ndb_drop_index +bin/ndb_drop_table +bin/ndb_mgm +bin/ndb_restore +bin/ndb_select_all +bin/ndb_select_count +bin/ndb_show_tables +bin/ndb_waiter bin/pack_isam bin/perror bin/replace bin/resolve_stack_dump bin/resolveip etc/rc.d/mysql-server.sh +include/mysql/ndb/mgmapi/mgmapi.h +include/mysql/ndb/mgmapi/mgmapi_debug.h +include/mysql/ndb/ndb_types.h +include/mysql/ndb/ndb_version.h +include/mysql/ndb/ndbapi/Ndb.hpp +include/mysql/ndb/ndbapi/NdbApi.hpp +include/mysql/ndb/ndbapi/NdbBlob.hpp +include/mysql/ndb/ndbapi/NdbConnection.hpp +include/mysql/ndb/ndbapi/NdbCursorOperation.hpp +include/mysql/ndb/ndbapi/NdbDictionary.hpp +include/mysql/ndb/ndbapi/NdbError.hpp +include/mysql/ndb/ndbapi/NdbEventOperation.hpp +include/mysql/ndb/ndbapi/NdbIndexOperation.hpp +include/mysql/ndb/ndbapi/NdbOperation.hpp +include/mysql/ndb/ndbapi/NdbPool.hpp +include/mysql/ndb/ndbapi/NdbRecAttr.hpp +include/mysql/ndb/ndbapi/NdbReceiver.hpp +include/mysql/ndb/ndbapi/NdbResultSet.hpp +include/mysql/ndb/ndbapi/NdbScanFilter.hpp +include/mysql/ndb/ndbapi/NdbScanOperation.hpp +include/mysql/ndb/ndbapi/ndbapi_limits.h +include/mysql/ndb/ndbapi/ndberror.h lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a @@ -22,9 +57,14 @@ lib/mysql/libmyisam.a lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a +lib/mysql/libndbclient.a +lib/mysql/libndbclient.so +lib/mysql/libndbclient.so.0 lib/mysql/libnisam.a lib/mysql/libvio.a libexec/mysqld +libexec/ndb_mgmd +libexec/ndbd %%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif %%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif %%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif @@ -77,117 +117,125 @@ libexec/mysqld %%PORTDOCS%%%%DOCSDIR%%/manual.html %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/manual_toc.html -share/mysql/Description.plist -share/mysql/Info.plist -share/mysql/MySQL-shared-compat.spec -share/mysql/StartupParameters.plist -share/mysql/postinstall -share/mysql/preinstall -share/mysql/charsets/Index.xml -share/mysql/charsets/README -share/mysql/charsets/armscii8.xml -share/mysql/charsets/ascii.xml -share/mysql/charsets/cp1250.xml -share/mysql/charsets/cp1251.xml -share/mysql/charsets/cp1256.xml -share/mysql/charsets/cp1257.xml -share/mysql/charsets/cp850.xml -share/mysql/charsets/cp852.xml -share/mysql/charsets/cp866.xml -share/mysql/charsets/dec8.xml -share/mysql/charsets/geostd8.xml -share/mysql/charsets/greek.xml -share/mysql/charsets/hebrew.xml -share/mysql/charsets/hp8.xml -share/mysql/charsets/keybcs2.xml -share/mysql/charsets/koi8r.xml -share/mysql/charsets/koi8u.xml -share/mysql/charsets/latin1.xml -share/mysql/charsets/latin2.xml -share/mysql/charsets/latin5.xml -share/mysql/charsets/latin7.xml -share/mysql/charsets/macce.xml -share/mysql/charsets/macroman.xml -share/mysql/charsets/swe7.xml -share/mysql/czech/errmsg.sys -share/mysql/czech/errmsg.txt -share/mysql/danish/errmsg.sys -share/mysql/danish/errmsg.txt -share/mysql/dutch/errmsg.sys -share/mysql/dutch/errmsg.txt -share/mysql/english/errmsg.sys -share/mysql/english/errmsg.txt -share/mysql/estonian/errmsg.sys -share/mysql/estonian/errmsg.txt -share/mysql/fill_help_tables.sql -share/mysql/french/errmsg.sys -share/mysql/french/errmsg.txt -share/mysql/german/errmsg.sys -share/mysql/german/errmsg.txt -share/mysql/greek/errmsg.sys -share/mysql/greek/errmsg.txt -share/mysql/hungarian/errmsg.sys -share/mysql/hungarian/errmsg.txt -share/mysql/italian/errmsg.sys -share/mysql/italian/errmsg.txt -share/mysql/japanese/errmsg.sys -share/mysql/japanese/errmsg.txt -share/mysql/korean/errmsg.sys -share/mysql/korean/errmsg.txt -share/mysql/mi_test_all -share/mysql/mi_test_all.res -share/mysql/my-huge.cnf -share/mysql/my-large.cnf -share/mysql/my-medium.cnf -share/mysql/my-small.cnf -share/mysql/mysql-log-rotate -share/mysql/mysql.server -share/mysql/norwegian-ny/errmsg.sys -share/mysql/norwegian-ny/errmsg.txt -share/mysql/norwegian/errmsg.sys -share/mysql/norwegian/errmsg.txt -share/mysql/polish/errmsg.sys -share/mysql/polish/errmsg.txt -share/mysql/portuguese/errmsg.sys -share/mysql/portuguese/errmsg.txt -share/mysql/romanian/errmsg.sys -share/mysql/romanian/errmsg.txt -share/mysql/russian/errmsg.sys -share/mysql/russian/errmsg.txt -share/mysql/slovak/errmsg.sys -share/mysql/slovak/errmsg.txt -share/mysql/spanish/errmsg.sys -share/mysql/spanish/errmsg.txt -share/mysql/swedish/errmsg.sys -share/mysql/swedish/errmsg.txt -share/mysql/ukrainian/errmsg.sys -share/mysql/ukrainian/errmsg.txt +%%DATADIR%%/Description.plist +%%DATADIR%%/Info.plist +%%DATADIR%%/MySQL-shared-compat.spec +%%DATADIR%%/StartupParameters.plist +%%DATADIR%%/postinstall +%%DATADIR%%/preinstall +%%DATADIR%%/charsets/Index.xml +%%DATADIR%%/charsets/README +%%DATADIR%%/charsets/armscii8.xml +%%DATADIR%%/charsets/ascii.xml +%%DATADIR%%/charsets/cp1250.xml +%%DATADIR%%/charsets/cp1251.xml +%%DATADIR%%/charsets/cp1256.xml +%%DATADIR%%/charsets/cp1257.xml +%%DATADIR%%/charsets/cp850.xml +%%DATADIR%%/charsets/cp852.xml +%%DATADIR%%/charsets/cp866.xml +%%DATADIR%%/charsets/dec8.xml +%%DATADIR%%/charsets/geostd8.xml +%%DATADIR%%/charsets/greek.xml +%%DATADIR%%/charsets/hebrew.xml +%%DATADIR%%/charsets/hp8.xml +%%DATADIR%%/charsets/keybcs2.xml +%%DATADIR%%/charsets/koi8r.xml +%%DATADIR%%/charsets/koi8u.xml +%%DATADIR%%/charsets/latin1.xml +%%DATADIR%%/charsets/latin2.xml +%%DATADIR%%/charsets/latin5.xml +%%DATADIR%%/charsets/latin7.xml +%%DATADIR%%/charsets/macce.xml +%%DATADIR%%/charsets/macroman.xml +%%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/czech/errmsg.sys +%%DATADIR%%/czech/errmsg.txt +%%DATADIR%%/danish/errmsg.sys +%%DATADIR%%/danish/errmsg.txt +%%DATADIR%%/dutch/errmsg.sys +%%DATADIR%%/dutch/errmsg.txt +%%DATADIR%%/english/errmsg.sys +%%DATADIR%%/english/errmsg.txt +%%DATADIR%%/estonian/errmsg.sys +%%DATADIR%%/estonian/errmsg.txt +%%DATADIR%%/fill_help_tables.sql +%%DATADIR%%/french/errmsg.sys +%%DATADIR%%/french/errmsg.txt +%%DATADIR%%/german/errmsg.sys +%%DATADIR%%/german/errmsg.txt +%%DATADIR%%/greek/errmsg.sys +%%DATADIR%%/greek/errmsg.txt +%%DATADIR%%/hungarian/errmsg.sys +%%DATADIR%%/hungarian/errmsg.txt +%%DATADIR%%/italian/errmsg.sys +%%DATADIR%%/italian/errmsg.txt +%%DATADIR%%/japanese/errmsg.sys +%%DATADIR%%/japanese/errmsg.txt +%%DATADIR%%/korean/errmsg.sys +%%DATADIR%%/korean/errmsg.txt +%%DATADIR%%/mi_test_all +%%DATADIR%%/mi_test_all.res +%%DATADIR%%/my-huge.cnf +%%DATADIR%%/my-large.cnf +%%DATADIR%%/my-medium.cnf +%%DATADIR%%/my-small.cnf +%%DATADIR%%/mysql-log-rotate +%%DATADIR%%/mysql-%%VER%%.spec +%%DATADIR%%/mysql.server +%%DATADIR%%/norwegian-ny/errmsg.sys +%%DATADIR%%/norwegian-ny/errmsg.txt +%%DATADIR%%/norwegian/errmsg.sys +%%DATADIR%%/norwegian/errmsg.txt +%%DATADIR%%/polish/errmsg.sys +%%DATADIR%%/polish/errmsg.txt +%%DATADIR%%/portuguese/errmsg.sys +%%DATADIR%%/portuguese/errmsg.txt +%%DATADIR%%/romanian/errmsg.sys +%%DATADIR%%/romanian/errmsg.txt +%%DATADIR%%/russian/errmsg.sys +%%DATADIR%%/russian/errmsg.txt +%%DATADIR%%/serbian/errmsg.sys +%%DATADIR%%/serbian/errmsg.txt +%%DATADIR%%/slovak/errmsg.sys +%%DATADIR%%/slovak/errmsg.txt +%%DATADIR%%/spanish/errmsg.sys +%%DATADIR%%/spanish/errmsg.txt +%%DATADIR%%/swedish/errmsg.sys +%%DATADIR%%/swedish/errmsg.txt +%%DATADIR%%/ukrainian/errmsg.sys +%%DATADIR%%/ukrainian/errmsg.txt +@dirrm include/mysql/ndb/mgmapi +@dirrm include/mysql/ndb/ndbapi +@dirrm include/mysql/ndb +@unexec rmdir %D/include/mysql 2> /dev/null || true @unexec rmdir %D/lib/mysql 2> /dev/null || true %%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm share/mysql/charsets -@dirrm share/mysql/czech -@dirrm share/mysql/danish -@dirrm share/mysql/dutch -@dirrm share/mysql/english -@dirrm share/mysql/estonian -@dirrm share/mysql/french -@dirrm share/mysql/german -@dirrm share/mysql/greek -@dirrm share/mysql/hungarian -@dirrm share/mysql/italian -@dirrm share/mysql/japanese -@dirrm share/mysql/korean -@dirrm share/mysql/norwegian -@dirrm share/mysql/norwegian-ny -@dirrm share/mysql/polish -@dirrm share/mysql/portuguese -@dirrm share/mysql/romanian -@dirrm share/mysql/russian -@dirrm share/mysql/slovak -@dirrm share/mysql/spanish -@dirrm share/mysql/swedish -@dirrm share/mysql/ukrainian -@unexec rmdir %D/share/mysql 2> /dev/null || true +@dirrm %%DATADIR%%/charsets +@dirrm %%DATADIR%%/czech +@dirrm %%DATADIR%%/danish +@dirrm %%DATADIR%%/dutch +@dirrm %%DATADIR%%/english +@dirrm %%DATADIR%%/estonian +@dirrm %%DATADIR%%/french +@dirrm %%DATADIR%%/german +@dirrm %%DATADIR%%/greek +@dirrm %%DATADIR%%/hungarian +@dirrm %%DATADIR%%/italian +@dirrm %%DATADIR%%/japanese +@dirrm %%DATADIR%%/korean +@dirrm %%DATADIR%%/norwegian +@dirrm %%DATADIR%%/norwegian-ny +@dirrm %%DATADIR%%/polish +@dirrm %%DATADIR%%/portuguese +@dirrm %%DATADIR%%/romanian +@dirrm %%DATADIR%%/russian +@dirrm %%DATADIR%%/serbian +@dirrm %%DATADIR%%/slovak +@dirrm %%DATADIR%%/spanish +@dirrm %%DATADIR%%/swedish +@dirrm %%DATADIR%%/ukrainian +@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true @exec [ -d %%DB_DIR%% ] || %D/bin/mysql_install_db --ldata=%%DB_DIR%% @unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client index e260e22590c8..ab0454713675 100644 --- a/databases/mysql51-server/pkg-plist.client +++ b/databases/mysql51-server/pkg-plist.client @@ -32,6 +32,7 @@ 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_error.h include/mysql/raid.h @@ -47,7 +48,7 @@ lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.14 -share/mysql/mysql_fix_privilege_tables.sql +%%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql -@dirrm share/mysql +@dirrm %%DATADIR%% diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile index a0920329cced..71098d938b2a 100644 --- a/databases/mysql54-server/Makefile +++ b/databases/mysql54-server/Makefile @@ -6,33 +6,34 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.0 -PORTREVISION?= 2 +PORTVERSION= 5.0.1 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-5.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-5.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-5.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-5.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-5.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \ - http://www.mysql.cz/Downloads/MySQL-5.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \ - http://mysql.proserve.nl/Downloads/MySQL-5.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/%SUBDIR%/ \ + http://www.softagency.co.jp/MySQL/Downloads/%SUBDIR%/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/%SUBDIR%/ \ + http://mysql.mediatraffic.fi/Downloads/%SUBDIR%/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/%SUBDIR%/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/%SUBDIR%/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/%SUBDIR%/ \ + http://www.mysql.cz/Downloads/%SUBDIR%/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/%SUBDIR%/ \ + http://mysql.proserve.nl/Downloads/%SUBDIR%/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/%SUBDIR%/ +MASTER_SITE_SUBDIR= MySQL-5.0.1-snapshot PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha - -FORBIDDEN= "http://vuxml.freebsd.org/e5e2883d-ceb9-11d8-8898-000d6111a684.html (security)" +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-snapshot MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha SLAVEDIRS= databases/mysql50-client PKGINSTALL?= ${WRKDIR}/pkg-install DB_DIR?= /var/db/mysql USE_LIBTOOL_VER=15 USE_REINPLACE= yes +USE_RC_SUBR= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ @@ -45,6 +46,7 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ + --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -111,7 +113,8 @@ LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* -PLIST_SUB= DB_DIR=${DB_DIR} +PLIST_SUB= DB_DIR=${DB_DIR} \ + VER=${PORTVERSION}-alpha MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 @@ -130,6 +133,8 @@ pre-fetch: @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." + @${ECHO} " WITH_PROC_SCOPE_PTH=yes Use process scope threads" + @${ECHO} " (try it if you use libpthread)." @${ECHO} " OVERWRITE_DB=yes Re-initialize default databases." @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations" @${ECHO} " (use it if you need speed)." @@ -139,10 +144,14 @@ pre-fetch: post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts man support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in - @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in + @${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in +.if defined(WITH_PROC_SCOPE_PTH) + @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc +.endif post-build: @${SED} "s|%%DB_DIR%%|${DB_DIR}|g" ${PKGDIR}/pkg-install > ${WRKDIR}/pkg-install @@ -163,7 +172,8 @@ post-install: .endif @${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif - @${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%DB_DIR%%|${DB_DIR}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh + @${SED} "s|%%RC_SUBR%%|${RC_SUBR}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%DB_DIR%%|${DB_DIR}|g" < \ + ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/Flags @@ -189,9 +199,13 @@ CONFIGURE_ARGS+=--without-server post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests scripts man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in +.if defined(WITH_PROC_SCOPE_PTH) + @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c +.endif post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh diff --git a/databases/mysql54-server/distinfo b/databases/mysql54-server/distinfo index 43b1f7dfb6bc..58e4ac6083af 100644 --- a/databases/mysql54-server/distinfo +++ b/databases/mysql54-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.0-alpha.tar.gz) = e31664d1172b5823fb8be83051910ee2 -SIZE (mysql-5.0.0-alpha.tar.gz) = 16311204 +MD5 (mysql-5.0.1-alpha-snapshot.tar.gz) = 2a645afc9a8396ffc0fad271367494ea +SIZE (mysql-5.0.1-alpha-snapshot.tar.gz) = 19684742 diff --git a/databases/mysql54-server/files/mysql-server.sh b/databases/mysql54-server/files/mysql-server.sh index 5180b9c0c1eb..708ad57df4b3 100644 --- a/databases/mysql54-server/files/mysql-server.sh +++ b/databases/mysql54-server/files/mysql-server.sh @@ -1,27 +1,51 @@ #!/bin/sh +# +# $FreeBSD$ +# -DB_DIR=%%DB_DIR%% -PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid - -case "$1" in - start) - if [ -x %%PREFIX%%/bin/mysqld_safe ]; then - /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & - echo -n ' mysqld' - fi - ;; - stop) - if [ -f ${PIDFILE} ]; then - /bin/kill `cat ${PIDFILE}` > /dev/null 2>&1 && echo -n ' mysqld' - else - echo "mysql-server isn't running" - fi - ;; - *) - echo "" - echo "Usage: `basename $0` { start | stop }" - echo "" - exit 64 - ;; -esac +# PROVIDE: mysql +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown + +# +# Add the following line to /etc/rc.conf to enable mysql: +# mysql_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable MySQL. +# mysqllimits_enable (bool): Set to "NO" by default. +# Set it to yes to run `limits $limits_args` +# just before mysql starts. +# mysqllimits_args (str): Default to "-e -U mysql" +# Arguments of pre-start limits run. +# + +. %%RC_SUBR%% + +name="mysql" +rcvar=`set_rcvar` +mysql_dbdir="%%DB_DIR%%" +mysql_user="mysql" +pidfile="${mysql_dbdir}/`/bin/hostname`.pid" +command="%%PREFIX%%/bin/mysqld_safe" +command_args="--user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} > /dev/null &" +procname="%%PREFIX%%/libexec/mysqld" +start_precmd="${name}_prestart" + +[ -z "$mysql_enable" ] && mysql_enable="NO" +[ -z "$mysqllimits_enable" ] && mysqllimits_enable="NO" +[ -z "$mysqllimits_args" ] && mysqllimits_args="-e -U ${mysql_user}" + +mysql_prestart() +{ + if checkyesno mysqllimits_enable; then + eval `/usr/bin/limits ${mysqllimits_args}` 2>/dev/null + else + return 0 + fi +} + +required_dirs="${mysql_dbdir}" +required_files="${mysql_dbdir}/mysql/host.frm ${mysql_dbdir}/mysql/user.frm ${mysql_dbdir}/mysql/db.frm" + +load_rc_config $name +run_rc_command "$1" diff --git a/databases/mysql54-server/files/patch-Makefile.in b/databases/mysql54-server/files/patch-Makefile.in index 94f38623fcf4..356baf88b938 100644 --- a/databases/mysql54-server/files/patch-Makefile.in +++ b/databases/mysql54-server/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Dec 1 13:55:28 2003 -+++ Makefile.in Wed Dec 10 00:18:16 2003 -@@ -209,12 +209,7 @@ +--- Makefile.in.orig Tue Jul 27 08:14:34 2004 ++++ Makefile.in Sat Oct 23 10:39:45 2004 +@@ -293,12 +293,7 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING zlib @@ -8,7 +8,7 @@ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests SSL\ -- BUILD @netware_dir@ os2 @libmysqld_dirs@ \ +- BUILD netware os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = diff --git a/databases/mysql54-server/files/patch-client::mysql.cc b/databases/mysql54-server/files/patch-client::mysql.cc new file mode 100644 index 000000000000..7e4fdfa6f22d --- /dev/null +++ b/databases/mysql54-server/files/patch-client::mysql.cc @@ -0,0 +1,11 @@ +--- client/mysql.cc.orig Sun Oct 24 15:54:36 2004 ++++ client/mysql.cc Sun Oct 24 15:55:52 2004 +@@ -294,7 +294,7 @@ + HIST_ENTRY is defined for libedit, but not for the real readline + Need to redefine it for real readline to find it + */ +-#if !defined(USE_LIBEDIT_INTERFACE) ++#if !defined(HAVE_HIST_ENTRY) + typedef struct _hist_entry { + const char *line; + const char *data; diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure index 9eed46865e83..fbbdc8efd9d1 100644 --- a/databases/mysql54-server/files/patch-configure +++ b/databases/mysql54-server/files/patch-configure @@ -9,50 +9,6 @@ # Prevent multiple expansion -@@ -9261,43 +9262,8 @@ - echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 - echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 - PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" - # BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *netware*) -- FIND_PROC= -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 @@ -12678,8 +12644,8 @@ # Some system specific hacks # @@ -64,12 +20,3 @@ case $SYSTEM_TYPE in *solaris2.7*) -@@ -23893,7 +23859,7 @@ - /* ) rel_srcdir="$srcdir" ;; - * ) rel_srcdir="../$srcdir" ;; - esac -- if test "x$enable_dependency_tracking" == xno -+ if test "x$enable_dependency_tracking" = xno - then - innodb_conf_flags=--disable-dependency-tracking - fi diff --git a/databases/mysql54-server/files/patch-scripts::Makefile.in b/databases/mysql54-server/files/patch-scripts::Makefile.in index 9010d283909f..ffef310f740c 100644 --- a/databases/mysql54-server/files/patch-scripts::Makefile.in +++ b/databases/mysql54-server/files/patch-scripts::Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Tue Mar 2 12:25:53 2004 -+++ scripts/Makefile.in Tue Mar 2 12:26:20 2004 -@@ -203,25 +203,7 @@ +--- scripts/Makefile.in.orig Tue Jul 27 08:14:44 2004 ++++ scripts/Makefile.in Sat Oct 23 10:44:33 2004 +@@ -287,26 +287,7 @@ vio_dir = @vio_dir@ vio_libs = @vio_libs@ @@ -22,12 +22,13 @@ - mysql_tableinfo \ - mysqld_multi \ - make_win_src_distribution \ +- make_win_binary_distribution \ - mysql_create_system_tables +bin_SCRIPTS = EXTRA_SCRIPTS = make_binary_distribution.sh \ -@@ -254,7 +236,7 @@ +@@ -340,7 +321,7 @@ mysqlbug @@ -36,7 +37,7 @@ # mysqlbug should be distributed built so that people can report build # failures with it. -@@ -510,8 +492,6 @@ +@@ -616,8 +597,6 @@ all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution diff --git a/databases/mysql54-server/files/patch-scripts::mysql_install_db.sh b/databases/mysql54-server/files/patch-scripts::mysql_install_db.sh deleted file mode 100644 index 1ccb78b2925a..000000000000 --- a/databases/mysql54-server/files/patch-scripts::mysql_install_db.sh +++ /dev/null @@ -1,22 +0,0 @@ ---- scripts/mysql_install_db.sh.orig Thu Mar 11 10:20:57 2004 -+++ scripts/mysql_install_db.sh Thu Mar 11 10:27:09 2004 -@@ -118,7 +118,7 @@ - if [ $? -ne 0 ] - then - resolved=`$bindir/resolveip localhost 2>&1` -- if [ $? -eq 0 ] -+ if [ $? -ne 0 ] - then - echo "Neither host '$hostname' and 'localhost' could not be looked up with" - echo "$bindir/resolveip" -@@ -128,8 +128,8 @@ - exit 1 - fi - echo "WARNING: The host '$hostname' could not be looked up with resolveip." -- echo "This probably means that your libc libraries are not 100 % compatible" -- echo "with this binary MySQL version. The MySQL daemon, mysqld, should work" -+ echo "This probably means that your host name is not listed in your" -+ echo "/etc/hosts file (as it should). The MySQL daemon, mysqld, should work" - echo "normally with the exception that host name resolving will not work." - echo "This means that you should use IP addresses instead of hostnames" - echo "when specifying MySQL privileges !" diff --git a/databases/mysql54-server/files/patch-scripts::mysqlbug.sh b/databases/mysql54-server/files/patch-scripts::mysqlbug.sh deleted file mode 100644 index fa26d2206310..000000000000 --- a/databases/mysql54-server/files/patch-scripts::mysqlbug.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- scripts/mysqlbug.sh.orig Tue May 18 10:20:19 2004 -+++ scripts/mysqlbug.sh Fri May 14 02:53:22 2004 -@@ -254,9 +254,9 @@ - if cmp -s $TEMP $TEMP.x - then - echo "File not changed, no bug report submitted." -- cp $TEMP /tmp/failed-mysql-bugreport -+ mv -f $TEMP /tmp/failed-mysql-bugreport - echo "The raw bug report exists in /tmp/failed-mysql-bugreport" -- echo "If you use this remember that the first lines of the report now is a lie.." -+ echo "If you use this remember that the first lines of the report are now a lie.." - exit 1 - fi - diff --git a/databases/mysql54-server/files/patch-scripts::mysqlhotcopy.sh b/databases/mysql54-server/files/patch-scripts::mysqlhotcopy.sh deleted file mode 100644 index 19d4395fa09f..000000000000 --- a/databases/mysql54-server/files/patch-scripts::mysqlhotcopy.sh +++ /dev/null @@ -1,49 +0,0 @@ ---- scripts/mysqlhotcopy.sh.orig Sun Dec 21 19:01:29 2003 -+++ scripts/mysqlhotcopy.sh Thu Sep 23 11:02:45 2004 -@@ -7,6 +7,7 @@ - use File::Path; - use DBI; - use Sys::Hostname; -+use File::Temp; - - =head1 NAME - -@@ -607,7 +608,6 @@ - sub copy_index - { - my ($method, $files, $source, $target) = @_; -- my $tmpfile="$opt_tmpdir/mysqlhotcopy$$"; - - print "Copying indices for ".@$files." files...\n" unless $opt{quiet}; - foreach my $file (@$files) -@@ -633,23 +633,23 @@ - } - close OUTPUT || die "Error on close of $to: $!\n"; - } -- elsif ($opt{method} eq 'scp') -+ elsif ($opt{method} =~ /^scp\b/) - { -- my $tmp=$tmpfile; -- open(OUTPUT,">$tmp") || die "Can\'t create file $tmp: $!\n"; -- if (syswrite(OUTPUT,$buff) != length($buff)) -+ my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir); -+ die "Can\'t create/open file in $opt_tmpdir\n"; -+ if (syswrite($fh,$buff) != length($buff)) - { - die "Error when writing data to $tmp: $!\n"; - } -- close OUTPUT || die "Error on close of $tmp: $!\n"; -- safe_system("scp $tmp $to"); -+ close $fh || die "Error on close of $tmp: $!\n"; -+ safe_system("$opt{method} $tmp $to"); -+ unlink $tmp; - } - else - { - die "Can't use unsupported method '$opt{method}'\n"; - } - } -- unlink "$tmpfile" if ($opt{method} eq 'scp'); - } - - diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist index b50c526d693f..be85c5051fdf 100644 --- a/databases/mysql54-server/pkg-plist +++ b/databases/mysql54-server/pkg-plist @@ -2,19 +2,54 @@ bin/comp_err bin/isamchk bin/isamlog bin/my_print_defaults +bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_create_system_tables bin/mysql_install_db +bin/mysql_tzinfo_to_sql bin/mysql_waitpid bin/mysqld_safe +bin/ndb_cpcd +bin/ndb_delete_all +bin/ndb_desc +bin/ndb_drop_index +bin/ndb_drop_table +bin/ndb_mgm +bin/ndb_restore +bin/ndb_select_all +bin/ndb_select_count +bin/ndb_show_tables +bin/ndb_waiter bin/pack_isam bin/perror bin/replace bin/resolve_stack_dump bin/resolveip etc/rc.d/mysql-server.sh +include/mysql/ndb/mgmapi/mgmapi.h +include/mysql/ndb/mgmapi/mgmapi_debug.h +include/mysql/ndb/ndb_types.h +include/mysql/ndb/ndb_version.h +include/mysql/ndb/ndbapi/Ndb.hpp +include/mysql/ndb/ndbapi/NdbApi.hpp +include/mysql/ndb/ndbapi/NdbBlob.hpp +include/mysql/ndb/ndbapi/NdbConnection.hpp +include/mysql/ndb/ndbapi/NdbCursorOperation.hpp +include/mysql/ndb/ndbapi/NdbDictionary.hpp +include/mysql/ndb/ndbapi/NdbError.hpp +include/mysql/ndb/ndbapi/NdbEventOperation.hpp +include/mysql/ndb/ndbapi/NdbIndexOperation.hpp +include/mysql/ndb/ndbapi/NdbOperation.hpp +include/mysql/ndb/ndbapi/NdbPool.hpp +include/mysql/ndb/ndbapi/NdbRecAttr.hpp +include/mysql/ndb/ndbapi/NdbReceiver.hpp +include/mysql/ndb/ndbapi/NdbResultSet.hpp +include/mysql/ndb/ndbapi/NdbScanFilter.hpp +include/mysql/ndb/ndbapi/NdbScanOperation.hpp +include/mysql/ndb/ndbapi/ndbapi_limits.h +include/mysql/ndb/ndbapi/ndberror.h lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a @@ -22,9 +57,14 @@ lib/mysql/libmyisam.a lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a +lib/mysql/libndbclient.a +lib/mysql/libndbclient.so +lib/mysql/libndbclient.so.0 lib/mysql/libnisam.a lib/mysql/libvio.a libexec/mysqld +libexec/ndb_mgmd +libexec/ndbd %%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif %%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif %%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif @@ -77,117 +117,125 @@ libexec/mysqld %%PORTDOCS%%%%DOCSDIR%%/manual.html %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/manual_toc.html -share/mysql/Description.plist -share/mysql/Info.plist -share/mysql/MySQL-shared-compat.spec -share/mysql/StartupParameters.plist -share/mysql/postinstall -share/mysql/preinstall -share/mysql/charsets/Index.xml -share/mysql/charsets/README -share/mysql/charsets/armscii8.xml -share/mysql/charsets/ascii.xml -share/mysql/charsets/cp1250.xml -share/mysql/charsets/cp1251.xml -share/mysql/charsets/cp1256.xml -share/mysql/charsets/cp1257.xml -share/mysql/charsets/cp850.xml -share/mysql/charsets/cp852.xml -share/mysql/charsets/cp866.xml -share/mysql/charsets/dec8.xml -share/mysql/charsets/geostd8.xml -share/mysql/charsets/greek.xml -share/mysql/charsets/hebrew.xml -share/mysql/charsets/hp8.xml -share/mysql/charsets/keybcs2.xml -share/mysql/charsets/koi8r.xml -share/mysql/charsets/koi8u.xml -share/mysql/charsets/latin1.xml -share/mysql/charsets/latin2.xml -share/mysql/charsets/latin5.xml -share/mysql/charsets/latin7.xml -share/mysql/charsets/macce.xml -share/mysql/charsets/macroman.xml -share/mysql/charsets/swe7.xml -share/mysql/czech/errmsg.sys -share/mysql/czech/errmsg.txt -share/mysql/danish/errmsg.sys -share/mysql/danish/errmsg.txt -share/mysql/dutch/errmsg.sys -share/mysql/dutch/errmsg.txt -share/mysql/english/errmsg.sys -share/mysql/english/errmsg.txt -share/mysql/estonian/errmsg.sys -share/mysql/estonian/errmsg.txt -share/mysql/fill_help_tables.sql -share/mysql/french/errmsg.sys -share/mysql/french/errmsg.txt -share/mysql/german/errmsg.sys -share/mysql/german/errmsg.txt -share/mysql/greek/errmsg.sys -share/mysql/greek/errmsg.txt -share/mysql/hungarian/errmsg.sys -share/mysql/hungarian/errmsg.txt -share/mysql/italian/errmsg.sys -share/mysql/italian/errmsg.txt -share/mysql/japanese/errmsg.sys -share/mysql/japanese/errmsg.txt -share/mysql/korean/errmsg.sys -share/mysql/korean/errmsg.txt -share/mysql/mi_test_all -share/mysql/mi_test_all.res -share/mysql/my-huge.cnf -share/mysql/my-large.cnf -share/mysql/my-medium.cnf -share/mysql/my-small.cnf -share/mysql/mysql-log-rotate -share/mysql/mysql.server -share/mysql/norwegian-ny/errmsg.sys -share/mysql/norwegian-ny/errmsg.txt -share/mysql/norwegian/errmsg.sys -share/mysql/norwegian/errmsg.txt -share/mysql/polish/errmsg.sys -share/mysql/polish/errmsg.txt -share/mysql/portuguese/errmsg.sys -share/mysql/portuguese/errmsg.txt -share/mysql/romanian/errmsg.sys -share/mysql/romanian/errmsg.txt -share/mysql/russian/errmsg.sys -share/mysql/russian/errmsg.txt -share/mysql/slovak/errmsg.sys -share/mysql/slovak/errmsg.txt -share/mysql/spanish/errmsg.sys -share/mysql/spanish/errmsg.txt -share/mysql/swedish/errmsg.sys -share/mysql/swedish/errmsg.txt -share/mysql/ukrainian/errmsg.sys -share/mysql/ukrainian/errmsg.txt +%%DATADIR%%/Description.plist +%%DATADIR%%/Info.plist +%%DATADIR%%/MySQL-shared-compat.spec +%%DATADIR%%/StartupParameters.plist +%%DATADIR%%/postinstall +%%DATADIR%%/preinstall +%%DATADIR%%/charsets/Index.xml +%%DATADIR%%/charsets/README +%%DATADIR%%/charsets/armscii8.xml +%%DATADIR%%/charsets/ascii.xml +%%DATADIR%%/charsets/cp1250.xml +%%DATADIR%%/charsets/cp1251.xml +%%DATADIR%%/charsets/cp1256.xml +%%DATADIR%%/charsets/cp1257.xml +%%DATADIR%%/charsets/cp850.xml +%%DATADIR%%/charsets/cp852.xml +%%DATADIR%%/charsets/cp866.xml +%%DATADIR%%/charsets/dec8.xml +%%DATADIR%%/charsets/geostd8.xml +%%DATADIR%%/charsets/greek.xml +%%DATADIR%%/charsets/hebrew.xml +%%DATADIR%%/charsets/hp8.xml +%%DATADIR%%/charsets/keybcs2.xml +%%DATADIR%%/charsets/koi8r.xml +%%DATADIR%%/charsets/koi8u.xml +%%DATADIR%%/charsets/latin1.xml +%%DATADIR%%/charsets/latin2.xml +%%DATADIR%%/charsets/latin5.xml +%%DATADIR%%/charsets/latin7.xml +%%DATADIR%%/charsets/macce.xml +%%DATADIR%%/charsets/macroman.xml +%%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/czech/errmsg.sys +%%DATADIR%%/czech/errmsg.txt +%%DATADIR%%/danish/errmsg.sys +%%DATADIR%%/danish/errmsg.txt +%%DATADIR%%/dutch/errmsg.sys +%%DATADIR%%/dutch/errmsg.txt +%%DATADIR%%/english/errmsg.sys +%%DATADIR%%/english/errmsg.txt +%%DATADIR%%/estonian/errmsg.sys +%%DATADIR%%/estonian/errmsg.txt +%%DATADIR%%/fill_help_tables.sql +%%DATADIR%%/french/errmsg.sys +%%DATADIR%%/french/errmsg.txt +%%DATADIR%%/german/errmsg.sys +%%DATADIR%%/german/errmsg.txt +%%DATADIR%%/greek/errmsg.sys +%%DATADIR%%/greek/errmsg.txt +%%DATADIR%%/hungarian/errmsg.sys +%%DATADIR%%/hungarian/errmsg.txt +%%DATADIR%%/italian/errmsg.sys +%%DATADIR%%/italian/errmsg.txt +%%DATADIR%%/japanese/errmsg.sys +%%DATADIR%%/japanese/errmsg.txt +%%DATADIR%%/korean/errmsg.sys +%%DATADIR%%/korean/errmsg.txt +%%DATADIR%%/mi_test_all +%%DATADIR%%/mi_test_all.res +%%DATADIR%%/my-huge.cnf +%%DATADIR%%/my-large.cnf +%%DATADIR%%/my-medium.cnf +%%DATADIR%%/my-small.cnf +%%DATADIR%%/mysql-log-rotate +%%DATADIR%%/mysql-%%VER%%.spec +%%DATADIR%%/mysql.server +%%DATADIR%%/norwegian-ny/errmsg.sys +%%DATADIR%%/norwegian-ny/errmsg.txt +%%DATADIR%%/norwegian/errmsg.sys +%%DATADIR%%/norwegian/errmsg.txt +%%DATADIR%%/polish/errmsg.sys +%%DATADIR%%/polish/errmsg.txt +%%DATADIR%%/portuguese/errmsg.sys +%%DATADIR%%/portuguese/errmsg.txt +%%DATADIR%%/romanian/errmsg.sys +%%DATADIR%%/romanian/errmsg.txt +%%DATADIR%%/russian/errmsg.sys +%%DATADIR%%/russian/errmsg.txt +%%DATADIR%%/serbian/errmsg.sys +%%DATADIR%%/serbian/errmsg.txt +%%DATADIR%%/slovak/errmsg.sys +%%DATADIR%%/slovak/errmsg.txt +%%DATADIR%%/spanish/errmsg.sys +%%DATADIR%%/spanish/errmsg.txt +%%DATADIR%%/swedish/errmsg.sys +%%DATADIR%%/swedish/errmsg.txt +%%DATADIR%%/ukrainian/errmsg.sys +%%DATADIR%%/ukrainian/errmsg.txt +@dirrm include/mysql/ndb/mgmapi +@dirrm include/mysql/ndb/ndbapi +@dirrm include/mysql/ndb +@unexec rmdir %D/include/mysql 2> /dev/null || true @unexec rmdir %D/lib/mysql 2> /dev/null || true %%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm share/mysql/charsets -@dirrm share/mysql/czech -@dirrm share/mysql/danish -@dirrm share/mysql/dutch -@dirrm share/mysql/english -@dirrm share/mysql/estonian -@dirrm share/mysql/french -@dirrm share/mysql/german -@dirrm share/mysql/greek -@dirrm share/mysql/hungarian -@dirrm share/mysql/italian -@dirrm share/mysql/japanese -@dirrm share/mysql/korean -@dirrm share/mysql/norwegian -@dirrm share/mysql/norwegian-ny -@dirrm share/mysql/polish -@dirrm share/mysql/portuguese -@dirrm share/mysql/romanian -@dirrm share/mysql/russian -@dirrm share/mysql/slovak -@dirrm share/mysql/spanish -@dirrm share/mysql/swedish -@dirrm share/mysql/ukrainian -@unexec rmdir %D/share/mysql 2> /dev/null || true +@dirrm %%DATADIR%%/charsets +@dirrm %%DATADIR%%/czech +@dirrm %%DATADIR%%/danish +@dirrm %%DATADIR%%/dutch +@dirrm %%DATADIR%%/english +@dirrm %%DATADIR%%/estonian +@dirrm %%DATADIR%%/french +@dirrm %%DATADIR%%/german +@dirrm %%DATADIR%%/greek +@dirrm %%DATADIR%%/hungarian +@dirrm %%DATADIR%%/italian +@dirrm %%DATADIR%%/japanese +@dirrm %%DATADIR%%/korean +@dirrm %%DATADIR%%/norwegian +@dirrm %%DATADIR%%/norwegian-ny +@dirrm %%DATADIR%%/polish +@dirrm %%DATADIR%%/portuguese +@dirrm %%DATADIR%%/romanian +@dirrm %%DATADIR%%/russian +@dirrm %%DATADIR%%/serbian +@dirrm %%DATADIR%%/slovak +@dirrm %%DATADIR%%/spanish +@dirrm %%DATADIR%%/swedish +@dirrm %%DATADIR%%/ukrainian +@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true @exec [ -d %%DB_DIR%% ] || %D/bin/mysql_install_db --ldata=%%DB_DIR%% @unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql54-server/pkg-plist.client b/databases/mysql54-server/pkg-plist.client index e260e22590c8..ab0454713675 100644 --- a/databases/mysql54-server/pkg-plist.client +++ b/databases/mysql54-server/pkg-plist.client @@ -32,6 +32,7 @@ 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_error.h include/mysql/raid.h @@ -47,7 +48,7 @@ lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.14 -share/mysql/mysql_fix_privilege_tables.sql +%%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql -@dirrm share/mysql +@dirrm %%DATADIR%% diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index a0920329cced..71098d938b2a 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -6,33 +6,34 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.0 -PORTREVISION?= 2 +PORTVERSION= 5.0.1 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-5.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-5.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-5.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-5.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-5.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \ - http://www.mysql.cz/Downloads/MySQL-5.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \ - http://mysql.proserve.nl/Downloads/MySQL-5.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/%SUBDIR%/ \ + http://www.softagency.co.jp/MySQL/Downloads/%SUBDIR%/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/%SUBDIR%/ \ + http://mysql.mediatraffic.fi/Downloads/%SUBDIR%/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/%SUBDIR%/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/%SUBDIR%/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/%SUBDIR%/ \ + http://www.mysql.cz/Downloads/%SUBDIR%/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/%SUBDIR%/ \ + http://mysql.proserve.nl/Downloads/%SUBDIR%/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/%SUBDIR%/ +MASTER_SITE_SUBDIR= MySQL-5.0.1-snapshot PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha - -FORBIDDEN= "http://vuxml.freebsd.org/e5e2883d-ceb9-11d8-8898-000d6111a684.html (security)" +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-snapshot MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha SLAVEDIRS= databases/mysql50-client PKGINSTALL?= ${WRKDIR}/pkg-install DB_DIR?= /var/db/mysql USE_LIBTOOL_VER=15 USE_REINPLACE= yes +USE_RC_SUBR= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ @@ -45,6 +46,7 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ + --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -111,7 +113,8 @@ LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* -PLIST_SUB= DB_DIR=${DB_DIR} +PLIST_SUB= DB_DIR=${DB_DIR} \ + VER=${PORTVERSION}-alpha MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 @@ -130,6 +133,8 @@ pre-fetch: @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." + @${ECHO} " WITH_PROC_SCOPE_PTH=yes Use process scope threads" + @${ECHO} " (try it if you use libpthread)." @${ECHO} " OVERWRITE_DB=yes Re-initialize default databases." @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations" @${ECHO} " (use it if you need speed)." @@ -139,10 +144,14 @@ pre-fetch: post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts man support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in - @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in + @${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in +.if defined(WITH_PROC_SCOPE_PTH) + @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc +.endif post-build: @${SED} "s|%%DB_DIR%%|${DB_DIR}|g" ${PKGDIR}/pkg-install > ${WRKDIR}/pkg-install @@ -163,7 +172,8 @@ post-install: .endif @${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif - @${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%DB_DIR%%|${DB_DIR}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh + @${SED} "s|%%RC_SUBR%%|${RC_SUBR}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%DB_DIR%%|${DB_DIR}|g" < \ + ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/Flags @@ -189,9 +199,13 @@ CONFIGURE_ARGS+=--without-server post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests scripts man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in +.if defined(WITH_PROC_SCOPE_PTH) + @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c +.endif post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo index 43b1f7dfb6bc..58e4ac6083af 100644 --- a/databases/mysql55-server/distinfo +++ b/databases/mysql55-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.0-alpha.tar.gz) = e31664d1172b5823fb8be83051910ee2 -SIZE (mysql-5.0.0-alpha.tar.gz) = 16311204 +MD5 (mysql-5.0.1-alpha-snapshot.tar.gz) = 2a645afc9a8396ffc0fad271367494ea +SIZE (mysql-5.0.1-alpha-snapshot.tar.gz) = 19684742 diff --git a/databases/mysql55-server/files/mysql-server.sh b/databases/mysql55-server/files/mysql-server.sh index 5180b9c0c1eb..708ad57df4b3 100644 --- a/databases/mysql55-server/files/mysql-server.sh +++ b/databases/mysql55-server/files/mysql-server.sh @@ -1,27 +1,51 @@ #!/bin/sh +# +# $FreeBSD$ +# -DB_DIR=%%DB_DIR%% -PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid - -case "$1" in - start) - if [ -x %%PREFIX%%/bin/mysqld_safe ]; then - /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & - echo -n ' mysqld' - fi - ;; - stop) - if [ -f ${PIDFILE} ]; then - /bin/kill `cat ${PIDFILE}` > /dev/null 2>&1 && echo -n ' mysqld' - else - echo "mysql-server isn't running" - fi - ;; - *) - echo "" - echo "Usage: `basename $0` { start | stop }" - echo "" - exit 64 - ;; -esac +# PROVIDE: mysql +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown + +# +# Add the following line to /etc/rc.conf to enable mysql: +# mysql_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable MySQL. +# mysqllimits_enable (bool): Set to "NO" by default. +# Set it to yes to run `limits $limits_args` +# just before mysql starts. +# mysqllimits_args (str): Default to "-e -U mysql" +# Arguments of pre-start limits run. +# + +. %%RC_SUBR%% + +name="mysql" +rcvar=`set_rcvar` +mysql_dbdir="%%DB_DIR%%" +mysql_user="mysql" +pidfile="${mysql_dbdir}/`/bin/hostname`.pid" +command="%%PREFIX%%/bin/mysqld_safe" +command_args="--user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} > /dev/null &" +procname="%%PREFIX%%/libexec/mysqld" +start_precmd="${name}_prestart" + +[ -z "$mysql_enable" ] && mysql_enable="NO" +[ -z "$mysqllimits_enable" ] && mysqllimits_enable="NO" +[ -z "$mysqllimits_args" ] && mysqllimits_args="-e -U ${mysql_user}" + +mysql_prestart() +{ + if checkyesno mysqllimits_enable; then + eval `/usr/bin/limits ${mysqllimits_args}` 2>/dev/null + else + return 0 + fi +} + +required_dirs="${mysql_dbdir}" +required_files="${mysql_dbdir}/mysql/host.frm ${mysql_dbdir}/mysql/user.frm ${mysql_dbdir}/mysql/db.frm" + +load_rc_config $name +run_rc_command "$1" diff --git a/databases/mysql55-server/files/patch-Makefile.in b/databases/mysql55-server/files/patch-Makefile.in index 94f38623fcf4..356baf88b938 100644 --- a/databases/mysql55-server/files/patch-Makefile.in +++ b/databases/mysql55-server/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Dec 1 13:55:28 2003 -+++ Makefile.in Wed Dec 10 00:18:16 2003 -@@ -209,12 +209,7 @@ +--- Makefile.in.orig Tue Jul 27 08:14:34 2004 ++++ Makefile.in Sat Oct 23 10:39:45 2004 +@@ -293,12 +293,7 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING zlib @@ -8,7 +8,7 @@ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests SSL\ -- BUILD @netware_dir@ os2 @libmysqld_dirs@ \ +- BUILD netware os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = diff --git a/databases/mysql55-server/files/patch-client::mysql.cc b/databases/mysql55-server/files/patch-client::mysql.cc new file mode 100644 index 000000000000..7e4fdfa6f22d --- /dev/null +++ b/databases/mysql55-server/files/patch-client::mysql.cc @@ -0,0 +1,11 @@ +--- client/mysql.cc.orig Sun Oct 24 15:54:36 2004 ++++ client/mysql.cc Sun Oct 24 15:55:52 2004 +@@ -294,7 +294,7 @@ + HIST_ENTRY is defined for libedit, but not for the real readline + Need to redefine it for real readline to find it + */ +-#if !defined(USE_LIBEDIT_INTERFACE) ++#if !defined(HAVE_HIST_ENTRY) + typedef struct _hist_entry { + const char *line; + const char *data; diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure index 9eed46865e83..fbbdc8efd9d1 100644 --- a/databases/mysql55-server/files/patch-configure +++ b/databases/mysql55-server/files/patch-configure @@ -9,50 +9,6 @@ # Prevent multiple expansion -@@ -9261,43 +9262,8 @@ - echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 - echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 - PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" - # BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *netware*) -- FIND_PROC= -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 @@ -12678,8 +12644,8 @@ # Some system specific hacks # @@ -64,12 +20,3 @@ case $SYSTEM_TYPE in *solaris2.7*) -@@ -23893,7 +23859,7 @@ - /* ) rel_srcdir="$srcdir" ;; - * ) rel_srcdir="../$srcdir" ;; - esac -- if test "x$enable_dependency_tracking" == xno -+ if test "x$enable_dependency_tracking" = xno - then - innodb_conf_flags=--disable-dependency-tracking - fi diff --git a/databases/mysql55-server/files/patch-scripts::Makefile.in b/databases/mysql55-server/files/patch-scripts::Makefile.in index 9010d283909f..ffef310f740c 100644 --- a/databases/mysql55-server/files/patch-scripts::Makefile.in +++ b/databases/mysql55-server/files/patch-scripts::Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Tue Mar 2 12:25:53 2004 -+++ scripts/Makefile.in Tue Mar 2 12:26:20 2004 -@@ -203,25 +203,7 @@ +--- scripts/Makefile.in.orig Tue Jul 27 08:14:44 2004 ++++ scripts/Makefile.in Sat Oct 23 10:44:33 2004 +@@ -287,26 +287,7 @@ vio_dir = @vio_dir@ vio_libs = @vio_libs@ @@ -22,12 +22,13 @@ - mysql_tableinfo \ - mysqld_multi \ - make_win_src_distribution \ +- make_win_binary_distribution \ - mysql_create_system_tables +bin_SCRIPTS = EXTRA_SCRIPTS = make_binary_distribution.sh \ -@@ -254,7 +236,7 @@ +@@ -340,7 +321,7 @@ mysqlbug @@ -36,7 +37,7 @@ # mysqlbug should be distributed built so that people can report build # failures with it. -@@ -510,8 +492,6 @@ +@@ -616,8 +597,6 @@ all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution diff --git a/databases/mysql55-server/files/patch-scripts::mysql_install_db.sh b/databases/mysql55-server/files/patch-scripts::mysql_install_db.sh deleted file mode 100644 index 1ccb78b2925a..000000000000 --- a/databases/mysql55-server/files/patch-scripts::mysql_install_db.sh +++ /dev/null @@ -1,22 +0,0 @@ ---- scripts/mysql_install_db.sh.orig Thu Mar 11 10:20:57 2004 -+++ scripts/mysql_install_db.sh Thu Mar 11 10:27:09 2004 -@@ -118,7 +118,7 @@ - if [ $? -ne 0 ] - then - resolved=`$bindir/resolveip localhost 2>&1` -- if [ $? -eq 0 ] -+ if [ $? -ne 0 ] - then - echo "Neither host '$hostname' and 'localhost' could not be looked up with" - echo "$bindir/resolveip" -@@ -128,8 +128,8 @@ - exit 1 - fi - echo "WARNING: The host '$hostname' could not be looked up with resolveip." -- echo "This probably means that your libc libraries are not 100 % compatible" -- echo "with this binary MySQL version. The MySQL daemon, mysqld, should work" -+ echo "This probably means that your host name is not listed in your" -+ echo "/etc/hosts file (as it should). The MySQL daemon, mysqld, should work" - echo "normally with the exception that host name resolving will not work." - echo "This means that you should use IP addresses instead of hostnames" - echo "when specifying MySQL privileges !" diff --git a/databases/mysql55-server/files/patch-scripts::mysqlbug.sh b/databases/mysql55-server/files/patch-scripts::mysqlbug.sh deleted file mode 100644 index fa26d2206310..000000000000 --- a/databases/mysql55-server/files/patch-scripts::mysqlbug.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- scripts/mysqlbug.sh.orig Tue May 18 10:20:19 2004 -+++ scripts/mysqlbug.sh Fri May 14 02:53:22 2004 -@@ -254,9 +254,9 @@ - if cmp -s $TEMP $TEMP.x - then - echo "File not changed, no bug report submitted." -- cp $TEMP /tmp/failed-mysql-bugreport -+ mv -f $TEMP /tmp/failed-mysql-bugreport - echo "The raw bug report exists in /tmp/failed-mysql-bugreport" -- echo "If you use this remember that the first lines of the report now is a lie.." -+ echo "If you use this remember that the first lines of the report are now a lie.." - exit 1 - fi - diff --git a/databases/mysql55-server/files/patch-scripts::mysqlhotcopy.sh b/databases/mysql55-server/files/patch-scripts::mysqlhotcopy.sh deleted file mode 100644 index 19d4395fa09f..000000000000 --- a/databases/mysql55-server/files/patch-scripts::mysqlhotcopy.sh +++ /dev/null @@ -1,49 +0,0 @@ ---- scripts/mysqlhotcopy.sh.orig Sun Dec 21 19:01:29 2003 -+++ scripts/mysqlhotcopy.sh Thu Sep 23 11:02:45 2004 -@@ -7,6 +7,7 @@ - use File::Path; - use DBI; - use Sys::Hostname; -+use File::Temp; - - =head1 NAME - -@@ -607,7 +608,6 @@ - sub copy_index - { - my ($method, $files, $source, $target) = @_; -- my $tmpfile="$opt_tmpdir/mysqlhotcopy$$"; - - print "Copying indices for ".@$files." files...\n" unless $opt{quiet}; - foreach my $file (@$files) -@@ -633,23 +633,23 @@ - } - close OUTPUT || die "Error on close of $to: $!\n"; - } -- elsif ($opt{method} eq 'scp') -+ elsif ($opt{method} =~ /^scp\b/) - { -- my $tmp=$tmpfile; -- open(OUTPUT,">$tmp") || die "Can\'t create file $tmp: $!\n"; -- if (syswrite(OUTPUT,$buff) != length($buff)) -+ my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir); -+ die "Can\'t create/open file in $opt_tmpdir\n"; -+ if (syswrite($fh,$buff) != length($buff)) - { - die "Error when writing data to $tmp: $!\n"; - } -- close OUTPUT || die "Error on close of $tmp: $!\n"; -- safe_system("scp $tmp $to"); -+ close $fh || die "Error on close of $tmp: $!\n"; -+ safe_system("$opt{method} $tmp $to"); -+ unlink $tmp; - } - else - { - die "Can't use unsupported method '$opt{method}'\n"; - } - } -- unlink "$tmpfile" if ($opt{method} eq 'scp'); - } - - diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist index b50c526d693f..be85c5051fdf 100644 --- a/databases/mysql55-server/pkg-plist +++ b/databases/mysql55-server/pkg-plist @@ -2,19 +2,54 @@ bin/comp_err bin/isamchk bin/isamlog bin/my_print_defaults +bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_create_system_tables bin/mysql_install_db +bin/mysql_tzinfo_to_sql bin/mysql_waitpid bin/mysqld_safe +bin/ndb_cpcd +bin/ndb_delete_all +bin/ndb_desc +bin/ndb_drop_index +bin/ndb_drop_table +bin/ndb_mgm +bin/ndb_restore +bin/ndb_select_all +bin/ndb_select_count +bin/ndb_show_tables +bin/ndb_waiter bin/pack_isam bin/perror bin/replace bin/resolve_stack_dump bin/resolveip etc/rc.d/mysql-server.sh +include/mysql/ndb/mgmapi/mgmapi.h +include/mysql/ndb/mgmapi/mgmapi_debug.h +include/mysql/ndb/ndb_types.h +include/mysql/ndb/ndb_version.h +include/mysql/ndb/ndbapi/Ndb.hpp +include/mysql/ndb/ndbapi/NdbApi.hpp +include/mysql/ndb/ndbapi/NdbBlob.hpp +include/mysql/ndb/ndbapi/NdbConnection.hpp +include/mysql/ndb/ndbapi/NdbCursorOperation.hpp +include/mysql/ndb/ndbapi/NdbDictionary.hpp +include/mysql/ndb/ndbapi/NdbError.hpp +include/mysql/ndb/ndbapi/NdbEventOperation.hpp +include/mysql/ndb/ndbapi/NdbIndexOperation.hpp +include/mysql/ndb/ndbapi/NdbOperation.hpp +include/mysql/ndb/ndbapi/NdbPool.hpp +include/mysql/ndb/ndbapi/NdbRecAttr.hpp +include/mysql/ndb/ndbapi/NdbReceiver.hpp +include/mysql/ndb/ndbapi/NdbResultSet.hpp +include/mysql/ndb/ndbapi/NdbScanFilter.hpp +include/mysql/ndb/ndbapi/NdbScanOperation.hpp +include/mysql/ndb/ndbapi/ndbapi_limits.h +include/mysql/ndb/ndbapi/ndberror.h lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a @@ -22,9 +57,14 @@ lib/mysql/libmyisam.a lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a +lib/mysql/libndbclient.a +lib/mysql/libndbclient.so +lib/mysql/libndbclient.so.0 lib/mysql/libnisam.a lib/mysql/libvio.a libexec/mysqld +libexec/ndb_mgmd +libexec/ndbd %%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif %%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif %%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif @@ -77,117 +117,125 @@ libexec/mysqld %%PORTDOCS%%%%DOCSDIR%%/manual.html %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/manual_toc.html -share/mysql/Description.plist -share/mysql/Info.plist -share/mysql/MySQL-shared-compat.spec -share/mysql/StartupParameters.plist -share/mysql/postinstall -share/mysql/preinstall -share/mysql/charsets/Index.xml -share/mysql/charsets/README -share/mysql/charsets/armscii8.xml -share/mysql/charsets/ascii.xml -share/mysql/charsets/cp1250.xml -share/mysql/charsets/cp1251.xml -share/mysql/charsets/cp1256.xml -share/mysql/charsets/cp1257.xml -share/mysql/charsets/cp850.xml -share/mysql/charsets/cp852.xml -share/mysql/charsets/cp866.xml -share/mysql/charsets/dec8.xml -share/mysql/charsets/geostd8.xml -share/mysql/charsets/greek.xml -share/mysql/charsets/hebrew.xml -share/mysql/charsets/hp8.xml -share/mysql/charsets/keybcs2.xml -share/mysql/charsets/koi8r.xml -share/mysql/charsets/koi8u.xml -share/mysql/charsets/latin1.xml -share/mysql/charsets/latin2.xml -share/mysql/charsets/latin5.xml -share/mysql/charsets/latin7.xml -share/mysql/charsets/macce.xml -share/mysql/charsets/macroman.xml -share/mysql/charsets/swe7.xml -share/mysql/czech/errmsg.sys -share/mysql/czech/errmsg.txt -share/mysql/danish/errmsg.sys -share/mysql/danish/errmsg.txt -share/mysql/dutch/errmsg.sys -share/mysql/dutch/errmsg.txt -share/mysql/english/errmsg.sys -share/mysql/english/errmsg.txt -share/mysql/estonian/errmsg.sys -share/mysql/estonian/errmsg.txt -share/mysql/fill_help_tables.sql -share/mysql/french/errmsg.sys -share/mysql/french/errmsg.txt -share/mysql/german/errmsg.sys -share/mysql/german/errmsg.txt -share/mysql/greek/errmsg.sys -share/mysql/greek/errmsg.txt -share/mysql/hungarian/errmsg.sys -share/mysql/hungarian/errmsg.txt -share/mysql/italian/errmsg.sys -share/mysql/italian/errmsg.txt -share/mysql/japanese/errmsg.sys -share/mysql/japanese/errmsg.txt -share/mysql/korean/errmsg.sys -share/mysql/korean/errmsg.txt -share/mysql/mi_test_all -share/mysql/mi_test_all.res -share/mysql/my-huge.cnf -share/mysql/my-large.cnf -share/mysql/my-medium.cnf -share/mysql/my-small.cnf -share/mysql/mysql-log-rotate -share/mysql/mysql.server -share/mysql/norwegian-ny/errmsg.sys -share/mysql/norwegian-ny/errmsg.txt -share/mysql/norwegian/errmsg.sys -share/mysql/norwegian/errmsg.txt -share/mysql/polish/errmsg.sys -share/mysql/polish/errmsg.txt -share/mysql/portuguese/errmsg.sys -share/mysql/portuguese/errmsg.txt -share/mysql/romanian/errmsg.sys -share/mysql/romanian/errmsg.txt -share/mysql/russian/errmsg.sys -share/mysql/russian/errmsg.txt -share/mysql/slovak/errmsg.sys -share/mysql/slovak/errmsg.txt -share/mysql/spanish/errmsg.sys -share/mysql/spanish/errmsg.txt -share/mysql/swedish/errmsg.sys -share/mysql/swedish/errmsg.txt -share/mysql/ukrainian/errmsg.sys -share/mysql/ukrainian/errmsg.txt +%%DATADIR%%/Description.plist +%%DATADIR%%/Info.plist +%%DATADIR%%/MySQL-shared-compat.spec +%%DATADIR%%/StartupParameters.plist +%%DATADIR%%/postinstall +%%DATADIR%%/preinstall +%%DATADIR%%/charsets/Index.xml +%%DATADIR%%/charsets/README +%%DATADIR%%/charsets/armscii8.xml +%%DATADIR%%/charsets/ascii.xml +%%DATADIR%%/charsets/cp1250.xml +%%DATADIR%%/charsets/cp1251.xml +%%DATADIR%%/charsets/cp1256.xml +%%DATADIR%%/charsets/cp1257.xml +%%DATADIR%%/charsets/cp850.xml +%%DATADIR%%/charsets/cp852.xml +%%DATADIR%%/charsets/cp866.xml +%%DATADIR%%/charsets/dec8.xml +%%DATADIR%%/charsets/geostd8.xml +%%DATADIR%%/charsets/greek.xml +%%DATADIR%%/charsets/hebrew.xml +%%DATADIR%%/charsets/hp8.xml +%%DATADIR%%/charsets/keybcs2.xml +%%DATADIR%%/charsets/koi8r.xml +%%DATADIR%%/charsets/koi8u.xml +%%DATADIR%%/charsets/latin1.xml +%%DATADIR%%/charsets/latin2.xml +%%DATADIR%%/charsets/latin5.xml +%%DATADIR%%/charsets/latin7.xml +%%DATADIR%%/charsets/macce.xml +%%DATADIR%%/charsets/macroman.xml +%%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/czech/errmsg.sys +%%DATADIR%%/czech/errmsg.txt +%%DATADIR%%/danish/errmsg.sys +%%DATADIR%%/danish/errmsg.txt +%%DATADIR%%/dutch/errmsg.sys +%%DATADIR%%/dutch/errmsg.txt +%%DATADIR%%/english/errmsg.sys +%%DATADIR%%/english/errmsg.txt +%%DATADIR%%/estonian/errmsg.sys +%%DATADIR%%/estonian/errmsg.txt +%%DATADIR%%/fill_help_tables.sql +%%DATADIR%%/french/errmsg.sys +%%DATADIR%%/french/errmsg.txt +%%DATADIR%%/german/errmsg.sys +%%DATADIR%%/german/errmsg.txt +%%DATADIR%%/greek/errmsg.sys +%%DATADIR%%/greek/errmsg.txt +%%DATADIR%%/hungarian/errmsg.sys +%%DATADIR%%/hungarian/errmsg.txt +%%DATADIR%%/italian/errmsg.sys +%%DATADIR%%/italian/errmsg.txt +%%DATADIR%%/japanese/errmsg.sys +%%DATADIR%%/japanese/errmsg.txt +%%DATADIR%%/korean/errmsg.sys +%%DATADIR%%/korean/errmsg.txt +%%DATADIR%%/mi_test_all +%%DATADIR%%/mi_test_all.res +%%DATADIR%%/my-huge.cnf +%%DATADIR%%/my-large.cnf +%%DATADIR%%/my-medium.cnf +%%DATADIR%%/my-small.cnf +%%DATADIR%%/mysql-log-rotate +%%DATADIR%%/mysql-%%VER%%.spec +%%DATADIR%%/mysql.server +%%DATADIR%%/norwegian-ny/errmsg.sys +%%DATADIR%%/norwegian-ny/errmsg.txt +%%DATADIR%%/norwegian/errmsg.sys +%%DATADIR%%/norwegian/errmsg.txt +%%DATADIR%%/polish/errmsg.sys +%%DATADIR%%/polish/errmsg.txt +%%DATADIR%%/portuguese/errmsg.sys +%%DATADIR%%/portuguese/errmsg.txt +%%DATADIR%%/romanian/errmsg.sys +%%DATADIR%%/romanian/errmsg.txt +%%DATADIR%%/russian/errmsg.sys +%%DATADIR%%/russian/errmsg.txt +%%DATADIR%%/serbian/errmsg.sys +%%DATADIR%%/serbian/errmsg.txt +%%DATADIR%%/slovak/errmsg.sys +%%DATADIR%%/slovak/errmsg.txt +%%DATADIR%%/spanish/errmsg.sys +%%DATADIR%%/spanish/errmsg.txt +%%DATADIR%%/swedish/errmsg.sys +%%DATADIR%%/swedish/errmsg.txt +%%DATADIR%%/ukrainian/errmsg.sys +%%DATADIR%%/ukrainian/errmsg.txt +@dirrm include/mysql/ndb/mgmapi +@dirrm include/mysql/ndb/ndbapi +@dirrm include/mysql/ndb +@unexec rmdir %D/include/mysql 2> /dev/null || true @unexec rmdir %D/lib/mysql 2> /dev/null || true %%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm share/mysql/charsets -@dirrm share/mysql/czech -@dirrm share/mysql/danish -@dirrm share/mysql/dutch -@dirrm share/mysql/english -@dirrm share/mysql/estonian -@dirrm share/mysql/french -@dirrm share/mysql/german -@dirrm share/mysql/greek -@dirrm share/mysql/hungarian -@dirrm share/mysql/italian -@dirrm share/mysql/japanese -@dirrm share/mysql/korean -@dirrm share/mysql/norwegian -@dirrm share/mysql/norwegian-ny -@dirrm share/mysql/polish -@dirrm share/mysql/portuguese -@dirrm share/mysql/romanian -@dirrm share/mysql/russian -@dirrm share/mysql/slovak -@dirrm share/mysql/spanish -@dirrm share/mysql/swedish -@dirrm share/mysql/ukrainian -@unexec rmdir %D/share/mysql 2> /dev/null || true +@dirrm %%DATADIR%%/charsets +@dirrm %%DATADIR%%/czech +@dirrm %%DATADIR%%/danish +@dirrm %%DATADIR%%/dutch +@dirrm %%DATADIR%%/english +@dirrm %%DATADIR%%/estonian +@dirrm %%DATADIR%%/french +@dirrm %%DATADIR%%/german +@dirrm %%DATADIR%%/greek +@dirrm %%DATADIR%%/hungarian +@dirrm %%DATADIR%%/italian +@dirrm %%DATADIR%%/japanese +@dirrm %%DATADIR%%/korean +@dirrm %%DATADIR%%/norwegian +@dirrm %%DATADIR%%/norwegian-ny +@dirrm %%DATADIR%%/polish +@dirrm %%DATADIR%%/portuguese +@dirrm %%DATADIR%%/romanian +@dirrm %%DATADIR%%/russian +@dirrm %%DATADIR%%/serbian +@dirrm %%DATADIR%%/slovak +@dirrm %%DATADIR%%/spanish +@dirrm %%DATADIR%%/swedish +@dirrm %%DATADIR%%/ukrainian +@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true @exec [ -d %%DB_DIR%% ] || %D/bin/mysql_install_db --ldata=%%DB_DIR%% @unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql55-server/pkg-plist.client b/databases/mysql55-server/pkg-plist.client index e260e22590c8..ab0454713675 100644 --- a/databases/mysql55-server/pkg-plist.client +++ b/databases/mysql55-server/pkg-plist.client @@ -32,6 +32,7 @@ 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_error.h include/mysql/raid.h @@ -47,7 +48,7 @@ lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.14 -share/mysql/mysql_fix_privilege_tables.sql +%%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql -@dirrm share/mysql +@dirrm %%DATADIR%% diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index a0920329cced..71098d938b2a 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -6,33 +6,34 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.0 -PORTREVISION?= 2 +PORTVERSION= 5.0.1 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-5.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-5.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-5.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-5.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-5.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \ - http://www.mysql.cz/Downloads/MySQL-5.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \ - http://mysql.proserve.nl/Downloads/MySQL-5.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/%SUBDIR%/ \ + http://www.softagency.co.jp/MySQL/Downloads/%SUBDIR%/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/%SUBDIR%/ \ + http://mysql.mediatraffic.fi/Downloads/%SUBDIR%/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/%SUBDIR%/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/%SUBDIR%/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/%SUBDIR%/ \ + http://www.mysql.cz/Downloads/%SUBDIR%/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/%SUBDIR%/ \ + http://mysql.proserve.nl/Downloads/%SUBDIR%/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/%SUBDIR%/ +MASTER_SITE_SUBDIR= MySQL-5.0.1-snapshot PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha - -FORBIDDEN= "http://vuxml.freebsd.org/e5e2883d-ceb9-11d8-8898-000d6111a684.html (security)" +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-snapshot MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha SLAVEDIRS= databases/mysql50-client PKGINSTALL?= ${WRKDIR}/pkg-install DB_DIR?= /var/db/mysql USE_LIBTOOL_VER=15 USE_REINPLACE= yes +USE_RC_SUBR= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ @@ -45,6 +46,7 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ + --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -111,7 +113,8 @@ LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* -PLIST_SUB= DB_DIR=${DB_DIR} +PLIST_SUB= DB_DIR=${DB_DIR} \ + VER=${PORTVERSION}-alpha MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 @@ -130,6 +133,8 @@ pre-fetch: @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." + @${ECHO} " WITH_PROC_SCOPE_PTH=yes Use process scope threads" + @${ECHO} " (try it if you use libpthread)." @${ECHO} " OVERWRITE_DB=yes Re-initialize default databases." @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations" @${ECHO} " (use it if you need speed)." @@ -139,10 +144,14 @@ pre-fetch: post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts man support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in - @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in + @${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in +.if defined(WITH_PROC_SCOPE_PTH) + @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc +.endif post-build: @${SED} "s|%%DB_DIR%%|${DB_DIR}|g" ${PKGDIR}/pkg-install > ${WRKDIR}/pkg-install @@ -163,7 +172,8 @@ post-install: .endif @${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif - @${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%DB_DIR%%|${DB_DIR}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh + @${SED} "s|%%RC_SUBR%%|${RC_SUBR}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%DB_DIR%%|${DB_DIR}|g" < \ + ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/Flags @@ -189,9 +199,13 @@ CONFIGURE_ARGS+=--without-server post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests scripts man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in +.if defined(WITH_PROC_SCOPE_PTH) + @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c +.endif post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh diff --git a/databases/mysql60-server/distinfo b/databases/mysql60-server/distinfo index 43b1f7dfb6bc..58e4ac6083af 100644 --- a/databases/mysql60-server/distinfo +++ b/databases/mysql60-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.0-alpha.tar.gz) = e31664d1172b5823fb8be83051910ee2 -SIZE (mysql-5.0.0-alpha.tar.gz) = 16311204 +MD5 (mysql-5.0.1-alpha-snapshot.tar.gz) = 2a645afc9a8396ffc0fad271367494ea +SIZE (mysql-5.0.1-alpha-snapshot.tar.gz) = 19684742 diff --git a/databases/mysql60-server/files/mysql-server.sh b/databases/mysql60-server/files/mysql-server.sh index 5180b9c0c1eb..708ad57df4b3 100644 --- a/databases/mysql60-server/files/mysql-server.sh +++ b/databases/mysql60-server/files/mysql-server.sh @@ -1,27 +1,51 @@ #!/bin/sh +# +# $FreeBSD$ +# -DB_DIR=%%DB_DIR%% -PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid - -case "$1" in - start) - if [ -x %%PREFIX%%/bin/mysqld_safe ]; then - /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & - echo -n ' mysqld' - fi - ;; - stop) - if [ -f ${PIDFILE} ]; then - /bin/kill `cat ${PIDFILE}` > /dev/null 2>&1 && echo -n ' mysqld' - else - echo "mysql-server isn't running" - fi - ;; - *) - echo "" - echo "Usage: `basename $0` { start | stop }" - echo "" - exit 64 - ;; -esac +# PROVIDE: mysql +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown + +# +# Add the following line to /etc/rc.conf to enable mysql: +# mysql_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable MySQL. +# mysqllimits_enable (bool): Set to "NO" by default. +# Set it to yes to run `limits $limits_args` +# just before mysql starts. +# mysqllimits_args (str): Default to "-e -U mysql" +# Arguments of pre-start limits run. +# + +. %%RC_SUBR%% + +name="mysql" +rcvar=`set_rcvar` +mysql_dbdir="%%DB_DIR%%" +mysql_user="mysql" +pidfile="${mysql_dbdir}/`/bin/hostname`.pid" +command="%%PREFIX%%/bin/mysqld_safe" +command_args="--user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} > /dev/null &" +procname="%%PREFIX%%/libexec/mysqld" +start_precmd="${name}_prestart" + +[ -z "$mysql_enable" ] && mysql_enable="NO" +[ -z "$mysqllimits_enable" ] && mysqllimits_enable="NO" +[ -z "$mysqllimits_args" ] && mysqllimits_args="-e -U ${mysql_user}" + +mysql_prestart() +{ + if checkyesno mysqllimits_enable; then + eval `/usr/bin/limits ${mysqllimits_args}` 2>/dev/null + else + return 0 + fi +} + +required_dirs="${mysql_dbdir}" +required_files="${mysql_dbdir}/mysql/host.frm ${mysql_dbdir}/mysql/user.frm ${mysql_dbdir}/mysql/db.frm" + +load_rc_config $name +run_rc_command "$1" diff --git a/databases/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in index 94f38623fcf4..356baf88b938 100644 --- a/databases/mysql60-server/files/patch-Makefile.in +++ b/databases/mysql60-server/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Dec 1 13:55:28 2003 -+++ Makefile.in Wed Dec 10 00:18:16 2003 -@@ -209,12 +209,7 @@ +--- Makefile.in.orig Tue Jul 27 08:14:34 2004 ++++ Makefile.in Sat Oct 23 10:39:45 2004 +@@ -293,12 +293,7 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING zlib @@ -8,7 +8,7 @@ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests SSL\ -- BUILD @netware_dir@ os2 @libmysqld_dirs@ \ +- BUILD netware os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = diff --git a/databases/mysql60-server/files/patch-client::mysql.cc b/databases/mysql60-server/files/patch-client::mysql.cc new file mode 100644 index 000000000000..7e4fdfa6f22d --- /dev/null +++ b/databases/mysql60-server/files/patch-client::mysql.cc @@ -0,0 +1,11 @@ +--- client/mysql.cc.orig Sun Oct 24 15:54:36 2004 ++++ client/mysql.cc Sun Oct 24 15:55:52 2004 +@@ -294,7 +294,7 @@ + HIST_ENTRY is defined for libedit, but not for the real readline + Need to redefine it for real readline to find it + */ +-#if !defined(USE_LIBEDIT_INTERFACE) ++#if !defined(HAVE_HIST_ENTRY) + typedef struct _hist_entry { + const char *line; + const char *data; diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure index 9eed46865e83..fbbdc8efd9d1 100644 --- a/databases/mysql60-server/files/patch-configure +++ b/databases/mysql60-server/files/patch-configure @@ -9,50 +9,6 @@ # Prevent multiple expansion -@@ -9261,43 +9262,8 @@ - echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 - echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 - PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" - # BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *netware*) -- FIND_PROC= -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 @@ -12678,8 +12644,8 @@ # Some system specific hacks # @@ -64,12 +20,3 @@ case $SYSTEM_TYPE in *solaris2.7*) -@@ -23893,7 +23859,7 @@ - /* ) rel_srcdir="$srcdir" ;; - * ) rel_srcdir="../$srcdir" ;; - esac -- if test "x$enable_dependency_tracking" == xno -+ if test "x$enable_dependency_tracking" = xno - then - innodb_conf_flags=--disable-dependency-tracking - fi diff --git a/databases/mysql60-server/files/patch-scripts::Makefile.in b/databases/mysql60-server/files/patch-scripts::Makefile.in index 9010d283909f..ffef310f740c 100644 --- a/databases/mysql60-server/files/patch-scripts::Makefile.in +++ b/databases/mysql60-server/files/patch-scripts::Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Tue Mar 2 12:25:53 2004 -+++ scripts/Makefile.in Tue Mar 2 12:26:20 2004 -@@ -203,25 +203,7 @@ +--- scripts/Makefile.in.orig Tue Jul 27 08:14:44 2004 ++++ scripts/Makefile.in Sat Oct 23 10:44:33 2004 +@@ -287,26 +287,7 @@ vio_dir = @vio_dir@ vio_libs = @vio_libs@ @@ -22,12 +22,13 @@ - mysql_tableinfo \ - mysqld_multi \ - make_win_src_distribution \ +- make_win_binary_distribution \ - mysql_create_system_tables +bin_SCRIPTS = EXTRA_SCRIPTS = make_binary_distribution.sh \ -@@ -254,7 +236,7 @@ +@@ -340,7 +321,7 @@ mysqlbug @@ -36,7 +37,7 @@ # mysqlbug should be distributed built so that people can report build # failures with it. -@@ -510,8 +492,6 @@ +@@ -616,8 +597,6 @@ all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution diff --git a/databases/mysql60-server/files/patch-scripts::mysql_install_db.sh b/databases/mysql60-server/files/patch-scripts::mysql_install_db.sh deleted file mode 100644 index 1ccb78b2925a..000000000000 --- a/databases/mysql60-server/files/patch-scripts::mysql_install_db.sh +++ /dev/null @@ -1,22 +0,0 @@ ---- scripts/mysql_install_db.sh.orig Thu Mar 11 10:20:57 2004 -+++ scripts/mysql_install_db.sh Thu Mar 11 10:27:09 2004 -@@ -118,7 +118,7 @@ - if [ $? -ne 0 ] - then - resolved=`$bindir/resolveip localhost 2>&1` -- if [ $? -eq 0 ] -+ if [ $? -ne 0 ] - then - echo "Neither host '$hostname' and 'localhost' could not be looked up with" - echo "$bindir/resolveip" -@@ -128,8 +128,8 @@ - exit 1 - fi - echo "WARNING: The host '$hostname' could not be looked up with resolveip." -- echo "This probably means that your libc libraries are not 100 % compatible" -- echo "with this binary MySQL version. The MySQL daemon, mysqld, should work" -+ echo "This probably means that your host name is not listed in your" -+ echo "/etc/hosts file (as it should). The MySQL daemon, mysqld, should work" - echo "normally with the exception that host name resolving will not work." - echo "This means that you should use IP addresses instead of hostnames" - echo "when specifying MySQL privileges !" diff --git a/databases/mysql60-server/files/patch-scripts::mysqlbug.sh b/databases/mysql60-server/files/patch-scripts::mysqlbug.sh deleted file mode 100644 index fa26d2206310..000000000000 --- a/databases/mysql60-server/files/patch-scripts::mysqlbug.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- scripts/mysqlbug.sh.orig Tue May 18 10:20:19 2004 -+++ scripts/mysqlbug.sh Fri May 14 02:53:22 2004 -@@ -254,9 +254,9 @@ - if cmp -s $TEMP $TEMP.x - then - echo "File not changed, no bug report submitted." -- cp $TEMP /tmp/failed-mysql-bugreport -+ mv -f $TEMP /tmp/failed-mysql-bugreport - echo "The raw bug report exists in /tmp/failed-mysql-bugreport" -- echo "If you use this remember that the first lines of the report now is a lie.." -+ echo "If you use this remember that the first lines of the report are now a lie.." - exit 1 - fi - diff --git a/databases/mysql60-server/files/patch-scripts::mysqlhotcopy.sh b/databases/mysql60-server/files/patch-scripts::mysqlhotcopy.sh deleted file mode 100644 index 19d4395fa09f..000000000000 --- a/databases/mysql60-server/files/patch-scripts::mysqlhotcopy.sh +++ /dev/null @@ -1,49 +0,0 @@ ---- scripts/mysqlhotcopy.sh.orig Sun Dec 21 19:01:29 2003 -+++ scripts/mysqlhotcopy.sh Thu Sep 23 11:02:45 2004 -@@ -7,6 +7,7 @@ - use File::Path; - use DBI; - use Sys::Hostname; -+use File::Temp; - - =head1 NAME - -@@ -607,7 +608,6 @@ - sub copy_index - { - my ($method, $files, $source, $target) = @_; -- my $tmpfile="$opt_tmpdir/mysqlhotcopy$$"; - - print "Copying indices for ".@$files." files...\n" unless $opt{quiet}; - foreach my $file (@$files) -@@ -633,23 +633,23 @@ - } - close OUTPUT || die "Error on close of $to: $!\n"; - } -- elsif ($opt{method} eq 'scp') -+ elsif ($opt{method} =~ /^scp\b/) - { -- my $tmp=$tmpfile; -- open(OUTPUT,">$tmp") || die "Can\'t create file $tmp: $!\n"; -- if (syswrite(OUTPUT,$buff) != length($buff)) -+ my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir); -+ die "Can\'t create/open file in $opt_tmpdir\n"; -+ if (syswrite($fh,$buff) != length($buff)) - { - die "Error when writing data to $tmp: $!\n"; - } -- close OUTPUT || die "Error on close of $tmp: $!\n"; -- safe_system("scp $tmp $to"); -+ close $fh || die "Error on close of $tmp: $!\n"; -+ safe_system("$opt{method} $tmp $to"); -+ unlink $tmp; - } - else - { - die "Can't use unsupported method '$opt{method}'\n"; - } - } -- unlink "$tmpfile" if ($opt{method} eq 'scp'); - } - - diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist index b50c526d693f..be85c5051fdf 100644 --- a/databases/mysql60-server/pkg-plist +++ b/databases/mysql60-server/pkg-plist @@ -2,19 +2,54 @@ bin/comp_err bin/isamchk bin/isamlog bin/my_print_defaults +bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_create_system_tables bin/mysql_install_db +bin/mysql_tzinfo_to_sql bin/mysql_waitpid bin/mysqld_safe +bin/ndb_cpcd +bin/ndb_delete_all +bin/ndb_desc +bin/ndb_drop_index +bin/ndb_drop_table +bin/ndb_mgm +bin/ndb_restore +bin/ndb_select_all +bin/ndb_select_count +bin/ndb_show_tables +bin/ndb_waiter bin/pack_isam bin/perror bin/replace bin/resolve_stack_dump bin/resolveip etc/rc.d/mysql-server.sh +include/mysql/ndb/mgmapi/mgmapi.h +include/mysql/ndb/mgmapi/mgmapi_debug.h +include/mysql/ndb/ndb_types.h +include/mysql/ndb/ndb_version.h +include/mysql/ndb/ndbapi/Ndb.hpp +include/mysql/ndb/ndbapi/NdbApi.hpp +include/mysql/ndb/ndbapi/NdbBlob.hpp +include/mysql/ndb/ndbapi/NdbConnection.hpp +include/mysql/ndb/ndbapi/NdbCursorOperation.hpp +include/mysql/ndb/ndbapi/NdbDictionary.hpp +include/mysql/ndb/ndbapi/NdbError.hpp +include/mysql/ndb/ndbapi/NdbEventOperation.hpp +include/mysql/ndb/ndbapi/NdbIndexOperation.hpp +include/mysql/ndb/ndbapi/NdbOperation.hpp +include/mysql/ndb/ndbapi/NdbPool.hpp +include/mysql/ndb/ndbapi/NdbRecAttr.hpp +include/mysql/ndb/ndbapi/NdbReceiver.hpp +include/mysql/ndb/ndbapi/NdbResultSet.hpp +include/mysql/ndb/ndbapi/NdbScanFilter.hpp +include/mysql/ndb/ndbapi/NdbScanOperation.hpp +include/mysql/ndb/ndbapi/ndbapi_limits.h +include/mysql/ndb/ndbapi/ndberror.h lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a @@ -22,9 +57,14 @@ lib/mysql/libmyisam.a lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a +lib/mysql/libndbclient.a +lib/mysql/libndbclient.so +lib/mysql/libndbclient.so.0 lib/mysql/libnisam.a lib/mysql/libvio.a libexec/mysqld +libexec/ndb_mgmd +libexec/ndbd %%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif %%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif %%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif @@ -77,117 +117,125 @@ libexec/mysqld %%PORTDOCS%%%%DOCSDIR%%/manual.html %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/manual_toc.html -share/mysql/Description.plist -share/mysql/Info.plist -share/mysql/MySQL-shared-compat.spec -share/mysql/StartupParameters.plist -share/mysql/postinstall -share/mysql/preinstall -share/mysql/charsets/Index.xml -share/mysql/charsets/README -share/mysql/charsets/armscii8.xml -share/mysql/charsets/ascii.xml -share/mysql/charsets/cp1250.xml -share/mysql/charsets/cp1251.xml -share/mysql/charsets/cp1256.xml -share/mysql/charsets/cp1257.xml -share/mysql/charsets/cp850.xml -share/mysql/charsets/cp852.xml -share/mysql/charsets/cp866.xml -share/mysql/charsets/dec8.xml -share/mysql/charsets/geostd8.xml -share/mysql/charsets/greek.xml -share/mysql/charsets/hebrew.xml -share/mysql/charsets/hp8.xml -share/mysql/charsets/keybcs2.xml -share/mysql/charsets/koi8r.xml -share/mysql/charsets/koi8u.xml -share/mysql/charsets/latin1.xml -share/mysql/charsets/latin2.xml -share/mysql/charsets/latin5.xml -share/mysql/charsets/latin7.xml -share/mysql/charsets/macce.xml -share/mysql/charsets/macroman.xml -share/mysql/charsets/swe7.xml -share/mysql/czech/errmsg.sys -share/mysql/czech/errmsg.txt -share/mysql/danish/errmsg.sys -share/mysql/danish/errmsg.txt -share/mysql/dutch/errmsg.sys -share/mysql/dutch/errmsg.txt -share/mysql/english/errmsg.sys -share/mysql/english/errmsg.txt -share/mysql/estonian/errmsg.sys -share/mysql/estonian/errmsg.txt -share/mysql/fill_help_tables.sql -share/mysql/french/errmsg.sys -share/mysql/french/errmsg.txt -share/mysql/german/errmsg.sys -share/mysql/german/errmsg.txt -share/mysql/greek/errmsg.sys -share/mysql/greek/errmsg.txt -share/mysql/hungarian/errmsg.sys -share/mysql/hungarian/errmsg.txt -share/mysql/italian/errmsg.sys -share/mysql/italian/errmsg.txt -share/mysql/japanese/errmsg.sys -share/mysql/japanese/errmsg.txt -share/mysql/korean/errmsg.sys -share/mysql/korean/errmsg.txt -share/mysql/mi_test_all -share/mysql/mi_test_all.res -share/mysql/my-huge.cnf -share/mysql/my-large.cnf -share/mysql/my-medium.cnf -share/mysql/my-small.cnf -share/mysql/mysql-log-rotate -share/mysql/mysql.server -share/mysql/norwegian-ny/errmsg.sys -share/mysql/norwegian-ny/errmsg.txt -share/mysql/norwegian/errmsg.sys -share/mysql/norwegian/errmsg.txt -share/mysql/polish/errmsg.sys -share/mysql/polish/errmsg.txt -share/mysql/portuguese/errmsg.sys -share/mysql/portuguese/errmsg.txt -share/mysql/romanian/errmsg.sys -share/mysql/romanian/errmsg.txt -share/mysql/russian/errmsg.sys -share/mysql/russian/errmsg.txt -share/mysql/slovak/errmsg.sys -share/mysql/slovak/errmsg.txt -share/mysql/spanish/errmsg.sys -share/mysql/spanish/errmsg.txt -share/mysql/swedish/errmsg.sys -share/mysql/swedish/errmsg.txt -share/mysql/ukrainian/errmsg.sys -share/mysql/ukrainian/errmsg.txt +%%DATADIR%%/Description.plist +%%DATADIR%%/Info.plist +%%DATADIR%%/MySQL-shared-compat.spec +%%DATADIR%%/StartupParameters.plist +%%DATADIR%%/postinstall +%%DATADIR%%/preinstall +%%DATADIR%%/charsets/Index.xml +%%DATADIR%%/charsets/README +%%DATADIR%%/charsets/armscii8.xml +%%DATADIR%%/charsets/ascii.xml +%%DATADIR%%/charsets/cp1250.xml +%%DATADIR%%/charsets/cp1251.xml +%%DATADIR%%/charsets/cp1256.xml +%%DATADIR%%/charsets/cp1257.xml +%%DATADIR%%/charsets/cp850.xml +%%DATADIR%%/charsets/cp852.xml +%%DATADIR%%/charsets/cp866.xml +%%DATADIR%%/charsets/dec8.xml +%%DATADIR%%/charsets/geostd8.xml +%%DATADIR%%/charsets/greek.xml +%%DATADIR%%/charsets/hebrew.xml +%%DATADIR%%/charsets/hp8.xml +%%DATADIR%%/charsets/keybcs2.xml +%%DATADIR%%/charsets/koi8r.xml +%%DATADIR%%/charsets/koi8u.xml +%%DATADIR%%/charsets/latin1.xml +%%DATADIR%%/charsets/latin2.xml +%%DATADIR%%/charsets/latin5.xml +%%DATADIR%%/charsets/latin7.xml +%%DATADIR%%/charsets/macce.xml +%%DATADIR%%/charsets/macroman.xml +%%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/czech/errmsg.sys +%%DATADIR%%/czech/errmsg.txt +%%DATADIR%%/danish/errmsg.sys +%%DATADIR%%/danish/errmsg.txt +%%DATADIR%%/dutch/errmsg.sys +%%DATADIR%%/dutch/errmsg.txt +%%DATADIR%%/english/errmsg.sys +%%DATADIR%%/english/errmsg.txt +%%DATADIR%%/estonian/errmsg.sys +%%DATADIR%%/estonian/errmsg.txt +%%DATADIR%%/fill_help_tables.sql +%%DATADIR%%/french/errmsg.sys +%%DATADIR%%/french/errmsg.txt +%%DATADIR%%/german/errmsg.sys +%%DATADIR%%/german/errmsg.txt +%%DATADIR%%/greek/errmsg.sys +%%DATADIR%%/greek/errmsg.txt +%%DATADIR%%/hungarian/errmsg.sys +%%DATADIR%%/hungarian/errmsg.txt +%%DATADIR%%/italian/errmsg.sys +%%DATADIR%%/italian/errmsg.txt +%%DATADIR%%/japanese/errmsg.sys +%%DATADIR%%/japanese/errmsg.txt +%%DATADIR%%/korean/errmsg.sys +%%DATADIR%%/korean/errmsg.txt +%%DATADIR%%/mi_test_all +%%DATADIR%%/mi_test_all.res +%%DATADIR%%/my-huge.cnf +%%DATADIR%%/my-large.cnf +%%DATADIR%%/my-medium.cnf +%%DATADIR%%/my-small.cnf +%%DATADIR%%/mysql-log-rotate +%%DATADIR%%/mysql-%%VER%%.spec +%%DATADIR%%/mysql.server +%%DATADIR%%/norwegian-ny/errmsg.sys +%%DATADIR%%/norwegian-ny/errmsg.txt +%%DATADIR%%/norwegian/errmsg.sys +%%DATADIR%%/norwegian/errmsg.txt +%%DATADIR%%/polish/errmsg.sys +%%DATADIR%%/polish/errmsg.txt +%%DATADIR%%/portuguese/errmsg.sys +%%DATADIR%%/portuguese/errmsg.txt +%%DATADIR%%/romanian/errmsg.sys +%%DATADIR%%/romanian/errmsg.txt +%%DATADIR%%/russian/errmsg.sys +%%DATADIR%%/russian/errmsg.txt +%%DATADIR%%/serbian/errmsg.sys +%%DATADIR%%/serbian/errmsg.txt +%%DATADIR%%/slovak/errmsg.sys +%%DATADIR%%/slovak/errmsg.txt +%%DATADIR%%/spanish/errmsg.sys +%%DATADIR%%/spanish/errmsg.txt +%%DATADIR%%/swedish/errmsg.sys +%%DATADIR%%/swedish/errmsg.txt +%%DATADIR%%/ukrainian/errmsg.sys +%%DATADIR%%/ukrainian/errmsg.txt +@dirrm include/mysql/ndb/mgmapi +@dirrm include/mysql/ndb/ndbapi +@dirrm include/mysql/ndb +@unexec rmdir %D/include/mysql 2> /dev/null || true @unexec rmdir %D/lib/mysql 2> /dev/null || true %%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm share/mysql/charsets -@dirrm share/mysql/czech -@dirrm share/mysql/danish -@dirrm share/mysql/dutch -@dirrm share/mysql/english -@dirrm share/mysql/estonian -@dirrm share/mysql/french -@dirrm share/mysql/german -@dirrm share/mysql/greek -@dirrm share/mysql/hungarian -@dirrm share/mysql/italian -@dirrm share/mysql/japanese -@dirrm share/mysql/korean -@dirrm share/mysql/norwegian -@dirrm share/mysql/norwegian-ny -@dirrm share/mysql/polish -@dirrm share/mysql/portuguese -@dirrm share/mysql/romanian -@dirrm share/mysql/russian -@dirrm share/mysql/slovak -@dirrm share/mysql/spanish -@dirrm share/mysql/swedish -@dirrm share/mysql/ukrainian -@unexec rmdir %D/share/mysql 2> /dev/null || true +@dirrm %%DATADIR%%/charsets +@dirrm %%DATADIR%%/czech +@dirrm %%DATADIR%%/danish +@dirrm %%DATADIR%%/dutch +@dirrm %%DATADIR%%/english +@dirrm %%DATADIR%%/estonian +@dirrm %%DATADIR%%/french +@dirrm %%DATADIR%%/german +@dirrm %%DATADIR%%/greek +@dirrm %%DATADIR%%/hungarian +@dirrm %%DATADIR%%/italian +@dirrm %%DATADIR%%/japanese +@dirrm %%DATADIR%%/korean +@dirrm %%DATADIR%%/norwegian +@dirrm %%DATADIR%%/norwegian-ny +@dirrm %%DATADIR%%/polish +@dirrm %%DATADIR%%/portuguese +@dirrm %%DATADIR%%/romanian +@dirrm %%DATADIR%%/russian +@dirrm %%DATADIR%%/serbian +@dirrm %%DATADIR%%/slovak +@dirrm %%DATADIR%%/spanish +@dirrm %%DATADIR%%/swedish +@dirrm %%DATADIR%%/ukrainian +@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true @exec [ -d %%DB_DIR%% ] || %D/bin/mysql_install_db --ldata=%%DB_DIR%% @unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client index e260e22590c8..ab0454713675 100644 --- a/databases/mysql60-server/pkg-plist.client +++ b/databases/mysql60-server/pkg-plist.client @@ -32,6 +32,7 @@ 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_error.h include/mysql/raid.h @@ -47,7 +48,7 @@ lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.14 -share/mysql/mysql_fix_privilege_tables.sql +%%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql -@dirrm share/mysql +@dirrm %%DATADIR%% diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile index a0920329cced..71098d938b2a 100644 --- a/databases/percona55-server/Makefile +++ b/databases/percona55-server/Makefile @@ -6,33 +6,34 @@ # PORTNAME?= mysql -PORTVERSION= 5.0.0 -PORTREVISION?= 2 +PORTVERSION= 5.0.1 +PORTREVISION?= 0 CATEGORIES= databases -MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-5.0/ \ - http://www.softagency.co.jp/MySQL/Downloads/MySQL-5.0/ \ - ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-5.0/ \ - http://mysql.mediatraffic.fi/Downloads/MySQL-5.0/ \ - ftp://filepile.tiscali.de/mirror/mysql/Downloads/MySQL-5.0/ \ - http://mirrors.tilian.co.uk/mysql.com/Downloads/MySQL-5.0/ \ - ftp://ftp.rtfm.no/pub/mysql/Downloads/MySQL-5.0/ \ - http://www.mysql.cz/Downloads/MySQL-5.0/ \ - ftp://ftp.u-paris10.fr/mysql.com/Downloads/MySQL-5.0/ \ - http://mysql.proserve.nl/Downloads/MySQL-5.0/ \ - ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-5.0/ +MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/%SUBDIR%/ \ + http://www.softagency.co.jp/MySQL/Downloads/%SUBDIR%/ \ + ftp://sunsite.dk/mirrors/mysql/Downloads/%SUBDIR%/ \ + http://mysql.mediatraffic.fi/Downloads/%SUBDIR%/ \ + ftp://filepile.tiscali.de/mirror/mysql/Downloads/%SUBDIR%/ \ + http://mirrors.tilian.co.uk/mysql.com/Downloads/%SUBDIR%/ \ + ftp://ftp.rtfm.no/pub/mysql/Downloads/%SUBDIR%/ \ + http://www.mysql.cz/Downloads/%SUBDIR%/ \ + ftp://ftp.u-paris10.fr/mysql.com/Downloads/%SUBDIR%/ \ + http://mysql.proserve.nl/Downloads/%SUBDIR%/ \ + ftp://ftp.free.fr/pub/MySQL/Downloads/%SUBDIR%/ +MASTER_SITE_SUBDIR= MySQL-5.0.1-snapshot PKGNAMESUFFIX?= -server -DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha - -FORBIDDEN= "http://vuxml.freebsd.org/e5e2883d-ceb9-11d8-8898-000d6111a684.html (security)" +DISTNAME= ${PORTNAME}-${PORTVERSION}-alpha-snapshot MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha SLAVEDIRS= databases/mysql50-client PKGINSTALL?= ${WRKDIR}/pkg-install DB_DIR?= /var/db/mysql USE_LIBTOOL_VER=15 USE_REINPLACE= yes +USE_RC_SUBR= yes CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ @@ -45,6 +46,7 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \ --with-mysqlfs \ --with-vio \ --with-low-memory \ + --with-ndbcluster \ --with-comment='FreeBSD port: ${PKGNAME}' \ --enable-thread-safe-client @@ -111,7 +113,8 @@ LATEST_LINK= mysql50-server CONFLICTS= mysql-server-3.* mysql-server-4.* -PLIST_SUB= DB_DIR=${DB_DIR} +PLIST_SUB= DB_DIR=${DB_DIR} \ + VER=${PORTVERSION}-alpha MAN1= isamchk.1 isamlog.1 mysqld.1 \ mysqld_safe.1 perror.1 replace.1 @@ -130,6 +133,8 @@ pre-fetch: @${ECHO} " DB_DIR=directory Set alternate directory for database files" @${ECHO} " (default is /var/db/mysql)." @${ECHO} " WITH_LINUXTHREADS=yes Use the linuxthreads pthread library." + @${ECHO} " WITH_PROC_SCOPE_PTH=yes Use process scope threads" + @${ECHO} " (try it if you use libpthread)." @${ECHO} " OVERWRITE_DB=yes Re-initialize default databases." @${ECHO} " BUILD_OPTIMIZED=yes Enable compiler optimizations" @${ECHO} " (use it if you need speed)." @@ -139,10 +144,14 @@ pre-fetch: post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts man support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in - @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in + @${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in +.if defined(WITH_PROC_SCOPE_PTH) + @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc +.endif post-build: @${SED} "s|%%DB_DIR%%|${DB_DIR}|g" ${PKGDIR}/pkg-install > ${WRKDIR}/pkg-install @@ -163,7 +172,8 @@ post-install: .endif @${SETENV} DB_DIR=${DB_DIR} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif - @${SED} "s|%%PREFIX%%|${PREFIX}|g; s|%%DB_DIR%%|${DB_DIR}|g" < ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh + @${SED} "s|%%RC_SUBR%%|${RC_SUBR}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%DB_DIR%%|${DB_DIR}|g" < \ + ${FILESDIR}/mysql-server.sh > ${PREFIX}/etc/rc.d/mysql-server.sh @${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/Flags @@ -189,9 +199,13 @@ CONFIGURE_ARGS+=--without-server post-patch: @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests scripts man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in @${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in +.if defined(WITH_PROC_SCOPE_PTH) + @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c +.endif post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo index 43b1f7dfb6bc..58e4ac6083af 100644 --- a/databases/percona55-server/distinfo +++ b/databases/percona55-server/distinfo @@ -1,2 +1,2 @@ -MD5 (mysql-5.0.0-alpha.tar.gz) = e31664d1172b5823fb8be83051910ee2 -SIZE (mysql-5.0.0-alpha.tar.gz) = 16311204 +MD5 (mysql-5.0.1-alpha-snapshot.tar.gz) = 2a645afc9a8396ffc0fad271367494ea +SIZE (mysql-5.0.1-alpha-snapshot.tar.gz) = 19684742 diff --git a/databases/percona55-server/files/mysql-server.sh b/databases/percona55-server/files/mysql-server.sh index 5180b9c0c1eb..708ad57df4b3 100644 --- a/databases/percona55-server/files/mysql-server.sh +++ b/databases/percona55-server/files/mysql-server.sh @@ -1,27 +1,51 @@ #!/bin/sh +# +# $FreeBSD$ +# -DB_DIR=%%DB_DIR%% -PIDFILE=${DB_DIR}/`/bin/hostname -s`.pid - -case "$1" in - start) - if [ -x %%PREFIX%%/bin/mysqld_safe ]; then - /usr/bin/limits -U mysql \ - %%PREFIX%%/bin/mysqld_safe --user=mysql --datadir=${DB_DIR} --pid-file=${PIDFILE} > /dev/null & - echo -n ' mysqld' - fi - ;; - stop) - if [ -f ${PIDFILE} ]; then - /bin/kill `cat ${PIDFILE}` > /dev/null 2>&1 && echo -n ' mysqld' - else - echo "mysql-server isn't running" - fi - ;; - *) - echo "" - echo "Usage: `basename $0` { start | stop }" - echo "" - exit 64 - ;; -esac +# PROVIDE: mysql +# REQUIRE: NETWORKING SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown + +# +# Add the following line to /etc/rc.conf to enable mysql: +# mysql_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable MySQL. +# mysqllimits_enable (bool): Set to "NO" by default. +# Set it to yes to run `limits $limits_args` +# just before mysql starts. +# mysqllimits_args (str): Default to "-e -U mysql" +# Arguments of pre-start limits run. +# + +. %%RC_SUBR%% + +name="mysql" +rcvar=`set_rcvar` +mysql_dbdir="%%DB_DIR%%" +mysql_user="mysql" +pidfile="${mysql_dbdir}/`/bin/hostname`.pid" +command="%%PREFIX%%/bin/mysqld_safe" +command_args="--user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} > /dev/null &" +procname="%%PREFIX%%/libexec/mysqld" +start_precmd="${name}_prestart" + +[ -z "$mysql_enable" ] && mysql_enable="NO" +[ -z "$mysqllimits_enable" ] && mysqllimits_enable="NO" +[ -z "$mysqllimits_args" ] && mysqllimits_args="-e -U ${mysql_user}" + +mysql_prestart() +{ + if checkyesno mysqllimits_enable; then + eval `/usr/bin/limits ${mysqllimits_args}` 2>/dev/null + else + return 0 + fi +} + +required_dirs="${mysql_dbdir}" +required_files="${mysql_dbdir}/mysql/host.frm ${mysql_dbdir}/mysql/user.frm ${mysql_dbdir}/mysql/db.frm" + +load_rc_config $name +run_rc_command "$1" diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in index 94f38623fcf4..356baf88b938 100644 --- a/databases/percona55-server/files/patch-Makefile.in +++ b/databases/percona55-server/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Mon Dec 1 13:55:28 2003 -+++ Makefile.in Wed Dec 10 00:18:16 2003 -@@ -209,12 +209,7 @@ +--- Makefile.in.orig Tue Jul 27 08:14:34 2004 ++++ Makefile.in Sat Oct 23 10:39:45 2004 +@@ -293,12 +293,7 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING zlib @@ -8,7 +8,7 @@ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack @sql_client_dirs@ \ - @sql_server_dirs@ scripts man tests SSL\ -- BUILD @netware_dir@ os2 @libmysqld_dirs@ \ +- BUILD netware os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +SUBDIRS = diff --git a/databases/percona55-server/files/patch-client::mysql.cc b/databases/percona55-server/files/patch-client::mysql.cc new file mode 100644 index 000000000000..7e4fdfa6f22d --- /dev/null +++ b/databases/percona55-server/files/patch-client::mysql.cc @@ -0,0 +1,11 @@ +--- client/mysql.cc.orig Sun Oct 24 15:54:36 2004 ++++ client/mysql.cc Sun Oct 24 15:55:52 2004 +@@ -294,7 +294,7 @@ + HIST_ENTRY is defined for libedit, but not for the real readline + Need to redefine it for real readline to find it + */ +-#if !defined(USE_LIBEDIT_INTERFACE) ++#if !defined(HAVE_HIST_ENTRY) + typedef struct _hist_entry { + const char *line; + const char *data; diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure index 9eed46865e83..fbbdc8efd9d1 100644 --- a/databases/percona55-server/files/patch-configure +++ b/databases/percona55-server/files/patch-configure @@ -9,50 +9,6 @@ # Prevent multiple expansion -@@ -9261,43 +9262,8 @@ - echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5 - echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6 - PS=$ac_cv_path_PS --# Linux style --if $PS p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null" --# Solaris --elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null" - # BSD style --elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null --then - FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" --# SysV style --elif $PS -ef 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null" --# Do anybody use this? --elif $PS $$ 2> /dev/null | grep $0 > /dev/null --then -- FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null" --else -- case $SYSTEM_TYPE in -- *darwin*) -- FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *cygwin*) -- FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null" -- ;; -- *netware*) -- FIND_PROC= -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&5 --echo "$as_me: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." >&2;} -- { (exit 1); exit 1; }; } -- esac --fi - - echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 - echo "${ECHO_T}\"$FIND_PROC\"" >&6 @@ -12678,8 +12644,8 @@ # Some system specific hacks # @@ -64,12 +20,3 @@ case $SYSTEM_TYPE in *solaris2.7*) -@@ -23893,7 +23859,7 @@ - /* ) rel_srcdir="$srcdir" ;; - * ) rel_srcdir="../$srcdir" ;; - esac -- if test "x$enable_dependency_tracking" == xno -+ if test "x$enable_dependency_tracking" = xno - then - innodb_conf_flags=--disable-dependency-tracking - fi diff --git a/databases/percona55-server/files/patch-scripts::Makefile.in b/databases/percona55-server/files/patch-scripts::Makefile.in index 9010d283909f..ffef310f740c 100644 --- a/databases/percona55-server/files/patch-scripts::Makefile.in +++ b/databases/percona55-server/files/patch-scripts::Makefile.in @@ -1,6 +1,6 @@ ---- scripts/Makefile.in.orig Tue Mar 2 12:25:53 2004 -+++ scripts/Makefile.in Tue Mar 2 12:26:20 2004 -@@ -203,25 +203,7 @@ +--- scripts/Makefile.in.orig Tue Jul 27 08:14:44 2004 ++++ scripts/Makefile.in Sat Oct 23 10:44:33 2004 +@@ -287,26 +287,7 @@ vio_dir = @vio_dir@ vio_libs = @vio_libs@ @@ -22,12 +22,13 @@ - mysql_tableinfo \ - mysqld_multi \ - make_win_src_distribution \ +- make_win_binary_distribution \ - mysql_create_system_tables +bin_SCRIPTS = EXTRA_SCRIPTS = make_binary_distribution.sh \ -@@ -254,7 +236,7 @@ +@@ -340,7 +321,7 @@ mysqlbug @@ -36,7 +37,7 @@ # mysqlbug should be distributed built so that people can report build # failures with it. -@@ -510,8 +492,6 @@ +@@ -616,8 +597,6 @@ all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution diff --git a/databases/percona55-server/files/patch-scripts::mysql_install_db.sh b/databases/percona55-server/files/patch-scripts::mysql_install_db.sh deleted file mode 100644 index 1ccb78b2925a..000000000000 --- a/databases/percona55-server/files/patch-scripts::mysql_install_db.sh +++ /dev/null @@ -1,22 +0,0 @@ ---- scripts/mysql_install_db.sh.orig Thu Mar 11 10:20:57 2004 -+++ scripts/mysql_install_db.sh Thu Mar 11 10:27:09 2004 -@@ -118,7 +118,7 @@ - if [ $? -ne 0 ] - then - resolved=`$bindir/resolveip localhost 2>&1` -- if [ $? -eq 0 ] -+ if [ $? -ne 0 ] - then - echo "Neither host '$hostname' and 'localhost' could not be looked up with" - echo "$bindir/resolveip" -@@ -128,8 +128,8 @@ - exit 1 - fi - echo "WARNING: The host '$hostname' could not be looked up with resolveip." -- echo "This probably means that your libc libraries are not 100 % compatible" -- echo "with this binary MySQL version. The MySQL daemon, mysqld, should work" -+ echo "This probably means that your host name is not listed in your" -+ echo "/etc/hosts file (as it should). The MySQL daemon, mysqld, should work" - echo "normally with the exception that host name resolving will not work." - echo "This means that you should use IP addresses instead of hostnames" - echo "when specifying MySQL privileges !" diff --git a/databases/percona55-server/files/patch-scripts::mysqlbug.sh b/databases/percona55-server/files/patch-scripts::mysqlbug.sh deleted file mode 100644 index fa26d2206310..000000000000 --- a/databases/percona55-server/files/patch-scripts::mysqlbug.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- scripts/mysqlbug.sh.orig Tue May 18 10:20:19 2004 -+++ scripts/mysqlbug.sh Fri May 14 02:53:22 2004 -@@ -254,9 +254,9 @@ - if cmp -s $TEMP $TEMP.x - then - echo "File not changed, no bug report submitted." -- cp $TEMP /tmp/failed-mysql-bugreport -+ mv -f $TEMP /tmp/failed-mysql-bugreport - echo "The raw bug report exists in /tmp/failed-mysql-bugreport" -- echo "If you use this remember that the first lines of the report now is a lie.." -+ echo "If you use this remember that the first lines of the report are now a lie.." - exit 1 - fi - diff --git a/databases/percona55-server/files/patch-scripts::mysqlhotcopy.sh b/databases/percona55-server/files/patch-scripts::mysqlhotcopy.sh deleted file mode 100644 index 19d4395fa09f..000000000000 --- a/databases/percona55-server/files/patch-scripts::mysqlhotcopy.sh +++ /dev/null @@ -1,49 +0,0 @@ ---- scripts/mysqlhotcopy.sh.orig Sun Dec 21 19:01:29 2003 -+++ scripts/mysqlhotcopy.sh Thu Sep 23 11:02:45 2004 -@@ -7,6 +7,7 @@ - use File::Path; - use DBI; - use Sys::Hostname; -+use File::Temp; - - =head1 NAME - -@@ -607,7 +608,6 @@ - sub copy_index - { - my ($method, $files, $source, $target) = @_; -- my $tmpfile="$opt_tmpdir/mysqlhotcopy$$"; - - print "Copying indices for ".@$files." files...\n" unless $opt{quiet}; - foreach my $file (@$files) -@@ -633,23 +633,23 @@ - } - close OUTPUT || die "Error on close of $to: $!\n"; - } -- elsif ($opt{method} eq 'scp') -+ elsif ($opt{method} =~ /^scp\b/) - { -- my $tmp=$tmpfile; -- open(OUTPUT,">$tmp") || die "Can\'t create file $tmp: $!\n"; -- if (syswrite(OUTPUT,$buff) != length($buff)) -+ my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir); -+ die "Can\'t create/open file in $opt_tmpdir\n"; -+ if (syswrite($fh,$buff) != length($buff)) - { - die "Error when writing data to $tmp: $!\n"; - } -- close OUTPUT || die "Error on close of $tmp: $!\n"; -- safe_system("scp $tmp $to"); -+ close $fh || die "Error on close of $tmp: $!\n"; -+ safe_system("$opt{method} $tmp $to"); -+ unlink $tmp; - } - else - { - die "Can't use unsupported method '$opt{method}'\n"; - } - } -- unlink "$tmpfile" if ($opt{method} eq 'scp'); - } - - diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist index b50c526d693f..be85c5051fdf 100644 --- a/databases/percona55-server/pkg-plist +++ b/databases/percona55-server/pkg-plist @@ -2,19 +2,54 @@ bin/comp_err bin/isamchk bin/isamlog bin/my_print_defaults +bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_create_system_tables bin/mysql_install_db +bin/mysql_tzinfo_to_sql bin/mysql_waitpid bin/mysqld_safe +bin/ndb_cpcd +bin/ndb_delete_all +bin/ndb_desc +bin/ndb_drop_index +bin/ndb_drop_table +bin/ndb_mgm +bin/ndb_restore +bin/ndb_select_all +bin/ndb_select_count +bin/ndb_show_tables +bin/ndb_waiter bin/pack_isam bin/perror bin/replace bin/resolve_stack_dump bin/resolveip etc/rc.d/mysql-server.sh +include/mysql/ndb/mgmapi/mgmapi.h +include/mysql/ndb/mgmapi/mgmapi_debug.h +include/mysql/ndb/ndb_types.h +include/mysql/ndb/ndb_version.h +include/mysql/ndb/ndbapi/Ndb.hpp +include/mysql/ndb/ndbapi/NdbApi.hpp +include/mysql/ndb/ndbapi/NdbBlob.hpp +include/mysql/ndb/ndbapi/NdbConnection.hpp +include/mysql/ndb/ndbapi/NdbCursorOperation.hpp +include/mysql/ndb/ndbapi/NdbDictionary.hpp +include/mysql/ndb/ndbapi/NdbError.hpp +include/mysql/ndb/ndbapi/NdbEventOperation.hpp +include/mysql/ndb/ndbapi/NdbIndexOperation.hpp +include/mysql/ndb/ndbapi/NdbOperation.hpp +include/mysql/ndb/ndbapi/NdbPool.hpp +include/mysql/ndb/ndbapi/NdbRecAttr.hpp +include/mysql/ndb/ndbapi/NdbReceiver.hpp +include/mysql/ndb/ndbapi/NdbResultSet.hpp +include/mysql/ndb/ndbapi/NdbScanFilter.hpp +include/mysql/ndb/ndbapi/NdbScanOperation.hpp +include/mysql/ndb/ndbapi/ndbapi_limits.h +include/mysql/ndb/ndbapi/ndberror.h lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmerge.a @@ -22,9 +57,14 @@ lib/mysql/libmyisam.a lib/mysql/libmyisammrg.a lib/mysql/libmystrings.a lib/mysql/libmysys.a +lib/mysql/libndbclient.a +lib/mysql/libndbclient.so +lib/mysql/libndbclient.so.0 lib/mysql/libnisam.a lib/mysql/libvio.a libexec/mysqld +libexec/ndb_mgmd +libexec/ndbd %%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif %%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif %%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif @@ -77,117 +117,125 @@ libexec/mysqld %%PORTDOCS%%%%DOCSDIR%%/manual.html %%PORTDOCS%%%%DOCSDIR%%/manual.txt %%PORTDOCS%%%%DOCSDIR%%/manual_toc.html -share/mysql/Description.plist -share/mysql/Info.plist -share/mysql/MySQL-shared-compat.spec -share/mysql/StartupParameters.plist -share/mysql/postinstall -share/mysql/preinstall -share/mysql/charsets/Index.xml -share/mysql/charsets/README -share/mysql/charsets/armscii8.xml -share/mysql/charsets/ascii.xml -share/mysql/charsets/cp1250.xml -share/mysql/charsets/cp1251.xml -share/mysql/charsets/cp1256.xml -share/mysql/charsets/cp1257.xml -share/mysql/charsets/cp850.xml -share/mysql/charsets/cp852.xml -share/mysql/charsets/cp866.xml -share/mysql/charsets/dec8.xml -share/mysql/charsets/geostd8.xml -share/mysql/charsets/greek.xml -share/mysql/charsets/hebrew.xml -share/mysql/charsets/hp8.xml -share/mysql/charsets/keybcs2.xml -share/mysql/charsets/koi8r.xml -share/mysql/charsets/koi8u.xml -share/mysql/charsets/latin1.xml -share/mysql/charsets/latin2.xml -share/mysql/charsets/latin5.xml -share/mysql/charsets/latin7.xml -share/mysql/charsets/macce.xml -share/mysql/charsets/macroman.xml -share/mysql/charsets/swe7.xml -share/mysql/czech/errmsg.sys -share/mysql/czech/errmsg.txt -share/mysql/danish/errmsg.sys -share/mysql/danish/errmsg.txt -share/mysql/dutch/errmsg.sys -share/mysql/dutch/errmsg.txt -share/mysql/english/errmsg.sys -share/mysql/english/errmsg.txt -share/mysql/estonian/errmsg.sys -share/mysql/estonian/errmsg.txt -share/mysql/fill_help_tables.sql -share/mysql/french/errmsg.sys -share/mysql/french/errmsg.txt -share/mysql/german/errmsg.sys -share/mysql/german/errmsg.txt -share/mysql/greek/errmsg.sys -share/mysql/greek/errmsg.txt -share/mysql/hungarian/errmsg.sys -share/mysql/hungarian/errmsg.txt -share/mysql/italian/errmsg.sys -share/mysql/italian/errmsg.txt -share/mysql/japanese/errmsg.sys -share/mysql/japanese/errmsg.txt -share/mysql/korean/errmsg.sys -share/mysql/korean/errmsg.txt -share/mysql/mi_test_all -share/mysql/mi_test_all.res -share/mysql/my-huge.cnf -share/mysql/my-large.cnf -share/mysql/my-medium.cnf -share/mysql/my-small.cnf -share/mysql/mysql-log-rotate -share/mysql/mysql.server -share/mysql/norwegian-ny/errmsg.sys -share/mysql/norwegian-ny/errmsg.txt -share/mysql/norwegian/errmsg.sys -share/mysql/norwegian/errmsg.txt -share/mysql/polish/errmsg.sys -share/mysql/polish/errmsg.txt -share/mysql/portuguese/errmsg.sys -share/mysql/portuguese/errmsg.txt -share/mysql/romanian/errmsg.sys -share/mysql/romanian/errmsg.txt -share/mysql/russian/errmsg.sys -share/mysql/russian/errmsg.txt -share/mysql/slovak/errmsg.sys -share/mysql/slovak/errmsg.txt -share/mysql/spanish/errmsg.sys -share/mysql/spanish/errmsg.txt -share/mysql/swedish/errmsg.sys -share/mysql/swedish/errmsg.txt -share/mysql/ukrainian/errmsg.sys -share/mysql/ukrainian/errmsg.txt +%%DATADIR%%/Description.plist +%%DATADIR%%/Info.plist +%%DATADIR%%/MySQL-shared-compat.spec +%%DATADIR%%/StartupParameters.plist +%%DATADIR%%/postinstall +%%DATADIR%%/preinstall +%%DATADIR%%/charsets/Index.xml +%%DATADIR%%/charsets/README +%%DATADIR%%/charsets/armscii8.xml +%%DATADIR%%/charsets/ascii.xml +%%DATADIR%%/charsets/cp1250.xml +%%DATADIR%%/charsets/cp1251.xml +%%DATADIR%%/charsets/cp1256.xml +%%DATADIR%%/charsets/cp1257.xml +%%DATADIR%%/charsets/cp850.xml +%%DATADIR%%/charsets/cp852.xml +%%DATADIR%%/charsets/cp866.xml +%%DATADIR%%/charsets/dec8.xml +%%DATADIR%%/charsets/geostd8.xml +%%DATADIR%%/charsets/greek.xml +%%DATADIR%%/charsets/hebrew.xml +%%DATADIR%%/charsets/hp8.xml +%%DATADIR%%/charsets/keybcs2.xml +%%DATADIR%%/charsets/koi8r.xml +%%DATADIR%%/charsets/koi8u.xml +%%DATADIR%%/charsets/latin1.xml +%%DATADIR%%/charsets/latin2.xml +%%DATADIR%%/charsets/latin5.xml +%%DATADIR%%/charsets/latin7.xml +%%DATADIR%%/charsets/macce.xml +%%DATADIR%%/charsets/macroman.xml +%%DATADIR%%/charsets/swe7.xml +%%DATADIR%%/czech/errmsg.sys +%%DATADIR%%/czech/errmsg.txt +%%DATADIR%%/danish/errmsg.sys +%%DATADIR%%/danish/errmsg.txt +%%DATADIR%%/dutch/errmsg.sys +%%DATADIR%%/dutch/errmsg.txt +%%DATADIR%%/english/errmsg.sys +%%DATADIR%%/english/errmsg.txt +%%DATADIR%%/estonian/errmsg.sys +%%DATADIR%%/estonian/errmsg.txt +%%DATADIR%%/fill_help_tables.sql +%%DATADIR%%/french/errmsg.sys +%%DATADIR%%/french/errmsg.txt +%%DATADIR%%/german/errmsg.sys +%%DATADIR%%/german/errmsg.txt +%%DATADIR%%/greek/errmsg.sys +%%DATADIR%%/greek/errmsg.txt +%%DATADIR%%/hungarian/errmsg.sys +%%DATADIR%%/hungarian/errmsg.txt +%%DATADIR%%/italian/errmsg.sys +%%DATADIR%%/italian/errmsg.txt +%%DATADIR%%/japanese/errmsg.sys +%%DATADIR%%/japanese/errmsg.txt +%%DATADIR%%/korean/errmsg.sys +%%DATADIR%%/korean/errmsg.txt +%%DATADIR%%/mi_test_all +%%DATADIR%%/mi_test_all.res +%%DATADIR%%/my-huge.cnf +%%DATADIR%%/my-large.cnf +%%DATADIR%%/my-medium.cnf +%%DATADIR%%/my-small.cnf +%%DATADIR%%/mysql-log-rotate +%%DATADIR%%/mysql-%%VER%%.spec +%%DATADIR%%/mysql.server +%%DATADIR%%/norwegian-ny/errmsg.sys +%%DATADIR%%/norwegian-ny/errmsg.txt +%%DATADIR%%/norwegian/errmsg.sys +%%DATADIR%%/norwegian/errmsg.txt +%%DATADIR%%/polish/errmsg.sys +%%DATADIR%%/polish/errmsg.txt +%%DATADIR%%/portuguese/errmsg.sys +%%DATADIR%%/portuguese/errmsg.txt +%%DATADIR%%/romanian/errmsg.sys +%%DATADIR%%/romanian/errmsg.txt +%%DATADIR%%/russian/errmsg.sys +%%DATADIR%%/russian/errmsg.txt +%%DATADIR%%/serbian/errmsg.sys +%%DATADIR%%/serbian/errmsg.txt +%%DATADIR%%/slovak/errmsg.sys +%%DATADIR%%/slovak/errmsg.txt +%%DATADIR%%/spanish/errmsg.sys +%%DATADIR%%/spanish/errmsg.txt +%%DATADIR%%/swedish/errmsg.sys +%%DATADIR%%/swedish/errmsg.txt +%%DATADIR%%/ukrainian/errmsg.sys +%%DATADIR%%/ukrainian/errmsg.txt +@dirrm include/mysql/ndb/mgmapi +@dirrm include/mysql/ndb/ndbapi +@dirrm include/mysql/ndb +@unexec rmdir %D/include/mysql 2> /dev/null || true @unexec rmdir %D/lib/mysql 2> /dev/null || true %%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm share/mysql/charsets -@dirrm share/mysql/czech -@dirrm share/mysql/danish -@dirrm share/mysql/dutch -@dirrm share/mysql/english -@dirrm share/mysql/estonian -@dirrm share/mysql/french -@dirrm share/mysql/german -@dirrm share/mysql/greek -@dirrm share/mysql/hungarian -@dirrm share/mysql/italian -@dirrm share/mysql/japanese -@dirrm share/mysql/korean -@dirrm share/mysql/norwegian -@dirrm share/mysql/norwegian-ny -@dirrm share/mysql/polish -@dirrm share/mysql/portuguese -@dirrm share/mysql/romanian -@dirrm share/mysql/russian -@dirrm share/mysql/slovak -@dirrm share/mysql/spanish -@dirrm share/mysql/swedish -@dirrm share/mysql/ukrainian -@unexec rmdir %D/share/mysql 2> /dev/null || true +@dirrm %%DATADIR%%/charsets +@dirrm %%DATADIR%%/czech +@dirrm %%DATADIR%%/danish +@dirrm %%DATADIR%%/dutch +@dirrm %%DATADIR%%/english +@dirrm %%DATADIR%%/estonian +@dirrm %%DATADIR%%/french +@dirrm %%DATADIR%%/german +@dirrm %%DATADIR%%/greek +@dirrm %%DATADIR%%/hungarian +@dirrm %%DATADIR%%/italian +@dirrm %%DATADIR%%/japanese +@dirrm %%DATADIR%%/korean +@dirrm %%DATADIR%%/norwegian +@dirrm %%DATADIR%%/norwegian-ny +@dirrm %%DATADIR%%/polish +@dirrm %%DATADIR%%/portuguese +@dirrm %%DATADIR%%/romanian +@dirrm %%DATADIR%%/russian +@dirrm %%DATADIR%%/serbian +@dirrm %%DATADIR%%/slovak +@dirrm %%DATADIR%%/spanish +@dirrm %%DATADIR%%/swedish +@dirrm %%DATADIR%%/ukrainian +@unexec rmdir %D/%%DATADIR%% 2> /dev/null || true @exec [ -d %%DB_DIR%% ] || %D/bin/mysql_install_db --ldata=%%DB_DIR%% @unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client index e260e22590c8..ab0454713675 100644 --- a/databases/percona55-server/pkg-plist.client +++ b/databases/percona55-server/pkg-plist.client @@ -32,6 +32,7 @@ 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_error.h include/mysql/raid.h @@ -47,7 +48,7 @@ lib/mysql/libmysqlclient.so.14 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.14 -share/mysql/mysql_fix_privilege_tables.sql +%%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql @dirrm lib/mysql -@dirrm share/mysql +@dirrm %%DATADIR%% |