aboutsummaryrefslogtreecommitdiffstats
path: root/databases/mysql51-server
diff options
context:
space:
mode:
authordirk <dirk@FreeBSD.org>2000-10-19 17:17:57 +0800
committerdirk <dirk@FreeBSD.org>2000-10-19 17:17:57 +0800
commita908968439c3efd8714b365151c4c9ee797cbf1d (patch)
treedb45bcab5f925441b0cd8f1f19a89bd2cda9c29c /databases/mysql51-server
parentc4de28d852b1eee102cf648822fc67014c916cf7 (diff)
downloadfreebsd-ports-gnome-a908968439c3efd8714b365151c4c9ee797cbf1d.tar.gz
freebsd-ports-gnome-a908968439c3efd8714b365151c4c9ee797cbf1d.tar.zst
freebsd-ports-gnome-a908968439c3efd8714b365151c4c9ee797cbf1d.zip
Upgrade to MySQL-3.23.24 after repository copy from mysql322-client
and mysql322-server. - mit-pthread support was dropped. - libmysqlclient.so.9 was renamed to libmysqlclient.so.6 (like the one coming with MySQL-3.22.x) so ports depending on MySQL having a chance of using 3.23.x if installed. mysql322-(client|server) and mysql323-(client|server) can't be installed at the same time, of course.
Diffstat (limited to 'databases/mysql51-server')
-rw-r--r--databases/mysql51-server/Makefile87
-rw-r--r--databases/mysql51-server/distinfo2
-rw-r--r--databases/mysql51-server/files/patch-Makefile.in17
-rw-r--r--databases/mysql51-server/files/patch-ab35
-rw-r--r--databases/mysql51-server/files/patch-af39
-rw-r--r--databases/mysql51-server/files/patch-configure55
-rw-r--r--databases/mysql51-server/pkg-plist135
-rw-r--r--databases/mysql51-server/pkg-plist.client1
8 files changed, 180 insertions, 191 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 2112959ff5fc..12da661c0648 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,24 +1,25 @@
# ports collection makefile for: MySQL-server
-# Date created: 26 Jan 1998
-# Whom: Josh Tiefenbach <josh@ican.net>
+# Date created: Sun Sep 24 21:20:46 CEST 2000
+# Whom: Dirk Froemberg <dirk@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME?= ${MASTERPORTNAME}
-PORTVERSION= 3.22.32
+PORTVERSION= 3.23.24
CATEGORIES= databases
-MASTER_SITES= http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.22/ \
- ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.22/ \
- ftp://ftp.plig.net/pub/mysql/Downloads/MySQL-3.22/ \
- ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.22/
-DISTNAME= mysql-${PORTVERSION}
+MASTER_SITES= http://download.sourceforge.net/mysql/ \
+ http://www.fh-wolfenbuettel.de/ftp/pub/database/mysql/Downloads/MySQL-3.23/ \
+ ftp://ftp.digex.net/pub/packages/database/mysql/Downloads/MySQL-3.23/ \
+ ftp://ftp.plig.net/pub/mysql/Downloads/MySQL-3.23/ \
+ ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MySQL-3.23/
+DISTNAME= mysql-${PORTVERSION}-beta
MAINTAINER= dirk@FreeBSD.org
Y2K= http://www.mysql.com/documentation/mysql/bychapter/manual_Introduction.html#Year_2000_compliance
-SLAVEDIRS= databases/mysql322-client
+SLAVEDIRS= databases/mysql323-client
MASTERPORTNAME= mysql-server
DB_DIR?= /var/db/mysql
USE_PERL5= yes
@@ -27,7 +28,8 @@ CONFIGURE_ARGS= --localstatedir=${DB_DIR} \
--without-perl \
--without-debug \
--without-readline \
- --without-bench
+ --without-bench \
+ --with-mit-threads=no
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS+=--enable-assembler
.endif
@@ -38,62 +40,9 @@ CONFIGURE_ENV+= PERL=${PERL} \
# MySQL-Server part
.if !defined(CLIENT_ONLY)
-RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql322-client
+RUN_DEPENDS= mysql:${PORTSDIR}/databases/mysql323-client
-PLIST_SUB= MYSQL_VERSION=${PORTVERSION}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 320000
-.if defined(MIT_PTHREADS)
-CONFIGURE_ARGS+= --with-mit-threads=yes
-
-pre-fetch:
- @${ECHO}
- @${ECHO} "Using supplied mit-pthreads."
- @${ECHO}
-.else
-CONFIGURE_ARGS+= --with-mit-threads=no
-
-pre-fetch:
- @${ECHO}
- @${ECHO} "Using native FreeBSD threads (libc_r)."
- @${ECHO}
- @${ECHO} "You may set MIT_PTHREADS (make MIT_PTHREADS=yes)"
- @${ECHO} "to compile mysql with the supplied mit-pthreads."
- @${ECHO} "(You don't want to set this unless you have a good reason)."
- @${ECHO}
-.endif
-.elif ${OSVERSION} >= 300000
-.if defined(NATIVE_THREADS)
-CONFIGURE_ARGS+= --with-mit-threads=no
-
-pre-fetch:
- @${ECHO}
- @${ECHO} "Using native FreeBSD threads (libc_r)."
- @${ECHO}
-.else
-CONFIGURE_ARGS+= --with-mit-threads=yes
-
-pre-fetch:
- @${ECHO}
- @${ECHO} "Using supplied mit-pthreads."
- @${ECHO}
- @${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
- @${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
- @${ECHO} "Warning: There are some bugs in libc_r which prevent"
- @${ECHO} " 'mysqladmin shutdown' from working properly and"
- @${ECHO} " killing mysqld might not work."
- @${ECHO}
-.endif
-.else
-CONFIGURE_ARGS+= --with-mit-threads=yes
-
-pre-fetch:
- @${ECHO}
- @${ECHO} "Using supplied mit-pthreads."
- @${ECHO}
-.endif
+PLIST_SUB= MYSQL_VERSION=${PORTVERSION}-beta
post-patch:
${MV} ${WRKSRC}/strings/strings-x86.s ${WRKSRC}/strings/strings-x86.S
@@ -126,17 +75,15 @@ post-install:
@${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-server.sh
.if !defined(NOPORTDOCS)
- ${MKDIR} ${PREFIX}/share/doc/mysql/Img
+ ${MKDIR} ${PREFIX}/share/doc/mysql/Flags
.for doc in manual.html manual.ps manual_toc.html manual.txt manual.texi include.texi
${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${PREFIX}/share/doc/mysql
.endfor
- ${INSTALL_DATA} ${WRKSRC}/Docs/Img/*.gif ${PREFIX}/share/doc/mysql/Img
+ ${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${PREFIX}/share/doc/mysql/Flags
${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
.endif
-.include <bsd.port.post.mk>
-
# MySQL-Client part
.else
MAN1= mysql.1
@@ -152,6 +99,6 @@ post-install:
@${ECHO} "" >> ${PREFIX}/etc/rc.d/mysql-client.sh
@${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/mysql" >> ${PREFIX}/etc/rc.d/mysql-client.sh
@${CHMOD} 750 ${PREFIX}/etc/rc.d/mysql-client.sh
+.endif
.include <bsd.port.mk>
-.endif
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index edfe7eb2ff4a..1f8297934612 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1 +1 @@
-MD5 (mysql-3.22.32.tar.gz) = 244e08d9a1f4b2ad799aa40ad3cc897a
+MD5 (mysql-3.23.24-beta.tar.gz) = a4d1e1075db34675d91280bfe81aa891
diff --git a/databases/mysql51-server/files/patch-Makefile.in b/databases/mysql51-server/files/patch-Makefile.in
index 00190736f765..7a7ba5097039 100644
--- a/databases/mysql51-server/files/patch-Makefile.in
+++ b/databases/mysql51-server/files/patch-Makefile.in
@@ -1,15 +1,16 @@
---- Makefile.in.orig Sat Jan 1 17:59:38 2000
-+++ Makefile.in Mon Jan 3 17:19:23 2000
-@@ -144,7 +144,11 @@
+--- Makefile.in.orig Fri Sep 8 10:00:29 2000
++++ Makefile.in Sat Sep 23 21:26:18 2000
+@@ -172,8 +172,12 @@
# These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE-GENERIC README PUBLIC INSTALL-SOURCE MIRRORS
+ EXTRA_DIST = INSTALL-SOURCE README COPYING COPYING.LIB MIRRORS
+
+-SUBDIRS = include @docs_dirs@ @readline_dir@ @thread_dirs@ @sql_client_dirs@ @sql_server_dirs@ scripts tests man @bench_dirs@ support-files
--SUBDIRS = include @docs_dirs@ @readline_dir@ client @sql_server_dirs@ scripts tests man @bench_dirs@ support-files
+.if defined(CLIENT_ONLY)
-+SUBDIRS = include @readline_dir@ client tests man
++SUBDIRS = include @readline_dir@ @sql_client_dirs@ tests man
+.else
-+SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files
++SUBDIRS = include @thread_dirs@ @docs_dirs@ @sql_server_dirs@ scripts @bench_dirs@ support-files
+.endif
-
# Relink after clean
+ CLEANFILES = linked_client_sources linked_server_sources linked_libmysql_sources linked_libmysql_r_sources
diff --git a/databases/mysql51-server/files/patch-ab b/databases/mysql51-server/files/patch-ab
index 1fd66bbe0cad..dfeb77aaa3f9 100644
--- a/databases/mysql51-server/files/patch-ab
+++ b/databases/mysql51-server/files/patch-ab
@@ -1,24 +1,15 @@
---- scripts/mysql_install_db.sh.orig Wed Jan 12 21:06:30 2000
-+++ scripts/mysql_install_db.sh Sun Mar 26 23:20:27 2000
-@@ -15,8 +15,6 @@
- force=0
- IN_RPM=0
-
--# Are we doing an rpm install?
--if test "$1" = "-IN-RPM"; then IN_RPM=1; shift; fi
- if test "$1" = "--force"; then force=1; shift; fi
-
- # Get mysqld/safe_mysqld options from /etc/my.cnf or ~/.my.cnf
-@@ -60,8 +58,6 @@
- fi
- fi
-
--# On IRIX hostname is in /usr/bsd so add this to the path
--PATH=$PATH:/usr/bsd
- hostname=`hostname` # Install this too in the user table
-
- # Check if hostname is valid
-@@ -255,12 +251,6 @@
+--- scripts/mysql_install_db.sh.orig Fri Sep 8 09:50:24 2000
++++ scripts/mysql_install_db.sh Sat Sep 23 21:13:37 2000
+@@ -21,8 +21,6 @@
+ case "$1" in
+ -*) eqvalue="`echo $1 |sed 's/[-_a-zA-Z0-9]*=//'`"
+ case "$1" in
+- -IN-RPM) IN_RPM=1
+- ;;
+ --force) force=1
+ ;;
+ --no-defaults) defaults="$1"; CONFIG_FILES=/nonexistent
+@@ -304,12 +302,6 @@
END_OF_DATA
then
echo ""
@@ -30,4 +21,4 @@
- fi
echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
echo "This is done with:"
- echo "$bindir/mysqladmin -u root password 'new-password'"
+ echo "$bindir/mysqladmin -u root -p password 'new-password'"
diff --git a/databases/mysql51-server/files/patch-af b/databases/mysql51-server/files/patch-af
index 2593da4d1c64..05b70349d841 100644
--- a/databases/mysql51-server/files/patch-af
+++ b/databases/mysql51-server/files/patch-af
@@ -1,43 +1,36 @@
---- scripts/safe_mysqld.sh.orig Fri May 14 11:11:46 1999
-+++ scripts/safe_mysqld.sh Tue Jun 8 11:14:02 1999
-@@ -12,33 +12,9 @@
-
- trap '' 1 2 3 15 # we shouldn't let anyone kill us
+--- scripts/safe_mysqld.sh.orig Fri Sep 8 09:50:24 2000
++++ scripts/safe_mysqld.sh Sat Sep 23 21:16:08 2000
+@@ -36,26 +36,9 @@
+ done
+ }
+-MY_PWD=`pwd`
-# Check if we are starting this relative (for the binary release)
--if test -d ./data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
+-if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
- -x ./bin/mysqld
-then
-- MY_BASEDIR_VERSION=`pwd` # Where bin, share and data are
-- DATADIR=$MY_BASEDIR_VERSION/data # Where the databases are
+- MY_BASEDIR_VERSION=$MY_PWD # Where bin, share and data are
- ledir=$MY_BASEDIR_VERSION/bin # Where mysqld is
+- DATADIR=$MY_BASEDIR_VERSION/data
-# Check if this is a 'moved install directory'
-elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
- -x ./libexec/mysqld
-then
-- MY_BASEDIR_VERSION=`pwd` # Where libexec, share and var are
-- DATADIR=$MY_BASEDIR_VERSION/var # Where the databases are
+- MY_BASEDIR_VERSION=$MY_PWD # Where libexec, share and var are
- ledir=$MY_BASEDIR_VERSION/libexec # Where mysqld is
+- DATADIR=$MY_BASEDIR_VERSION/var
-else
- MY_BASEDIR_VERSION=@prefix@
- DATADIR=@localstatedir@
- ledir=@libexecdir@
-- if test ! -x $ledir/mysqld
-- then
-- echo "The file $ledir/mysqld doesn't exist or is not executable"
-- echo "Please do a cd to the mysql installation directory and restart"
-- echo "this script from there as follows:"
-- echo "./bin/safe_mysqld".
-- exit 1;
-- fi
-fi
+MY_BASEDIR_VERSION=@prefix@
+DATADIR=@localstatedir@
+ledir=@libexecdir@
pid_file=$DATADIR/`@HOSTNAME@`.pid
- log=$DATADIR/`@HOSTNAME@`.log
-@@ -114,33 +90,6 @@
+ MYSQL_UNIX_PORT=@MYSQL_UNIX_ADDR@
+@@ -154,33 +137,6 @@
if test ! -f $pid_file # This is removed if normal shutdown
then
break;
@@ -49,12 +42,12 @@
- # but should work for the rest of the servers.
- # The only thing is ps x => redhat 5 gives warnings when using ps -x.
- # kill -9 is used or the process won't react on the kill.
-- numofproces=`ps x | grep -v "grep" | grep -c $ledir/mysqld`
+- numofproces=`ps xa | grep -v "grep" | grep -c $ledir/mysqld`
- echo -e "\nNumber of processes running now: $numofproces" | tee -a $err_log
- I=1
- while test "$I" -le "$numofproces"
- do
-- PROC=`ps x | grep $ledir/mysqld | grep -v "grep" | tail -1`
+- PROC=`ps xa | grep $ledir/mysqld | grep -v "grep" | tail -1`
- for T in $PROC
- do
- break
@@ -69,5 +62,5 @@
- I=`expr $I + 1`
- done
fi
- echo "mysqld restarted on " `date` | tee -a $err_log
+ echo "`date +'%y%m%d %H:%M:%S mysqld restarted'`" | tee -a $err_log
done
diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure
index 133bd4200860..21bf43709afc 100644
--- a/databases/mysql51-server/files/patch-configure
+++ b/databases/mysql51-server/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig Sun Feb 13 03:46:09 2000
-+++ configure Wed May 3 12:20:25 2000
-@@ -2743,7 +2743,7 @@
+--- configure.orig Fri Sep 8 09:50:33 2000
++++ configure Sat Sep 23 23:33:39 2000
+@@ -1057,7 +1057,7 @@
+ PROTOCOL_VERSION=10
+ DOT_FRM_VERSION=6
+ # See the libtool docs for information on how to do shared lib versions.
+-SHARED_LIB_VERSION=9:0:0
++SHARED_LIB_VERSION=6:0:0
+
+ # Set all version vars based on $VERSION. How do we do this more elegant ?
+ # Remember that regexps needs to quote [ and ] since this is run through m4
+@@ -2908,7 +2908,7 @@
;;
esac
fi
@@ -9,9 +18,9 @@
if test -n "$HOSTNAME"; then
echo "$ac_t""$HOSTNAME" 1>&6
else
-@@ -2871,30 +2871,7 @@
+@@ -3036,29 +3036,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
- echo "configure:2873: checking "how to check if pid exists"" >&5
+ echo "configure:3038: checking "how to check if pid exists"" >&5
PS=$ac_cv_path_PS
-# Linux style
-if $PS p $$ 2> /dev/null | grep $0 > /dev/null
@@ -36,12 +45,11 @@
-else
- { echo "configure: error: Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual." 1>&2; exit 1; }
-fi
--
+FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"
+
echo "$ac_t"""$FIND_PROC"" 1>&6
- # Check if a pid is valid
-@@ -4646,8 +4623,6 @@
+@@ -5354,8 +5332,6 @@
#define $ac_tr_lib 1
EOF
@@ -50,7 +58,7 @@
else
echo "$ac_t""no" 1>&6
fi
-@@ -4881,28 +4856,6 @@
+@@ -5578,28 +5554,6 @@
fi
@@ -79,7 +87,7 @@
# Check whether --with-debug or --without-debug was given.
if test "${with_debug+set}" = set; then
withval="$with_debug"
-@@ -5615,10 +5568,6 @@
+@@ -6280,10 +6234,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross
@@ -89,8 +97,19 @@
-fi
mysql_cv_btype_last_arg_accept=none
cat > conftest.$ac_ext <<EOF
- #line 5625 "configure"
-@@ -7655,10 +7604,6 @@
+ #line 6290 "configure"
+@@ -8290,10 +8240,6 @@
+ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cxx_cross
+
+-if test "$ac_cv_prog_gxx" = "yes"
+-then
+- CXXFLAGS="$CXXFLAGS -Werror"
+-fi
+ cat > conftest.$ac_ext <<EOF
+ #line 8299 "configure"
+ #include "confdefs.h"
+@@ -8358,10 +8304,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross
@@ -99,9 +118,9 @@
- CXXFLAGS="$CXXFLAGS -Werror"
-fi
cat > conftest.$ac_ext <<EOF
- #line 7664 "configure"
+ #line 8367 "configure"
#include "confdefs.h"
-@@ -7721,10 +7666,6 @@
+@@ -8425,10 +8367,6 @@
ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
cross_compiling=$ac_cv_prog_cxx_cross
@@ -110,9 +129,9 @@
- CXXFLAGS="$CXXFLAGS -Werror"
-fi
cat > conftest.$ac_ext <<EOF
- #line 7730 "configure"
+ #line 8434 "configure"
#include "confdefs.h"
-@@ -8005,7 +7946,7 @@
+@@ -8712,7 +8650,7 @@
#include <pthread.h>
int main() {
pthread_attr_t thr_attr;
@@ -120,8 +139,8 @@
+XXXpthread_attr_setscope(&thr_attr,0);
; return 0; }
EOF
- if { (eval echo configure:8012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -8210,7 +8151,7 @@
+ if { (eval echo configure:8719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -9670,7 +9608,7 @@
echo ""
echo "Configuring MIT Pthreads"
# We will never install so installation paths are not needed.
diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist
index 26171076eb40..30d57c4ace97 100644
--- a/databases/mysql51-server/pkg-plist
+++ b/databases/mysql51-server/pkg-plist
@@ -2,16 +2,23 @@ bin/comp_err
bin/isamchk
bin/isamlog
bin/msql2mysql
+bin/my_print_defaults
+bin/myisamchk
+bin/myisamlog
+bin/myisampack
+bin/mysql_config
+bin/mysql_convert_table_format
bin/mysql_find_rows
bin/mysql_fix_privilege_tables
bin/mysql_install_db
bin/mysql_setpermission
bin/mysql_zap
bin/mysqlaccess
+bin/mysqlbinlog
bin/mysqlbug
bin/mysqlhotcopy
+bin/pack_isam
bin/perror
-bin/print_defaults
bin/replace
bin/resolveip
bin/safe_mysqld
@@ -22,53 +29,51 @@ info/mysql.info
lib/mysql/libdbug.a
lib/mysql/libheap.a
lib/mysql/libmerge.a
+lib/mysql/libmyisam.a
+lib/mysql/libmyisammrg.a
lib/mysql/libmystrings.a
lib/mysql/libmysys.a
lib/mysql/libnisam.a
libexec/mysqld
-share/doc/mysql/Img/australia.gif
-share/doc/mysql/Img/austria.gif
-share/doc/mysql/Img/brazil.gif
-share/doc/mysql/Img/bulgaria.gif
-share/doc/mysql/Img/canada.gif
-share/doc/mysql/Img/chile.gif
-share/doc/mysql/Img/china.gif
-share/doc/mysql/Img/croatia.gif
-share/doc/mysql/Img/czech-republic.gif
-share/doc/mysql/Img/denmark.gif
-share/doc/mysql/Img/estonia.gif
-share/doc/mysql/Img/finland.gif
-share/doc/mysql/Img/france.gif
-share/doc/mysql/Img/germany.gif
-share/doc/mysql/Img/great-britain.gif
-share/doc/mysql/Img/greece.gif
-share/doc/mysql/Img/html-fs.gif
-share/doc/mysql/Img/hungary.gif
-share/doc/mysql/Img/iceland.gif
-share/doc/mysql/Img/ireland.gif
-share/doc/mysql/Img/island.gif
-share/doc/mysql/Img/israel.gif
-share/doc/mysql/Img/italy.gif
-share/doc/mysql/Img/japan.gif
-share/doc/mysql/Img/kroatia.gif
-share/doc/mysql/Img/mysql-logo.gif
-share/doc/mysql/Img/mysql5.gif
-share/doc/mysql/Img/netherlands.gif
-share/doc/mysql/Img/poland.gif
-share/doc/mysql/Img/portugal.gif
-share/doc/mysql/Img/romania.gif
-share/doc/mysql/Img/russia.gif
-share/doc/mysql/Img/singapore.gif
-share/doc/mysql/Img/south-africa.gif
-share/doc/mysql/Img/south-africa1.gif
-share/doc/mysql/Img/south-korea.gif
-share/doc/mysql/Img/spain.gif
-share/doc/mysql/Img/sweden.gif
-share/doc/mysql/Img/switzerland.gif
-share/doc/mysql/Img/taiwan.gif
-share/doc/mysql/Img/tcxlogo3.gif
-share/doc/mysql/Img/ukraine.gif
-share/doc/mysql/Img/usa.gif
+share/doc/mysql/Flags/australia.gif
+share/doc/mysql/Flags/austria.gif
+share/doc/mysql/Flags/brazil.gif
+share/doc/mysql/Flags/bulgaria.gif
+share/doc/mysql/Flags/canada.gif
+share/doc/mysql/Flags/chile.gif
+share/doc/mysql/Flags/china.gif
+share/doc/mysql/Flags/croatia.gif
+share/doc/mysql/Flags/czech-republic.gif
+share/doc/mysql/Flags/denmark.gif
+share/doc/mysql/Flags/estonia.gif
+share/doc/mysql/Flags/finland.gif
+share/doc/mysql/Flags/france.gif
+share/doc/mysql/Flags/germany.gif
+share/doc/mysql/Flags/great-britain.gif
+share/doc/mysql/Flags/greece.gif
+share/doc/mysql/Flags/hungary.gif
+share/doc/mysql/Flags/iceland.gif
+share/doc/mysql/Flags/ireland.gif
+share/doc/mysql/Flags/island.gif
+share/doc/mysql/Flags/israel.gif
+share/doc/mysql/Flags/italy.gif
+share/doc/mysql/Flags/japan.gif
+share/doc/mysql/Flags/kroatia.gif
+share/doc/mysql/Flags/netherlands.gif
+share/doc/mysql/Flags/poland.gif
+share/doc/mysql/Flags/portugal.gif
+share/doc/mysql/Flags/romania.gif
+share/doc/mysql/Flags/russia.gif
+share/doc/mysql/Flags/singapore.gif
+share/doc/mysql/Flags/south-africa.gif
+share/doc/mysql/Flags/south-africa1.gif
+share/doc/mysql/Flags/south-korea.gif
+share/doc/mysql/Flags/spain.gif
+share/doc/mysql/Flags/sweden.gif
+share/doc/mysql/Flags/switzerland.gif
+share/doc/mysql/Flags/taiwan.gif
+share/doc/mysql/Flags/ukraine.gif
+share/doc/mysql/Flags/usa.gif
share/doc/mysql/include.texi
share/doc/mysql/manual.html
share/doc/mysql/manual.ps
@@ -76,6 +81,29 @@ share/doc/mysql/manual.texi
share/doc/mysql/manual.txt
share/doc/mysql/manual_toc.html
share/mysql/binary-configure
+share/mysql/charsets/Index
+share/mysql/charsets/README
+share/mysql/charsets/cp1251.conf
+share/mysql/charsets/cp1257.conf
+share/mysql/charsets/croat.conf
+share/mysql/charsets/danish.conf
+share/mysql/charsets/dec8.conf
+share/mysql/charsets/dos.conf
+share/mysql/charsets/estonia.conf
+share/mysql/charsets/german1.conf
+share/mysql/charsets/greek.conf
+share/mysql/charsets/hebrew.conf
+share/mysql/charsets/hp8.conf
+share/mysql/charsets/hungarian.conf
+share/mysql/charsets/koi8_ru.conf
+share/mysql/charsets/koi8_ukr.conf
+share/mysql/charsets/latin1.conf
+share/mysql/charsets/latin2.conf
+share/mysql/charsets/swe7.conf
+share/mysql/charsets/usa7.conf
+share/mysql/charsets/win1250.conf
+share/mysql/charsets/win1251.conf
+share/mysql/charsets/win1251ukr.conf
share/mysql/czech/errmsg.sys
share/mysql/czech/errmsg.txt
share/mysql/danish/errmsg.sys
@@ -84,8 +112,8 @@ share/mysql/dutch/errmsg.sys
share/mysql/dutch/errmsg.txt
share/mysql/english/errmsg.sys
share/mysql/english/errmsg.txt
-share/mysql/estonia/errmsg.sys
-share/mysql/estonia/errmsg.txt
+share/mysql/estonian/errmsg.sys
+share/mysql/estonian/errmsg.txt
share/mysql/french/errmsg.sys
share/mysql/french/errmsg.txt
share/mysql/german/errmsg.sys
@@ -101,7 +129,12 @@ share/mysql/japanese/errmsg.txt
share/mysql/korean/errmsg.sys
share/mysql/korean/errmsg.txt
share/mysql/make_binary_distribution
-share/mysql/my-example.cnf
+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-%%MYSQL_VERSION%%.spec
share/mysql/mysql-log-rotate
share/mysql/mysql.server
@@ -113,6 +146,8 @@ 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
@@ -121,13 +156,14 @@ share/mysql/spanish/errmsg.sys
share/mysql/spanish/errmsg.txt
share/mysql/swedish/errmsg.sys
share/mysql/swedish/errmsg.txt
-@dirrm share/doc/mysql/Img
+@dirrm share/doc/mysql/Flags
@dirrm share/doc/mysql
+@dirrm share/mysql/charsets
@dirrm share/mysql/czech
@dirrm share/mysql/danish
@dirrm share/mysql/dutch
@dirrm share/mysql/english
-@dirrm share/mysql/estonia
+@dirrm share/mysql/estonian
@dirrm share/mysql/french
@dirrm share/mysql/german
@dirrm share/mysql/greek
@@ -139,6 +175,7 @@ share/mysql/swedish/errmsg.txt
@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
diff --git a/databases/mysql51-server/pkg-plist.client b/databases/mysql51-server/pkg-plist.client
index c97e26386471..d118c1c75e53 100644
--- a/databases/mysql51-server/pkg-plist.client
+++ b/databases/mysql51-server/pkg-plist.client
@@ -12,6 +12,7 @@ include/mysql/my_config.h
include/mysql/my_global.h
include/mysql/my_list.h
include/mysql/my_net.h
+include/mysql/my_no_pthread.h
include/mysql/my_pthread.h
include/mysql/my_sys.h
include/mysql/mysql.h