Bash <3 compat, rc scripts and mysql 5.1

(Portage version: 2.0.53)
author: Francesco Riosa <vivo@gentoo.org> 2005-12-08 14:54:31 +0000
committer: Francesco Riosa <vivo@gentoo.org> 2005-12-08 14:54:31 +0000
commit: 54da25da76d4eb619008f8ff67c1ef83ad2026de (patch)
tree: 5f7c745b2dc6d17ebbe60928081233782ff0b84e /dev-db/mysql
parent: Added local use flag for jldap. (diff)
download: gentoo-2-54da25da76d4eb619008f8ff67c1ef83ad2026de.tar.gz
gentoo-2-54da25da76d4eb619008f8ff67c1ef83ad2026de.tar.bz2
gentoo-2-54da25da76d4eb619008f8ff67c1ef83ad2026de.zip
14 files changed, 1657 insertions, 99 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 5d8d49979ede..c6cbc62b4724 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.274 2005/11/25 17:25:42 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.275 2005/12/08 14:54:31 vivo Exp $
+
+*mysql-5.1.3_alpha-r30 (09 Dec 2005)
+
+  09 Dec 2005; Francesco Riosa <vivo@gentoo.org>
+  mysql-4.1.15-r30.ebuild, mysql-5.0.16-r30.ebuild,
+  +mysql-5.1.3_alpha-r30.ebuild:
+  Time for the new 5.1 version of MySQL, only bug with patches plz.
+  Various changes to the masked slot ebuilds
+
+  09 Dec 2005; Francesco Riosa <vivo@gentoo.org>
+  +files/mysqlmanager-slot.conf.d, +files/mysqlmanager-slot.rc6:
+  feature request Bug #114667 Allow use of mysqlmanager
+  Added two start script for the new mysqlmanager utility included in MySQL-5.0
+  Used only from masked ebuilds at the moment
+
+  09 Dec 2005; Francesco Riosa <vivo@gentoo.org>
+  mysql-4.1.15-r1.ebuild, mysql-5.0.16-r3.ebuild:
+  Compatibility with bash version 2.05, fix bug #114609, thanks Simon
+  Detheridge
+
+  09 Dec 2005; Francesco Riosa <vivo@gentoo.org>
+  +files/mysql-slot.conf.d-r1, +files/mysql-slot.rc6-r1:
+  Modified rc script, left the parsing of my.cnf script again to the server.
+  - Feature request Bug #114621, added "startup_timeout" option
+  - Bug 114742 ignore multiple "replicate-wild-ignore-table" entries in my.cnf
+  - workaround Bug 111809 MySQL 5.0.15 ignores collation-server in my.cnf
+  Thanks to every bug reporter
 
   25 Nov 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.15-r1.ebuild:
   ... and btw readding some keywords to 4.1.16-r1 too
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index d2d581197256..19d88b6e5071 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,17 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a6cbda7da1830bc8c0a10a9a8fca261f ChangeLog 52411
+MD5 1481a7060519e0bc1a02b073143bf7fb ChangeLog 53609
 MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
 MD5 0feb3b501c47708ea13707c8e4cdde9c files/digest-mysql-4.0.25-r2 139
 MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26 139
 MD5 4e6e76e3945e29b6795ce6d1a66bc98f files/digest-mysql-4.1.14 139
 MD5 b8eda6b8ec67faff78e5d01023e6eefb files/digest-mysql-4.1.15 139
 MD5 081bfa8975526ff1098cc4e067cf7545 files/digest-mysql-4.1.15-r1 139
-MD5 081bfa8975526ff1098cc4e067cf7545 files/digest-mysql-4.1.15-r30 139
+MD5 0415d0314d8b1a3d5fb8bc5a65660953 files/digest-mysql-4.1.15-r30 139
 MD5 b9b44f65c775f650064022427ae52425 files/digest-mysql-5.0.15 139
 MD5 aa38cbef56ecdf34fd61c71bac1120e2 files/digest-mysql-5.0.16-r3 139
-MD5 aa38cbef56ecdf34fd61c71bac1120e2 files/digest-mysql-5.0.16-r30 139
+MD5 f2f69d4a3f98030fc7248cac3c2d981d files/digest-mysql-5.0.16-r30 139
+MD5 192d36fe25573b9974310cbd7977bd89 files/digest-mysql-5.1.3_alpha-r30 144
 MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440
 MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
 MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
@@ -21,23 +19,21 @@ MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
 MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662
 MD5 356c1b4211a0b3d229bcb09c7c8742a7 files/mysql-4.0.24-r2.rc6 2151
 MD5 c8a9f17eb53cb46bd7ec6b3105cd8d23 files/mysql-slot.conf.d 3218
+MD5 624541a36c1aae85e3999078d2468215 files/mysql-slot.conf.d-r1 2999
 MD5 2e915001528cb4b44591d907168b6a51 files/mysql-slot.rc6 8691
+MD5 48dc01c63505bc7df567dde4469de0c1 files/mysql-slot.rc6-r1 9015
 MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
+MD5 9ff84042930f67b14f418a9dcf78d860 files/mysqlmanager-slot.conf.d 1021
+MD5 694c76d7f3d03192bc45f20c9497be26 files/mysqlmanager-slot.rc6 6609
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219
 MD5 310c18100b92ec0786cf630ad0a17f94 mysql-4.0.25-r2.ebuild 14260
 MD5 a46e6cb73958dcc8919743ca5dbaf3c3 mysql-4.0.26.ebuild 14888
 MD5 28d52e441c3b6e76ea85d79615fef054 mysql-4.1.14.ebuild 18857
-MD5 06a40173787347e3fe15bc056f2d413a mysql-4.1.15-r1.ebuild 22969
-MD5 b55627867ac07a0b92479e45cba64afc mysql-4.1.15-r30.ebuild 23523
+MD5 64871997876ddd3bc242a07a797a9cf0 mysql-4.1.15-r1.ebuild 23321
+MD5 4283c78bfa7c69bfe01c0af87e342b30 mysql-4.1.15-r30.ebuild 24363
 MD5 68d8a9e80d038e354f3fba7c4c9394da mysql-4.1.15.ebuild 18880
 MD5 38667d0ef4311ebb4e9ef25473b4d6af mysql-5.0.15.ebuild 19010
-MD5 6cafb20c1f901a16cc7509a7e6013ad4 mysql-5.0.16-r3.ebuild 22952
-MD5 f3bc0993a0cef745dfcd65430fe9ec98 mysql-5.0.16-r30.ebuild 23523
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDkfu7gIKl8Uu19MoRAlbtAJ48y5chTF5NbJGomJqvYgUE/0g0FgCdFa6x
-xTNcm2A48H/mC5uZMdrmQJE=
-=zsXh
------END PGP SIGNATURE-----
+MD5 a9800019d32ef00874fc10f59d755712 mysql-5.0.16-r3.ebuild 23715
+MD5 5d1f131d7f6c48b936b42f6b17b5bb9b mysql-5.0.16-r30.ebuild 24363
+MD5 c8926d52ee60bbf7da1c087583bc7061 mysql-5.1.3_alpha-r30.ebuild 24363
diff --git a/dev-db/mysql/files/digest-mysql-4.1.15-r30 b/dev-db/mysql/files/digest-mysql-4.1.15-r30
index ed0a7a329542..51f86e419530 100644
--- a/dev-db/mysql/files/digest-mysql-4.1.15-r30
+++ b/dev-db/mysql/files/digest-mysql-4.1.15-r30
@@ -1,2 +1,2 @@
 MD5 65a0841e592641b8816f9212aaa40176 mysql-4.1.15.tar.gz 17257765
-MD5 b6d7a647fa0584915ea0b0ed2544c0a0 mysql-extras-20051122.tar.bz2 66350
+MD5 0e8ec66db65a6dd6742e6db1a296bd15 mysql-extras-20051205.tar.bz2 69508
diff --git a/dev-db/mysql/files/digest-mysql-5.0.16-r30 b/dev-db/mysql/files/digest-mysql-5.0.16-r30
index 0a23c702e105..67d5d97aadb7 100644
--- a/dev-db/mysql/files/digest-mysql-5.0.16-r30
+++ b/dev-db/mysql/files/digest-mysql-5.0.16-r30
@@ -1,2 +1,2 @@
 MD5 ecf2ae1d782a8d129af940c15a44f477 mysql-5.0.16.tar.gz 19031670
-MD5 b6d7a647fa0584915ea0b0ed2544c0a0 mysql-extras-20051122.tar.bz2 66350
+MD5 0e8ec66db65a6dd6742e6db1a296bd15 mysql-extras-20051205.tar.bz2 69508
diff --git a/dev-db/mysql/files/digest-mysql-5.1.3_alpha-r30 b/dev-db/mysql/files/digest-mysql-5.1.3_alpha-r30
new file mode 100644
index 000000000000..64e04b489e44
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.1.3_alpha-r30
@@ -0,0 +1,2 @@
+MD5 43f4d55b472124ce0d9a76185722c1e7 mysql-5.1.3-alpha.tar.gz 23610284
+MD5 0e8ec66db65a6dd6742e6db1a296bd15 mysql-extras-20051205.tar.bz2 69508
diff --git a/dev-db/mysql/files/mysql-slot.conf.d-r1 b/dev-db/mysql/files/mysql-slot.conf.d-r1
new file mode 100644
index 000000000000..fae38f271506
--- /dev/null
+++ b/dev-db/mysql/files/mysql-slot.conf.d-r1
@@ -0,0 +1,72 @@
+#  here is where to define which server start.
+#> Additional parameters to be passed to mysqld at startup may be added here,
+#> these one will override the ones in "my.cnf".
+#
+#  Below are described some suggested parameters to use
+#  The parameters not recognized will be passed through to the mysqld daemon
+#  To avoid starting a server just comment it's definition
+#  Last but not least, spaces are NOT allowed inside the parameters
+#
+#  Parameter      : description
+# ----------------+-----------------------------------------------------------
+# nice            : integer [-20 .. 19 ] default 0
+#                 : change the priority of the server -20 (high) to 19 (low)
+#                 : see "man nice 1" for description
+# ----------------+-----------------------------------------------------------
+# mycnf           : string [full path to my.cnf]
+#                 : specify the path to my.cnf file to be used
+# ----------------+-----------------------------------------------------------
+# startup_timeout : integer [seconds] default 5
+#                 : time to wait for mysqld up and running, after this it's 
+#                 : marked as failed
+# ----------------+-----------------------------------------------------------
+#
+#  Additional parameters
+#  Parameter      : description
+# ----------------+-----------------------------------------------------------
+# server-id       : integer [1 .. 255]
+#                 : Uniquely identifies the server instance in the community
+#                 : of replication partners.
+# ----------------+-----------------------------------------------------------
+# port            : integer [1025 .. 65535] default 3306
+#                 : Port number to use for connection.
+#                 : loose any meaning if skip-networking is set.
+# ----------------+-----------------------------------------------------------
+# skip-networking : NULL, Don't allow connection with TCP/IP.
+# log-bin         : string [name of the binlog files]
+#                 : Log update queries in binary format. Optional (but
+#                 : strongly recommended to avoid replication problems if
+#                 : server's hostname changes) argument should be the chosen
+#                 : location for the binary log files.
+# ----------------+-----------------------------------------------------------
+# Additionally the following variables are recognized:
+#
+# Be more verbose accept values from 1 to 4
+#DEBUG=4
+#
+# The default location for the "master" pid file 
+#MYSQL_GLOB_PID_FILE="/var/run/svc-started-mysqld"
+#
+# The timeout for a failed attempt to stop a server
+# STOPTIMEOUT=120
+#
+
+## Examples:
+#
+# start a default server with default options:
+#mysql_slot_0=()
+#
+# start MySQL 7.5.x reniced, overriding some start parameters
+#mysql_slot_705=(
+#	"nice=-5"
+#   "server-id=123"
+#   "log-bin="myhost"
+#   "port=3307"
+#)
+#
+# start another server, same version, different my.cnf
+#mysql_slot_705_1=(
+#	"mycnf=/home/test/my.cnf"
+#   "server-id=124"
+#)
+#
diff --git a/dev-db/mysql/files/mysql-slot.rc6-r1 b/dev-db/mysql/files/mysql-slot.rc6-r1
new file mode 100644
index 000000000000..e4056e55a47e
--- /dev/null
+++ b/dev-db/mysql/files/mysql-slot.rc6-r1
@@ -0,0 +1,300 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6-r1,v 1.1 2005/12/08 14:54:31 vivo Exp $
+
+# external binaryes used: which, sed, tac
+
+depend() {
+	use dns net localmount netmount nfsmount
+}
+
+# int in_list(char * elem, char * list)
+function in_list() {
+	local elem=${1:-"none"}
+	local list=${2:-","}
+
+	[[ "${list}" == "${list/,${elem},/}" ]] \
+		&& return 1 \
+		|| return 0
+}
+
+do_escape() {
+	# Ihatethisreallyverymuch
+	#echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|"
+	echo "$1"
+}
+
+# int get_slot_config(srv_slot=0, srv_num)
+get_slot_config() {
+	[[ ${DEBUG} -ge 4 ]] && einfo ">>> get_slot_config(\"${1}\", \"${2}\")"
+
+	srv_slot="${1:-"0"}"
+	srv_num="${2}"
+	MY_SUFFIX="-${srv_slot}"
+	[[ "${MY_SUFFIX}" == '-0' ]] && MY_SUFFIX=''
+
+	basedir="" datadir="" pidfile="" socket=""
+	CHROOT="" NICE="" STARTUPTIMEOUT=5
+
+	local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]"
+	local conf_d_parameters="${!tmp_eval}"
+	# collations need to be defined *after* the character sets,
+	#>so we will duplicate them
+	local collations=""
+	[[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters=''
+
+	MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf"
+	# summa of unmanaged parameters
+	#>some parameters may be present multiple times
+	unmanagedparams=""
+
+	# grab the parameters from conf.d/mysql definition
+	for my_default in ${conf_d_parameters[*]}; do
+		case "${my_default}" in
+			nice=*)
+				NICE="${my_default#nice=}"
+				nice -n $NICE ls /tmp &>/dev/null || NICE=""
+				;;
+			mycnf=*) MY_CNF="${my_default#mycnf=}" ;;
+			startup_timeout=*) 
+				STARTUPTIMEOUT="${my_default#startup_timeout=}"	;;
+			basedir=*) basedir="${my_default#basedir=}" ;;
+			datadir=*) datadir="${my_default#datadir=}" ;;
+			pid-file=*) pidfile="${my_default#pid-file=}" ;;
+			socket=*) socket="${my_default#socket=}" ;;
+			*collation*=)
+				collations="${collations} --$( do_escape "${my_default}" )"
+				;;
+			*=*)
+				# list of parameters we already have
+				# prepend "--" because my_print_defaults do it
+				unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )"
+				;;
+			*)
+				unmanagedparams="${unmanagedparams} --${my_default}"
+				;;
+		esac
+	done
+	
+	if [[ ! -r "${MY_CNF}" ]]; then
+		ewarn "Cannot access ${MY_CNF} !"
+		MY_CNF=""
+		my_defaults=""
+	else
+		local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)"
+		if [[ ! -x "${my_print_defaults}" ]]; then
+			eerror "my_print_defaults NOT found or not executable"
+			my_defaults=""
+		else			
+			my_defaults=$( ${my_print_defaults} \
+				--loose-verbose \
+				--config-file="${MY_CNF}" \
+				mysqld server )
+		fi
+	fi
+
+	# grab needed parameters from my.cnf, don't override the ones from
+	# conf.d mysql
+	for my_default in ${my_defaults}; do
+		case "${my_default}" in
+			--basedir=*)
+				[[ -z "${basedir}" ]] && basedir="${my_default#--basedir=}" ;;
+			--datadir=*)
+				[[ -z "${datadir}" ]] && datadir="${my_default#--datadir=}" ;;
+			--pid-file=*)
+				[[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;;
+			--socket=*)
+				[[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;;
+			--*collation*=)
+				# the order is inversed because we want the conf.d ones override
+				collations="$( do_escape "${my_default}" ) ${collations}"
+				;;
+		esac
+	done
+
+	# still empty, I'm in doubt if assign a default or break, will see
+	basedir="${basedir:-"/usr"}"
+	datadir="${datadir:-"/var/lib/mysql${MY_SUFFIX}"}"
+	pidfile="${pidfile:-"/var/run/mysqld/mysqld${MY_SUFFIX}.pid"}"
+	socket="${socket:-"/var/run/mysqld/mysqld${MY_SUFFIX}.sock"}"
+	unmanagedparams="${unmanagedparams} ${collations}"
+
+	if [[ ${DEBUG} -ge 3 ]] ; then
+		einfo "chroot dir => ${CHROOT}"
+		einfo "niceness   => ${NICE}"
+		einfo "basedir    => ${basedir}"
+		einfo "datadir    => ${datadir}"
+		einfo "pidfile    => ${pidfile}"
+		einfo "socket     => ${socket}"
+		einfo "Unamanged  => ${unmanagedparams}"
+	fi
+
+	# push these out to the script
+	export MY_SUFFIX NICE MY_CNF pidfile datadir basedir socket CHROOT
+	export unmanagedparams STARTUPTIMEOUT
+	[[ ${DEBUG} -ge 4 ]] && einfo "<<< get_slot_config() ok"
+	return 0
+}
+
+checkconfig() {
+	[[ ${DEBUG} -ge 4 ]] && einfo ">>> checkconfig(\"${1}\")"
+	local datadir="$1"
+	if [ ! -d "${datadir}" ]; then
+		eerror "MySQL datadir is empty or invalid"
+		eerror "Please check your my.cnf : ${MY_CNF}"
+		[[ ${DEBUG} -ge 4 ]] && einfo "<<< checkconfig() KO"
+		return 1
+	fi
+
+	if [ ! -d "$datadir/mysql" ]; then
+		eerror "You don't appear to have the mysql database installed yet."
+		eerror "Please run /usr/bin/mysql_install_db to have this done..."
+		[[ ${DEBUG} -ge 4 ]] && einfo "<<< checkconfig() KO"
+		return 1
+	fi
+	[[ ${DEBUG} -ge 4 ]] && einfo "<<< checkconfig() ok"
+	return 0
+}
+
+start() {
+	[[ ${DEBUG} -ge 4 ]] && einfo ">>> start()"
+	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-mysqld"}
+	# servers are defined in /etc/conf.d/mysql
+	local serverlist=${!mysql_slot_*}
+	# provide default for empty conf.d/mysql
+	if [[ -z "${serverlist}" ]] ; then
+		serverlist=0
+		export mysql_slot_0=()
+	fi
+	local retstatus timeout
+	local globretstatus=1
+	local srv_slot srv_num
+	# server MUST NOT share same location for these
+	local pidfilelist=',' datadirlist=',' socketlist=','
+
+	# additional security
+	rm -f "${MYSQL_GLOB_PID_FILE}" ; touch "${MYSQL_GLOB_PID_FILE}"
+	if [[ $? -ne 0 ]] ; then
+		eerror "cannot create MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}"
+		[[ ${DEBUG} -ge 4 ]] && einfo "<<< start() KO"
+		return 1
+	fi
+
+	ebegin
+	# try to start each server
+	for srv in ${serverlist[*]} ; do
+		einfo "working on ${srv}"
+
+		srv_slot="${srv#mysql_slot_}"
+		if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then
+			srv_num=''
+		else
+			srv_num="${srv_slot#*_}"
+		fi
+		srv_slot="${srv_slot%%_*}"
+
+		retstatus=0
+		get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1
+
+		# timeout (seconds) before declare failed the startup
+		timeout=${STARTUPTIMEOUT}
+
+		# pre_run checks
+		[[ "$retstatus" -eq 0 ]] && checkconfig "${datadir}" || retstatus=2
+		if [[ "$retstatus" -eq 0 ]] ; then
+			if in_list "${pidfile}" "${pidfilelist}" ; then
+				retstatus=3
+				eerror "Sorry, won't start with same pid-file: ${pidfile}"
+			fi
+			if in_list "${datadir}" "${datadirlist}" ; then
+				retstatus=4
+				eerror "Sorry, won't start with same datadir: ${datadir}"
+			fi
+			if in_list "${socket}" "${socketlist}" ; then
+				retstatus=5
+				eerror "Sorry, won't start with same socket: ${socket}"
+			fi
+		fi
+
+		if [[ $retstatus -eq 0 ]] ; then
+			# additional security
+			rm -f ${pidfile} ${socket}
+			einfo "Starting mysqld${MY_SUFFIX:+"_"}${srv_slot}${srv_num:+"_"}${srv_num} (${MY_CNF})"
+
+			[[ ${DEBUG} -ge 2 ]] && echo "starting mysqld with: "${basedir}/sbin/mysqld${MY_SUFFIX} ${unmanagedparams} --basedir=${basedir} --datadir=${datadir} --pid-file=${pidfile} --socket=${socket}
+
+			start-stop-daemon --quiet --start --background \
+				${NICE:+"--nicelevel="}${NICE} \
+				--pidfile="${pidfile}" \
+				--startas ${basedir}/sbin/mysqld${MY_SUFFIX} \
+				-- \
+					${MY_CNF:+"--defaults-file="}${MY_CNF} \
+					${unmanagedparams} \
+					--basedir=${basedir} \
+					--datadir=${datadir} \
+					--pid-file=${pidfile} \
+					--socket=${socket}
+
+			retstatus=$?
+
+			# wait for socket creation
+			[[ ${DEBUG} -ge 1 ]] && echo ""
+			while ! [[ -S "${socket}" || "${timeout}" -lt 1 || "${retstatus}" -ne 0 ]] ; do
+				timeout=$(($timeout - 1))
+				[[ ${DEBUG} -ge 1 ]] && echo -n $(( $STARTUPTIMEOUT - $timeout ))
+				sleep 1
+			done
+			[[ ${DEBUG} -ge 1 ]] && echo ""
+			if [[ ! -S "${socket}" ]] ; then
+				eerror "MySQL${MY_SUFFIX} NOT started (${retstatus})"
+				retstatus=1
+			else
+				pidfilelist="${pidfilelist}${pidfile},"
+				datadirlist="${datadirlist}${datadir},"
+				socketlist="${socketlist}${socket},"
+			fi
+		fi
+
+		if [[ $retstatus -eq 0 ]]; then
+			globretstatus=0
+			echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}"
+		fi
+	done
+	# successfull if at least one mysqld started
+	[[ ${DEBUG} -ge 4 ]] && einfo "<<< start()"
+	eend $globretstatus
+}
+
+stop () {
+	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-mysqld"}
+	local runwhat pidfile shutdown_elem
+	local PID cnt timeout
+	local retstatus=0
+	local shutdown_list="$(tac "${MYSQL_GLOB_PID_FILE}")"
+
+	# shutdown in reverse order
+	ebegin
+	for shutdown_elem in $shutdown_list; do
+		runwhat=${shutdown_elem%%=*}
+		pidfile=${shutdown_elem#*=}
+		timeout=${STOPTIMEOUT:-"120"}
+
+		einfo "Stopping mysqld (${runwhat})"
+
+		PID=$(cat "${pidfile}" 2>/dev/null)
+		start-stop-daemon --stop --quiet --pidfile="${pidfile}"
+		[[ ${DEBUG} -ge 1 ]] && echo ""
+		while ! [[ -n "$PID" || $( kill -0 $PID 2>/dev/null ) || "${timeout}" -lt 1 ]] ; do
+			timeout=$(($timeout - 1))
+			[[ ${DEBUG} -ge 1 ]] && echo -n $(( $STOPTIMEOUT - $timeout ))
+			sleep 1
+		done
+		if [[ "${timeout}" -lt 1 ]] ; then
+			retstatus=$(( $retstatus + 1 ))
+		fi
+	done
+
+	[[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE"
+	eend $retstatus
+}
+\ No newline at end of file
diff --git a/dev-db/mysql/files/mysqlmanager-slot.conf.d b/dev-db/mysql/files/mysqlmanager-slot.conf.d
new file mode 100644
index 000000000000..a36241ad4c01
--- /dev/null
+++ b/dev-db/mysql/files/mysqlmanager-slot.conf.d
@@ -0,0 +1,28 @@
+#  here is where to define which server start.
+#> Additional parameters to be passed to mysqlmanager at startup may be added here,
+#> these one will override the ones in "my.cnf".
+#
+#  To avoid starting a server just comment it's definition
+#> here or it will rant (no default start)
+#  Last but not least, spaces are NOT allowed inside the parameters
+#
+#  Below are described some suggested parameters to use
+#  The parameters not recognized will be passed through to the mysqlmanager
+#
+#  Parameter      : description
+
+# ----------------+-----------------------------------------------------------
+# mycnf           : string [full path to my.cnf]
+#                 : specify the path to my.cnf file to be used
+#                 : may contain a [manager] section
+# ----------------+-----------------------------------------------------------
+#
+# easy default
+#
+#mysqlmanager_slot_0=()
+#
+# start MySQL 7.5.x reniced, chrooted and overriding some start parameters
+#mysqlmanager_slot_705=(
+#	"mycnf=/home/test/my.cnf"
+#)
+#
diff --git a/dev-db/mysql/files/mysqlmanager-slot.rc6 b/dev-db/mysql/files/mysqlmanager-slot.rc6
new file mode 100644
index 000000000000..569d4b5996a8
--- /dev/null
+++ b/dev-db/mysql/files/mysqlmanager-slot.rc6
@@ -0,0 +1,229 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager-slot.rc6,v 1.1 2005/12/08 14:54:31 vivo Exp $
+
+# external binaryes used: which, sed, tac
+
+depend() {
+	use dns net localmount netmount nfsmount
+}
+
+# int in_list(char * elem, char * list)
+function in_list() {
+	local elem=${1:-"none"}
+	local list=${2:-","}
+
+	[[ "${list}" == "${list/,${elem},/}" ]] \
+		&& return 1 \
+		|| return 0
+}
+
+do_escape() {
+	# Ihatethisreallyverymuch
+	#echo "$1" | sed -e "s|'| |" -e "s|=|='|" -e "s|$|'|"
+	echo "$1"
+}
+
+# int get_slot_config(srv_slot=0, srv_num)
+get_slot_config() {
+	[[ ${DEBUG} -ge 4 ]] && einfo ">>> get_slot_config(\"${1}\", \"${2}\")"
+
+	srv_slot="${1:-"0"}"
+	srv_num="${2}"
+	MY_SUFFIX="-${srv_slot}"
+	[[ "${MY_SUFFIX}" == '-0' ]] && MY_SUFFIX=''
+
+	basedir="" pidfile="" socket=""
+
+	local tmp_eval="mysqlmanager_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]"
+	local conf_d_parameters="${!tmp_eval}"
+	[[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters=''
+
+	MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf"
+	# summa of unmanaged parameters
+	#>some parameters may be present multiple times
+	unmanagedparams=""
+
+	# grab the parameters from conf.d/mysql definition
+	for my_default in ${conf_d_parameters[*]}; do
+		case "${my_default}" in
+			mycnf=*) MY_CNF="${my_default#mycnf=}" ;;
+			basedir=*) basedir="${my_default#basedir=}" ;;
+			pid-file=*) pidfile="${my_default#pid-file=}" ;;
+			socket=*) socket="${my_default#socket=}" ;;
+			*=*)
+				# list of parameters we already have
+				# prepend "--" because my_print_defaults do it
+				unmanagedparams="${unmanagedparams} --$( do_escape "${my_default}" )"
+				;;
+			*)
+				unmanagedparams="${unmanagedparams} --${my_default}"
+				;;
+		esac
+	done
+	
+	if [[ ! -r "${MY_CNF}" ]]; then
+		ewarn "Cannot access ${MY_CNF} !"
+		MY_CNF=""
+		my_defaults=""
+	else
+		local my_print_defaults="$(which my_print_defaults${MY_SUFFIX} 2>/dev/null)"
+		if [[ ! -x "${my_print_defaults}" ]]; then
+			eerror "my_print_defaults NOT found or not executable"
+			my_defaults=""
+		else			
+			my_defaults=$( ${my_print_defaults} \
+				--loose-verbose \
+				--config-file="${MY_CNF}" \
+				manager )
+		fi
+	fi
+
+	# grab needed parameters from my.cnf, don't override the ones from
+	# conf.d mysql
+	for my_default in ${my_defaults}; do
+		case "${my_default}" in
+			--pid-file=*)
+				[[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;;
+			--socket=*)
+				[[ -z "${socket}" ]] && socket="${my_default#--socket=}" ;;
+		esac
+	done
+
+	# still empty, I'm in doubt if assign a default or break, will see
+	basedir="${basedir:-"/usr"}"
+	pidfile="${pidfile:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.pid"}"
+	socket="${socket:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.sock"}"
+
+	if [[ ${DEBUG} -ge 3 ]] ; then
+		einfo "basedir    => ${basedir}"
+		einfo "pidfile    => ${pidfile}"
+		einfo "socket     => ${socket}"
+		einfo "Unamanged  => ${unmanagedparams}"
+	fi
+
+	# push these out to the script
+	export MY_SUFFIX MY_CNF pidfile basedir socket
+	export unmanagedparams
+	[[ ${DEBUG} -ge 4 ]] && einfo "<<< get_slot_config() ok"
+	return 0
+}
+
+start() {
+	[[ ${DEBUG} -ge 4 ]] && einfo ">>> start()"
+	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-mysqlmanager"}
+	# servers are defined in /etc/conf.d/mysql
+	local serverlist=${!mysqlmanager_slot_*}
+	# provide default for empty conf.d/mysql
+	if [[ -z "${serverlist}" ]] ; then
+		serverlist=0
+		export mysqlmanager_slot_0=()
+	fi
+	local retstatus timeout
+	local globretstatus=1
+	local srv_slot srv_num
+	# server MUST NOT share same location for these
+	local pidfilelist=',' socketlist=','
+
+	# additional security
+	rm -f "${MYSQL_GLOB_PID_FILE}" ; touch "${MYSQL_GLOB_PID_FILE}"
+	if [[ $? -ne 0 ]] ; then
+		eerror "cannot create MYSQL_GLOB_PID_FILE: ${MYSQL_GLOB_PID_FILE}"
+		[[ ${DEBUG} -ge 4 ]] && einfo "<<< start() KO"
+		return 1
+	fi
+
+	ebegin
+	# try to start each server
+	for srv in ${serverlist[*]} ; do
+		einfo "working on ${srv}"
+
+		srv_slot="${srv#mysqlmanager_slot_}"
+		if [[ "${srv_slot}" == "${srv_slot#*_}" ]] ; then
+			srv_num=''
+		else
+			srv_num="${srv_slot#*_}"
+		fi
+		srv_slot="${srv_slot%%_*}"
+
+		retstatus=0
+		get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1
+
+		# timeout (seconds) before declare failed the startup
+
+		# pre_run checks
+		if [[ "$retstatus" -eq 0 ]] ; then
+			if in_list "${pidfile}" "${pidfilelist}" ; then
+				retstatus=3
+				eerror "Sorry, won't start with same pid-file: ${pidfile}"
+			fi
+			if in_list "${socket}" "${socketlist}" ; then
+				retstatus=5
+				eerror "Sorry, won't start with same socket: ${socket}"
+			fi
+		fi
+
+		if [[ $retstatus -eq 0 ]] ; then
+			# additional security
+			rm -f ${pidfile} ${socket}
+			einfo "Starting mysqlmanager${MY_SUFFIX:+"_"}${srv_slot}${srv_num:+"_"}${srv_num} (${MY_CNF})"
+
+			[[ ${DEBUG} -ge 2 ]] && echo "starting mysqlmanager with: "${basedir}/sbin/mysqlmanager${MY_SUFFIX} ${unmanagedparams} --pid-file=${pidfile} --socket=${socket}
+
+			start-stop-daemon --quiet --start --background \
+				--pidfile="${pidfile}" \
+				--startas ${basedir}/sbin/mysqlmanager${MY_SUFFIX} \
+				-- \
+					${MY_CNF:+"--defaults-file="}${MY_CNF} \
+					${unmanagedparams} \
+					--pid-file=${pidfile} \
+					--socket=${socket}
+
+			retstatus=$?
+
+			if [[ "${retstatus}" -eq 0 ]] ; then
+				pidfilelist="${pidfilelist}${pidfile},"
+				socketlist="${socketlist}${socket},"
+				globretstatus=0
+				echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}"
+			fi
+		fi
+	done
+	# successfull if at least one mysqlmanager started
+	[[ ${DEBUG} -ge 4 ]] && einfo "<<< start()"
+	eend $globretstatus
+}
+
+stop () {
+	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-mysqlmanager"}
+	local runwhat pidfile shutdown_elem
+	local PID cnt timeout
+	local retstatus=0
+	local shutdown_list="$(tac "${MYSQL_GLOB_PID_FILE}")"
+
+	# shutdown in reverse order
+	ebegin
+	for shutdown_elem in $shutdown_list; do
+		runwhat=${shutdown_elem%%=*}
+		pidfile=${shutdown_elem#*=}
+		timeout=${STOPTIMEOUT:-"10"}
+
+		einfo "Stopping mysqlmanager (${runwhat})"
+
+		PID=$(cat "${pidfile}" 2>/dev/null)
+		start-stop-daemon --stop --quiet --pidfile="${pidfile}"
+		[[ ${DEBUG} -ge 1 ]] && echo ""
+		while [[ -n "$PID" && $( kill -0 $PID 2>/dev/null ) && "${timeout}" -ge 1 ]] ; do
+			timeout=$(($timeout - 1))
+			[[ ${DEBUG} -ge 1 ]] && echo -n $(( $STOPTIMEOUT - $timeout ))
+			sleep 1
+		done
+		if [[ "${timeout}" -lt 1 ]] ; then
+			retstatus=$(( $retstatus + 1 ))
+		fi
+	done
+
+	[[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE"
+	eend $retstatus
+}
+\ No newline at end of file
diff --git a/dev-db/mysql/mysql-4.1.15-r1.ebuild b/dev-db/mysql/mysql-4.1.15-r1.ebuild
index 2c38ef85293d..931e29e9be8e 100644
--- a/dev-db/mysql/mysql-4.1.15-r1.ebuild
+++ b/dev-db/mysql/mysql-4.1.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r1.ebuild,v 1.3 2005/11/25 17:25:42 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r1.ebuild,v 1.4 2005/12/08 14:54:31 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -239,20 +239,22 @@ src_unpack() {
 		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
 
 	# remove what need to be recreated, so we are sure it's actually done
-	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm {} \;
+	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm -f {} \;
 	rm ltmain.sh
 
-	local rebuilddirlist dl buildstep
+	local rebuilddirlist d buildstep bdbdir
 
 	if mysql_version_is_at_least "5.01.00.00" ; then
-		rebuilddirlist=( '.' 'storage/innobase' )
+		rebuilddirlist=". storage/innobase"
+		bdbdir='storage/bdb/dist'
 	else
-		rebuilddirlist=( '.' 'innobase' )
+		rebuilddirlist=". innobase"
+		bdbdir='bdb/dist'
 	fi
 
-	for dl in ${!rebuilddirlist[@]}; do
-		einfo "reconfiguring phase $(( ${dl} + 1 )) of ${#rebuilddirlist[@]}"
-		pushd "${rebuilddirlist[${dl}]}"
+	for d in ${rebuilddirlist}; do
+		einfo "reconfiguring dir \"${d}\""
+		pushd "${d}"
 		for buildstep in \
 			'libtoolize --copy --force' \
 			'aclocal --force' \
@@ -262,14 +264,16 @@ src_unpack() {
 			'gnuconfig_update'
 		do
 			einfo "performing ${buildstep}"
-			${buildstep} || die "failed ${buildstep/ */} ${rebuilddirlist[${dl}]}"
+			${buildstep} || die "failed ${buildstep/ */} dir \"${d}\""
 		done
 		popd
 	done
 
-	[[ -w bdb/dist/ltmain.sh ]] && cp ltmain.sh bdb/dist/ltmain.sh
-	pushd bdb/dist && sh s_all || die "failed bdb reconfigure"
-	popd
+	if ! mysql_check_version_range "5.01.00.00 to 5.01.06.99" ; then
+		[[ -w "${bdbdir}/ltmain.sh" ]] && cp ltmain.sh "${bdbdir}/ltmain.sh"
+		pushd "${bdbdir}" && sh s_all || die "failed bdb reconfigure"
+		popd
+	fi
 
 	# Temporary workaround for bug in test suite, a correct solution
 	# should work inside the include files to enable/disable the tests
@@ -372,8 +376,10 @@ src_compile() {
 		#The following fix is due to a bug with bdb on sparc's. See:
 		#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
 		# it comes down to non-64-bit safety problems
-		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64
+		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64 \
+		|| mysql_check_version_range "5.01.00.00 to 5.01.06.99"
 		then
+			ewarn "bdb berkeley-db disabled due to arch or version"
 			myconf="${myconf} --without-berkeley-db"
 		else
 			useq berkdb \
@@ -400,17 +406,25 @@ src_compile() {
 		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
 		myconf="${myconf} --with-archive-storage-engine"
 		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
+
 		mysql_version_is_at_least "4.01.04.00" \
 		&& myconf="${myconf} --with-csv-storage-engine"
+
+		mysql_version_is_at_least "4.01.11.00" \
+		&&  myconf="${myconf} --with-blackhole-storage-engine"
+
 		# http://dev.mysql.com/doc/mysql/en/federated-description.html
 		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
 		if mysql_version_is_at_least "5.00.03.00" ; then
 			einfo "before to use federated engine be sure to read"
-			einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
+			einfo "http://dev.mysql.com/doc/refman/5.0/en/federated-limitations.html"
 			myconf="${myconf} --with-federated-storage-engine"
+
+			# http://dev.mysql.com/doc/refman/5.1/en/partitioning-overview.html
+			if mysql_version_is_at_least "5.01.00.00" ; then
+				myconf="${myconf} --with-partition"
+			fi
 		fi
-		mysql_version_is_at_least "4.01.11.00" \
-		&&  myconf="${myconf} --with-blackhole-storage-engine"
 	fi
 
 	#glibc-2.3.2_pre fix; bug #16496
diff --git a/dev-db/mysql/mysql-4.1.15-r30.ebuild b/dev-db/mysql/mysql-4.1.15-r30.ebuild
index 9838397af353..c7c4eaf341be 100644
--- a/dev-db/mysql/mysql-4.1.15-r30.ebuild
+++ b/dev-db/mysql/mysql-4.1.15-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r30.ebuild,v 1.6 2005/11/24 21:00:54 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r30.ebuild,v 1.7 2005/12/08 14:54:31 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -12,7 +12,6 @@ stripdots() {
 
 # major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
 MYSQL_VERSION_ID=$(stripdots "4.01.15.30")
-PROTOCOL_VERSION=10
 NDB_VERSION_ID=40115
 #major, minor only in the slot
 SLOT=$(( ${MYSQL_VERSION_ID} / 10000 ))
@@ -27,11 +26,11 @@ DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
 NEWP="${PN}-${PV/_/-}"
 SRC_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/${NEWP}.tar.gz
-	mirror://gentoo/mysql-extras-20051122.tar.bz2"
+	mirror://gentoo/mysql-extras-20051205.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="-*"
-IUSE="big-tables berkdb debug minimal perl selinux ssl static"
+IUSE="big-tables berkdb debug minimal perl selinux ssl static innodb"
 RESTRICT="primaryuri"
 
 DEPEND=">=sys-libs/readline-4.1
@@ -236,21 +235,29 @@ src_unpack() {
 	find . -name 'Makefile.am' \
 		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
 
+	# Manage mysqlmanager
+	mysql_version_is_at_least "5.00.15.00" \
+	&& sed -i -e "s!@GENTOO_EXT@!${MY_SUFFIX}!g" \
+		-e "s!@GENTOO_SOCK_PATH@!var/run/mysqld!g" \
+		"${S}/server-tools/instance-manager/Makefile.am"
+
 	# remove what need to be recreated, so we are sure it's actually done
-	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm {} \;
+	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm -f {} \;
 	rm ltmain.sh
 
-	local rebuilddirlist dl buildstep
+	local rebuilddirlist d buildstep bdbdir
 
 	if mysql_version_is_at_least "5.01.00.00" ; then
-		rebuilddirlist=( '.' 'storage/innobase' )
+		rebuilddirlist=". storage/innobase"
+		bdbdir='storage/bdb/dist'
 	else
-		rebuilddirlist=( '.' 'innobase' )
+		rebuilddirlist=". innobase"
+		bdbdir='bdb/dist'
 	fi
 
-	for dl in ${!rebuilddirlist[@]}; do
-		einfo "reconfiguring phase $(( ${dl} + 1 )) of ${#rebuilddirlist[@]}"
-		pushd "${rebuilddirlist[${dl}]}"
+	for d in ${rebuilddirlist}; do
+		einfo "reconfiguring dir \"${d}\""
+		pushd "${d}"
 		for buildstep in \
 			'libtoolize --copy --force' \
 			'aclocal --force' \
@@ -260,14 +267,16 @@ src_unpack() {
 			'gnuconfig_update'
 		do
 			einfo "performing ${buildstep}"
-			${buildstep} || die "failed ${buildstep/ */} ${rebuilddirlist[${dl}]}"
+			${buildstep} || die "failed ${buildstep/ */} dir \"${d}\""
 		done
 		popd
 	done
 
-	[[ -w bdb/dist/ltmain.sh ]] && cp ltmain.sh bdb/dist/ltmain.sh
-	pushd bdb/dist && sh s_all || die "failed bdb reconfigure"
-	popd
+	if ! mysql_check_version_range "5.01.00.00 to 5.01.06.99" ; then
+		[[ -w "${bdbdir}/ltmain.sh" ]] && cp ltmain.sh "${bdbdir}/ltmain.sh"
+		pushd "${bdbdir}" && sh s_all || die "failed bdb reconfigure"
+		popd
+	fi
 
 	# Temporary workaround for bug in test suite, a correct solution
 	# should work inside the include files to enable/disable the tests
@@ -364,18 +373,23 @@ src_compile() {
 			fi
 		fi
 
+		# optional again from 2005-12-05
+		myconf="${myconf} $(use_with innodb)"
+
 		# lots of chars
 		myconf="${myconf} --with-extra-charsets=all"
 
 		#The following fix is due to a bug with bdb on sparc's. See:
 		#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
 		# it comes down to non-64-bit safety problems
-		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64
+		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64 \
+		|| mysql_check_version_range "5.01.00.00 to 5.01.06.99"
 		then
+			ewarn "bdb berkeley-db disabled due to arch or version"
 			myconf="${myconf} --without-berkeley-db"
 		else
 			useq berkdb \
-				&& myconf="${myconf} --with-berkeley-db=./bdb" \
+				&& myconf="${myconf} --with-berkeley-db" \
 				|| myconf="${myconf} --without-berkeley-db"
 		fi
 
@@ -398,17 +412,25 @@ src_compile() {
 		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
 		myconf="${myconf} --with-archive-storage-engine"
 		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
+
 		mysql_version_is_at_least "4.01.04.00" \
 		&& myconf="${myconf} --with-csv-storage-engine"
+
+		mysql_version_is_at_least "4.01.11.00" \
+		&&  myconf="${myconf} --with-blackhole-storage-engine"
+
 		# http://dev.mysql.com/doc/mysql/en/federated-description.html
 		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
 		if mysql_version_is_at_least "5.00.03.00" ; then
 			einfo "before to use federated engine be sure to read"
-			einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
+			einfo "http://dev.mysql.com/doc/refman/5.0/en/federated-limitations.html"
 			myconf="${myconf} --with-federated-storage-engine"
+
+			# http://dev.mysql.com/doc/refman/5.1/en/partitioning-overview.html
+			if mysql_version_is_at_least "5.01.00.00" ; then
+				myconf="${myconf} --with-partition"
+			fi
 		fi
-		mysql_version_is_at_least "4.01.11.00" \
-		&&  myconf="${myconf} --with-blackhole-storage-engine"
 	fi
 
 	#glibc-2.3.2_pre fix; bug #16496
@@ -549,7 +571,9 @@ src_install() {
 	doins scripts/mysqlaccess.conf
 	newins "${FILESDIR}/my.cnf-4.1" my.cnf
 	insinto "/etc/conf.d"
-	newins "${FILESDIR}/mysql-slot.conf.d" "mysql"
+	newins "${FILESDIR}/mysql-slot.conf.d-r1" "mysql"
+	mysql_version_is_at_least "5.00.11.00" \
+	&& newins "${FILESDIR}/mysqlmanager-slot.conf.d" "mysqlmanager"
 
 	local charset='utf8'
 	! useq utf8 && local charset='latin1'
@@ -561,7 +585,9 @@ src_install() {
 	# minimal builds don't have the server
 	if ! useq minimal; then
 		exeinto /etc/init.d
-		newexe "${FILESDIR}/mysql-slot.rc6" "mysql"
+		newexe "${FILESDIR}/mysql-slot.rc6-r1" "mysql"
+		mysql_version_is_at_least "5.00.11.00" \
+		&& newexe "${FILESDIR}/mysqlmanager-slot.rc6" "mysqlmanager"
 		insinto /etc/logrotate.d
 		# TODO
 		newins "${FILESDIR}/logrotate.mysql" "mysql${MY_SUFFIX}"
diff --git a/dev-db/mysql/mysql-5.0.16-r3.ebuild b/dev-db/mysql/mysql-5.0.16-r3.ebuild
index 585094c0e124..fad41a8d2111 100644
--- a/dev-db/mysql/mysql-5.0.16-r3.ebuild
+++ b/dev-db/mysql/mysql-5.0.16-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r3.ebuild,v 1.4 2005/11/25 17:19:19 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r3.ebuild,v 1.5 2005/12/08 14:54:31 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -12,7 +12,6 @@ stripdots() {
 
 # major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
 MYSQL_VERSION_ID=$(stripdots "5.00.16.00")
-PROTOCOL_VERSION=10
 NDB_VERSION_ID=50016
 #major, minor only in the slot
 SLOT=0
@@ -238,21 +237,29 @@ src_unpack() {
 	find . -name 'Makefile.am' \
 		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
 
+	# Manage mysqlmanager
+	mysql_version_is_at_least "5.00.15.00" \
+	&& sed -i -e "s!@GENTOO_EXT@!${MY_SUFFIX}!g" \
+		-e "s!@GENTOO_SOCK_PATH@!var/run/mysqld!g" \
+		"${S}/server-tools/instance-manager/Makefile.am"
+
 	# remove what need to be recreated, so we are sure it's actually done
-	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm {} \;
+	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm -f {} \;
 	rm ltmain.sh
 
-	local rebuilddirlist dl buildstep
+	local rebuilddirlist d buildstep bdbdir
 
 	if mysql_version_is_at_least "5.01.00.00" ; then
-		rebuilddirlist=( '.' 'storage/innobase' )
+		rebuilddirlist=". storage/innobase"
+		bdbdir='storage/bdb/dist'
 	else
-		rebuilddirlist=( '.' 'innobase' )
+		rebuilddirlist=". innobase"
+		bdbdir='bdb/dist'
 	fi
 
-	for dl in ${!rebuilddirlist[@]}; do
-		einfo "reconfiguring phase $(( ${dl} + 1 )) of ${#rebuilddirlist[@]}"
-		pushd "${rebuilddirlist[${dl}]}"
+	for d in ${rebuilddirlist}; do
+		einfo "reconfiguring dir \"${d}\""
+		pushd "${d}"
 		for buildstep in \
 			'libtoolize --copy --force' \
 			'aclocal --force' \
@@ -262,14 +269,16 @@ src_unpack() {
 			'gnuconfig_update'
 		do
 			einfo "performing ${buildstep}"
-			${buildstep} || die "failed ${buildstep/ */} ${rebuilddirlist[${dl}]}"
+			${buildstep} || die "failed ${buildstep/ */} dir \"${d}\""
 		done
 		popd
 	done
 
-	[[ -w bdb/dist/ltmain.sh ]] && cp ltmain.sh bdb/dist/ltmain.sh
-	pushd bdb/dist && sh s_all || die "failed bdb reconfigure"
-	popd
+	if ! mysql_check_version_range "5.01.00.00 to 5.01.06.99" ; then
+		[[ -w "${bdbdir}/ltmain.sh" ]] && cp ltmain.sh "${bdbdir}/ltmain.sh"
+		pushd "${bdbdir}" && sh s_all || die "failed bdb reconfigure"
+		popd
+	fi
 
 	# Temporary workaround for bug in test suite, a correct solution
 	# should work inside the include files to enable/disable the tests
@@ -372,8 +381,10 @@ src_compile() {
 		#The following fix is due to a bug with bdb on sparc's. See:
 		#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
 		# it comes down to non-64-bit safety problems
-		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64
+		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64 \
+		|| mysql_check_version_range "5.01.00.00 to 5.01.06.99"
 		then
+			ewarn "bdb berkeley-db disabled due to arch or version"
 			myconf="${myconf} --without-berkeley-db"
 		else
 			useq berkdb \
@@ -400,17 +411,25 @@ src_compile() {
 		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
 		myconf="${myconf} --with-archive-storage-engine"
 		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
+
 		mysql_version_is_at_least "4.01.04.00" \
 		&& myconf="${myconf} --with-csv-storage-engine"
+
+		mysql_version_is_at_least "4.01.11.00" \
+		&&  myconf="${myconf} --with-blackhole-storage-engine"
+
 		# http://dev.mysql.com/doc/mysql/en/federated-description.html
 		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
 		if mysql_version_is_at_least "5.00.03.00" ; then
 			einfo "before to use federated engine be sure to read"
-			einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
+			einfo "http://dev.mysql.com/doc/refman/5.0/en/federated-limitations.html"
 			myconf="${myconf} --with-federated-storage-engine"
+
+			# http://dev.mysql.com/doc/refman/5.1/en/partitioning-overview.html
+			if mysql_version_is_at_least "5.01.00.00" ; then
+				myconf="${myconf} --with-partition"
+			fi
 		fi
-		mysql_version_is_at_least "4.01.11.00" \
-		&&  myconf="${myconf} --with-blackhole-storage-engine"
 	fi
 
 	#glibc-2.3.2_pre fix; bug #16496
@@ -551,7 +570,9 @@ src_install() {
 	doins scripts/mysqlaccess.conf
 	newins "${FILESDIR}/my.cnf-4.1" my.cnf
 	insinto "/etc/conf.d"
-	newins "${FILESDIR}/mysql-slot.conf.d" "mysql"
+	newins "${FILESDIR}/mysql-slot.conf.d-r1" "mysql"
+	mysql_version_is_at_least "5.00.11.00" \
+	&& newins "${FILESDIR}/mysqlmanager-slot.conf.d" "mysqlmanager"
 
 	local charset='utf8'
 	! useq utf8 && local charset='latin1'
@@ -563,7 +584,9 @@ src_install() {
 	# minimal builds don't have the server
 	if ! useq minimal; then
 		exeinto /etc/init.d
-		newexe "${FILESDIR}/mysql-slot.rc6" "mysql"
+		newexe "${FILESDIR}/mysql-slot.rc6-r1" "mysql"
+		mysql_version_is_at_least "5.00.11.00" \
+		&& newexe "${FILESDIR}/mysqlmanager-slot.rc6" "mysqlmanager"
 		insinto /etc/logrotate.d
 		# TODO
 		newins "${FILESDIR}/logrotate.mysql" "mysql${MY_SUFFIX}"
diff --git a/dev-db/mysql/mysql-5.0.16-r30.ebuild b/dev-db/mysql/mysql-5.0.16-r30.ebuild
index 5a2f32195759..8c8b16b845ba 100644
--- a/dev-db/mysql/mysql-5.0.16-r30.ebuild
+++ b/dev-db/mysql/mysql-5.0.16-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r30.ebuild,v 1.6 2005/11/24 21:00:54 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r30.ebuild,v 1.7 2005/12/08 14:54:31 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -12,7 +12,6 @@ stripdots() {
 
 # major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
 MYSQL_VERSION_ID=$(stripdots "5.00.16.00")
-PROTOCOL_VERSION=10
 NDB_VERSION_ID=50016
 #major, minor only in the slot
 SLOT=$(( ${MYSQL_VERSION_ID} / 10000 ))
@@ -27,11 +26,11 @@ DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
 NEWP="${PN}-${PV/_/-}"
 SRC_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/${NEWP}.tar.gz
-	mirror://gentoo/mysql-extras-20051122.tar.bz2"
+	mirror://gentoo/mysql-extras-20051205.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="-*"
-IUSE="big-tables berkdb debug minimal perl selinux ssl static"
+IUSE="big-tables berkdb debug minimal perl selinux ssl static innodb"
 RESTRICT="primaryuri"
 
 DEPEND=">=sys-libs/readline-4.1
@@ -236,21 +235,29 @@ src_unpack() {
 	find . -name 'Makefile.am' \
 		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
 
+	# Manage mysqlmanager
+	mysql_version_is_at_least "5.00.15.00" \
+	&& sed -i -e "s!@GENTOO_EXT@!${MY_SUFFIX}!g" \
+		-e "s!@GENTOO_SOCK_PATH@!var/run/mysqld!g" \
+		"${S}/server-tools/instance-manager/Makefile.am"
+
 	# remove what need to be recreated, so we are sure it's actually done
-	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm {} \;
+	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm -f {} \;
 	rm ltmain.sh
 
-	local rebuilddirlist dl buildstep
+	local rebuilddirlist d buildstep bdbdir
 
 	if mysql_version_is_at_least "5.01.00.00" ; then
-		rebuilddirlist=( '.' 'storage/innobase' )
+		rebuilddirlist=". storage/innobase"
+		bdbdir='storage/bdb/dist'
 	else
-		rebuilddirlist=( '.' 'innobase' )
+		rebuilddirlist=". innobase"
+		bdbdir='bdb/dist'
 	fi
 
-	for dl in ${!rebuilddirlist[@]}; do
-		einfo "reconfiguring phase $(( ${dl} + 1 )) of ${#rebuilddirlist[@]}"
-		pushd "${rebuilddirlist[${dl}]}"
+	for d in ${rebuilddirlist}; do
+		einfo "reconfiguring dir \"${d}\""
+		pushd "${d}"
 		for buildstep in \
 			'libtoolize --copy --force' \
 			'aclocal --force' \
@@ -260,14 +267,16 @@ src_unpack() {
 			'gnuconfig_update'
 		do
 			einfo "performing ${buildstep}"
-			${buildstep} || die "failed ${buildstep/ */} ${rebuilddirlist[${dl}]}"
+			${buildstep} || die "failed ${buildstep/ */} dir \"${d}\""
 		done
 		popd
 	done
 
-	[[ -w bdb/dist/ltmain.sh ]] && cp ltmain.sh bdb/dist/ltmain.sh
-	pushd bdb/dist && sh s_all || die "failed bdb reconfigure"
-	popd
+	if ! mysql_check_version_range "5.01.00.00 to 5.01.06.99" ; then
+		[[ -w "${bdbdir}/ltmain.sh" ]] && cp ltmain.sh "${bdbdir}/ltmain.sh"
+		pushd "${bdbdir}" && sh s_all || die "failed bdb reconfigure"
+		popd
+	fi
 
 	# Temporary workaround for bug in test suite, a correct solution
 	# should work inside the include files to enable/disable the tests
@@ -364,18 +373,23 @@ src_compile() {
 			fi
 		fi
 
+		# optional again from 2005-12-05
+		myconf="${myconf} $(use_with innodb)"
+
 		# lots of chars
 		myconf="${myconf} --with-extra-charsets=all"
 
 		#The following fix is due to a bug with bdb on sparc's. See:
 		#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
 		# it comes down to non-64-bit safety problems
-		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64
+		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64 \
+		|| mysql_check_version_range "5.01.00.00 to 5.01.06.99"
 		then
+			ewarn "bdb berkeley-db disabled due to arch or version"
 			myconf="${myconf} --without-berkeley-db"
 		else
 			useq berkdb \
-				&& myconf="${myconf} --with-berkeley-db=./bdb" \
+				&& myconf="${myconf} --with-berkeley-db" \
 				|| myconf="${myconf} --without-berkeley-db"
 		fi
 
@@ -398,17 +412,25 @@ src_compile() {
 		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
 		myconf="${myconf} --with-archive-storage-engine"
 		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
+
 		mysql_version_is_at_least "4.01.04.00" \
 		&& myconf="${myconf} --with-csv-storage-engine"
+
+		mysql_version_is_at_least "4.01.11.00" \
+		&&  myconf="${myconf} --with-blackhole-storage-engine"
+
 		# http://dev.mysql.com/doc/mysql/en/federated-description.html
 		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
 		if mysql_version_is_at_least "5.00.03.00" ; then
 			einfo "before to use federated engine be sure to read"
-			einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
+			einfo "http://dev.mysql.com/doc/refman/5.0/en/federated-limitations.html"
 			myconf="${myconf} --with-federated-storage-engine"
+
+			# http://dev.mysql.com/doc/refman/5.1/en/partitioning-overview.html
+			if mysql_version_is_at_least "5.01.00.00" ; then
+				myconf="${myconf} --with-partition"
+			fi
 		fi
-		mysql_version_is_at_least "4.01.11.00" \
-		&&  myconf="${myconf} --with-blackhole-storage-engine"
 	fi
 
 	#glibc-2.3.2_pre fix; bug #16496
@@ -549,7 +571,9 @@ src_install() {
 	doins scripts/mysqlaccess.conf
 	newins "${FILESDIR}/my.cnf-4.1" my.cnf
 	insinto "/etc/conf.d"
-	newins "${FILESDIR}/mysql-slot.conf.d" "mysql"
+	newins "${FILESDIR}/mysql-slot.conf.d-r1" "mysql"
+	mysql_version_is_at_least "5.00.11.00" \
+	&& newins "${FILESDIR}/mysqlmanager-slot.conf.d" "mysqlmanager"
 
 	local charset='utf8'
 	! useq utf8 && local charset='latin1'
@@ -561,7 +585,9 @@ src_install() {
 	# minimal builds don't have the server
 	if ! useq minimal; then
 		exeinto /etc/init.d
-		newexe "${FILESDIR}/mysql-slot.rc6" "mysql"
+		newexe "${FILESDIR}/mysql-slot.rc6-r1" "mysql"
+		mysql_version_is_at_least "5.00.11.00" \
+		&& newexe "${FILESDIR}/mysqlmanager-slot.rc6" "mysqlmanager"
 		insinto /etc/logrotate.d
 		# TODO
 		newins "${FILESDIR}/logrotate.mysql" "mysql${MY_SUFFIX}"
diff --git a/dev-db/mysql/mysql-5.1.3_alpha-r30.ebuild b/dev-db/mysql/mysql-5.1.3_alpha-r30.ebuild
new file mode 100644
index 000000000000..f703e54da19f
--- /dev/null
+++ b/dev-db/mysql/mysql-5.1.3_alpha-r30.ebuild
@@ -0,0 +1,815 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.3_alpha-r30.ebuild,v 1.1 2005/12/08 14:54:31 vivo Exp $
+
+# helper function, version (integer) may have section separated by dots
+# for readbility
+stripdots() {
+	local dotver=${1:-"0"}
+	while [[ "${dotver/./}" != "${dotver}" ]] ; do dotver="${dotver/./}" ; done
+	echo "${dotver:-"0"}"
+}
+
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
+MYSQL_VERSION_ID=$(stripdots "5.01.03.30")
+NDB_VERSION_ID=50103
+#major, minor only in the slot
+SLOT=$(( ${MYSQL_VERSION_ID} / 10000 ))
+
+inherit eutils flag-o-matic gnuconfig
+
+# shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/${PN}"
+
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+HOMEPAGE="http://www.mysql.com/"
+NEWP="${PN}-${PV/_/-}"
+SRC_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/${NEWP}.tar.gz
+	mirror://gentoo/mysql-extras-20051205.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="-*"
+IUSE="big-tables berkdb debug minimal perl selinux ssl static innodb"
+RESTRICT="primaryuri"
+
+DEPEND=">=sys-libs/readline-4.1
+	bdb? ( sys-apps/ed )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	userland_GNU? ( sys-process/procps )
+	>=sys-libs/zlib-1.2.3
+	>=sys-apps/texinfo-4.7-r1
+	>=sys-apps/sed-4"
+RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+# Is $2 (defaults to $MYSQL_VERSION_ID) at least version $1?
+# (nice) idea from versionator.eclass
+mysql_version_is_at_least() {
+	local want_s=$(stripdots "$1") have_s=$( stripdots "${2:-${MYSQL_VERSION_ID}}")
+	[[ -z "${want_s}" ]] && die "mysql_version_is_at_least missing value"
+	[[ ${want_s} -le ${have_s} ]] && return 0 || return 1
+}
+
+if mysql_version_is_at_least "4.01.03.00" ; then
+	IUSE="${IUSE} cluster utf8 extraengine"
+fi
+
+# bool mysql_check_version_range(char * range, int ver=MYSQL_VERSION_ID, int die_on_err=MYSQL_DIE_ON_RANGE_ERROR)
+#
+# Check if a version number fall inside a range.
+# the range include the extremes and must be specified as
+# "low_version to hi_version" i.e. "4.00.00.00 to 5.01.99.99"
+# Return true if inside the range
+# 2005-11-19 <vivo at gentoo.org>
+mysql_check_version_range() {
+	local lbound="${1%% to *}" ; lbound=$(stripdots "${lbound}")
+	local rbound="${1#* to }"  ; rbound=$(stripdots "${rbound}")
+	local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
+	[[ $lbound -le $my_ver && $my_ver -le $rbound ]] && return 0
+	return 1
+}
+
+# private bool _mysql_test_patch_easy( int flags, char * pname )
+#
+# true if found at least one appliable range
+# 2005-11-19 <vivo at gentoo.org>
+_mysql_test_patch_easy() {
+	local filesdir="${WORKDIR}/mysql-extras"
+	[[ -d "${filesdir}" ]] || die 'sourcedir must be a directory'
+	local flags=$1 pname=$2
+	if [[ $(( $flags & 5 )) -eq 5 ]] ; then
+		einfo "using \"${pname}\""
+		mv "${filesdir}/${pname}" "${EPATCH_SOURCE}" || die "cannot move ${pname}"
+		return 0
+	fi
+	return 1
+}
+
+# void mysql_mv_patches(char * index_file, char * filesdir, int my_ver)
+#
+# parse a "index_file" looking for patches to apply to current
+# version.
+# If the patch apply then print it's description
+# 2005-11-19 <vivo at gentoo.org>
+mysql_mv_patches() {
+	local index_file="${1:-"${WORKDIR}/mysql-extras/index.txt"}"
+	local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
+	local my_test_fx=${3:-"_mysql_test_patch_easy"}
+	local dsc=(), ndsc=0 i
+
+	# values for flags are (2^x):
+	#  1 - one patch found
+	#  2 - at  least one version range is wrong
+	#  4 - at  least one version range is _good_
+	local flags=0 pname='' comments=''
+	while read row; do
+		case "${row}" in
+			@patch\ *)
+				${my_test_fx} $flags "${pname}" \
+				&& for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
+				flags=1 ; ndsc=0 ; dsc=()
+				pname=${row#"@patch "}
+				;;
+			@ver\ *)
+				if mysql_check_version_range "${row#"@ver "}" "${my_ver}" ; then
+					flags=$(( $flags | 4 ))
+				else
+					flags=$(( $flags | 2 ))
+				fi
+				;;
+			# @use\ *) ;;
+			@@\ *)
+				dsc[$ndsc]="${row#"@@ "}"
+				(( ++ndsc ))
+				;;
+		esac
+	done < "${index_file}"
+	${my_test_fx} $flags "${pname}" \
+		&& for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
+}
+
+
+# void mysql_init_vars()
+#
+# initialize global variables
+# 2005-11-19 <vivo at gentoo.org>
+mysql_init_vars() {
+
+	MY_SUFFIX=${MY_SUFFIX:-"-${SLOT}"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR:-"/usr/share/mysql${MY_SUFFIX}"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql${MY_SUFFIX}"}
+	MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql${MY_SUFFIX}"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql${MY_SUFFIX}"}
+	MY_LOGDIR=${MY_LOGDIR="/var/log/mysql${MY_SUFFIX}"}
+	MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql${MY_SUFFIX}"}
+
+	if [ -z "${DATADIR}" ]; then
+		DATADIR=""
+		if [ -f "${SYSCONFDIR}/my.cnf" ] ; then
+			DATADIR=`"my_print_defaults${MY_SUFFIX}" mysqld 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+			if [ -z "${DATADIR}" ]; then
+				DATADIR=`grep ^datadir "${SYSCONFDIR}/my.cnf" | sed -e 's/.*=\s*//'`
+			fi
+		fi
+		if [ -z "${DATADIR}" ]; then
+			DATADIR="${MY_LOCALSTATEDIR}"
+			einfo "Using default DATADIR"
+		fi
+		einfo "MySQL DATADIR is ${DATADIR}"
+
+		if [ -z "${PREVIOUS_DATADIR}" ] ; then
+			if [ -a "${DATADIR}" ] ; then
+				ewarn "Previous datadir found, it's YOUR job to change"
+				ewarn "ownership and have care of it"
+				PREVIOUS_DATADIR="yes"
+				export PREVIOUS_DATADIR
+			else
+				PREVIOUS_DATADIR="no"
+				export PREVIOUS_DATADIR
+			fi
+		fi
+	fi
+
+	export MY_SUFFIX MY_SHAREDSTATEDIR MY_SYSCONFDIR
+	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
+	export MY_INCLUDEDIR
+	export DATADIR
+}
+
+mysql_strip_double_slash() {
+	local path="${1}"
+	local newpath="${path/\/\///}"
+	while [[ ${path} != ${newpath} ]]; do
+		path=${newpath}
+		newpath="${path/\/\///}"
+	done
+	echo "${newpath}"
+}
+
+pkg_setup() {
+
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 -1 /dev/null mysql \
+	|| die "problem adding user mysql"
+}
+
+src_unpack() {
+
+	mysql_init_vars
+
+	if useq static && useq ssl; then
+		local msg="MySQL does not support building statically with SSL support"
+		eerror "${msg}"
+		die "${msg}"
+	fi
+
+	if mysql_version_is_at_least "4.01.03.00" \
+	&& useq cluster \
+	|| useq extraengine \
+	&& useq minimal ; then
+		die "USEs cluster, extraengine conflicts with \"minimal\""
+	fi
+
+	unpack ${A} || die
+
+	mv "${WORKDIR}/${NEWP}" "${S}"
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch"
+	mkdir -p "${EPATCH_SOURCE}" || die "unable to create epatch directory"
+	mysql_mv_patches
+	epatch || die "failed to apply all patches"
+
+	# additional check, remove bundled zlib
+	rm -f "${S}/zlib/"*.[ch]
+	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
+	rm -f scripts/mysqlbug
+
+	# Multilib issue with zlib detection
+	sed -i -e "s:zlib_dir/lib:zlib_dir/$(get_libdir):g" \
+		"${S}/config/ac-macros/zlib.m4"
+
+	# Make charsets install in the right place
+	find . -name 'Makefile.am' \
+		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
+
+	# Manage mysqlmanager
+	mysql_version_is_at_least "5.00.15.00" \
+	&& sed -i -e "s!@GENTOO_EXT@!${MY_SUFFIX}!g" \
+		-e "s!@GENTOO_SOCK_PATH@!var/run/mysqld!g" \
+		"${S}/server-tools/instance-manager/Makefile.am"
+
+	# remove what need to be recreated, so we are sure it's actually done
+	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm -f {} \;
+	rm ltmain.sh
+
+	local rebuilddirlist d buildstep bdbdir
+
+	if mysql_version_is_at_least "5.01.00.00" ; then
+		rebuilddirlist=". storage/innobase"
+		bdbdir='storage/bdb/dist'
+	else
+		rebuilddirlist=". innobase"
+		bdbdir='bdb/dist'
+	fi
+
+	for d in ${rebuilddirlist}; do
+		einfo "reconfiguring dir \"${d}\""
+		pushd "${d}"
+		for buildstep in \
+			'libtoolize --copy --force' \
+			'aclocal --force' \
+			'autoheader --force -Wnone' \
+			'autoconf --force -Wnone' \
+			'automake --force --force-missing -Wnone' \
+			'gnuconfig_update'
+		do
+			einfo "performing ${buildstep}"
+			${buildstep} || die "failed ${buildstep/ */} dir \"${d}\""
+		done
+		popd
+	done
+
+	if ! mysql_check_version_range "5.01.00.00 to 5.01.06.99" ; then
+		[[ -w "${bdbdir}/ltmain.sh" ]] && cp ltmain.sh "${bdbdir}/ltmain.sh"
+		pushd "${bdbdir}" && sh s_all || die "failed bdb reconfigure"
+		popd
+	fi
+
+	# Temporary workaround for bug in test suite, a correct solution
+	# should work inside the include files to enable/disable the tests
+	# for the current configuration
+
+	if ! useq extraengine ; then
+		einfo "disabling unneded extraengine tests"
+		local disable_test="archive bdb blackhole federated view csv"
+		for i in $disable_test ; do
+			mv "${S}/mysql-test/t/${i}.test" "${S}/mysql-test/t/${i}.disabled" \
+			&> /dev/null
+		done
+	fi
+
+	if ! useq berkdb ; then
+		einfo "disabling unneded berkdb tests"
+		local disable_test="auto_increment bdb-alter-table-1 bdb-alter-table-2 bdb-crash bdb-deadlock bdb bdb_cache binlog ctype_sjis ctype_utf8 heap_auto_increment index_merge_bdb multi_update mysqldump ps_1general ps_6bdb rowid_order_bdb"
+		for i in $disable_test ; do
+			mv "${S}/mysql-test/t/${i}.test" "${S}/mysql-test/t/${i}.disabled" \
+			&> /dev/null
+		done
+	fi
+}
+
+src_compile() {
+
+	mysql_init_vars
+	local myconf
+
+	if useq static ; then
+		myconf="${myconf} --with-mysqld-ldflags=-all-static"
+		myconf="${myconf} --with-client-ldflags=-all-static"
+		myconf="${myconf} --disable-shared"
+	else
+		myconf="${myconf} --enable-shared --enable-static"
+	fi
+
+	#myconf="${myconf} `use_with tcpd libwrap`"
+	myconf="${myconf} --without-libwrap"
+
+	if useq ssl ; then
+		# --with-vio is not needed anymore, it's on by default and
+		# has been removed from configure
+		mysql_version_is_at_least "5.00.04.00" || myconf="${myconf} --with-vio"
+		if mysql_version_is_at_least "5.00.06.00" ; then
+			# yassl-0.96 is young break with gcc-4.0 || amd64
+			#myconf="${myconf} --with-yassl"
+			myconf="${myconf} --with-openssl"
+		else
+			myconf="${myconf} --with-openssl"
+		fi
+	else
+		myconf="${myconf} --without-openssl"
+	fi
+
+	if useq debug; then
+		myconf="${myconf} --with-debug=full"
+	else
+		myconf="${myconf} --without-debug"
+		mysql_version_is_at_least "4.01.03.00" && useq cluster && myconf="${myconf} --without-ndb-debug"
+	fi
+
+	# benchmarking stuff needs perl
+	# and shouldn't be bothered with on minimal builds
+	if useq perl && ! useq minimal; then
+		myconf="${myconf} --with-bench"
+	else
+		myconf="${myconf} --without-bench"
+	fi
+
+	# these are things we exclude from a minimal build
+	# note that the server actually does get built and installed
+	# but we then delete it before packaging.
+	local minimal_exclude_list="server embedded-server extra-tools innodb"
+	if ! useq minimal; then
+		for i in ${minimal_exclude_list}; do
+			myconf="${myconf} --with-${i}"
+		done
+
+		if useq static ; then
+			myconf="${myconf} --without-raid"
+			ewarn "disabling raid support, has problem with static"
+		else
+			myconf="${myconf} --with-raid"
+		fi
+
+		if ! mysql_version_is_at_least "5.00.00.00" ; then
+			if mysql_version_is_at_least "4.01.00.00" && useq utf8; then
+				myconf="${myconf} --with-charset=utf8"
+				myconf="${myconf} --with-collation=utf8_general_ci"
+			else
+				myconf="${myconf} --with-charset=latin1"
+				myconf="${myconf} --with-collation=latin1_swedish_ci"
+			fi
+		fi
+
+		# optional again from 2005-12-05
+		myconf="${myconf} $(use_with innodb)"
+
+		# lots of chars
+		myconf="${myconf} --with-extra-charsets=all"
+
+		#The following fix is due to a bug with bdb on sparc's. See:
+		#http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
+		# it comes down to non-64-bit safety problems
+		if useq sparc || useq alpha || useq hppa || useq mips || useq amd64 \
+		|| mysql_check_version_range "5.01.00.00 to 5.01.06.99"
+		then
+			ewarn "bdb berkeley-db disabled due to arch or version"
+			myconf="${myconf} --without-berkeley-db"
+		else
+			useq berkdb \
+				&& myconf="${myconf} --with-berkeley-db" \
+				|| myconf="${myconf} --without-berkeley-db"
+		fi
+
+		if mysql_version_is_at_least "4.01.03.00" ; then
+			#myconf="${myconf} $(use_with geometry)"
+			myconf="${myconf} --with-geometry"
+			myconf="${myconf} $(use_with cluster ndbcluster)"
+		fi
+
+		mysql_version_is_at_least "4.01.11.00" &&  myconf="${myconf} `use_with big-tables`"
+	else
+		for i in ${minimal_exclude_list}; do
+			myconf="${myconf} --without-${i}"
+		done
+		myconf="${myconf} --without-berkeley-db"
+		myconf="${myconf} --with-extra-charsets=none"
+	fi
+
+	if mysql_version_is_at_least "4.01.03.00" && useq extraengine; then
+		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
+		myconf="${myconf} --with-archive-storage-engine"
+		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
+
+		mysql_version_is_at_least "4.01.04.00" \
+		&& myconf="${myconf} --with-csv-storage-engine"
+
+		mysql_version_is_at_least "4.01.11.00" \
+		&&  myconf="${myconf} --with-blackhole-storage-engine"
+
+		# http://dev.mysql.com/doc/mysql/en/federated-description.html
+		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
+		if mysql_version_is_at_least "5.00.03.00" ; then
+			einfo "before to use federated engine be sure to read"
+			einfo "http://dev.mysql.com/doc/refman/5.0/en/federated-limitations.html"
+			myconf="${myconf} --with-federated-storage-engine"
+
+			# http://dev.mysql.com/doc/refman/5.1/en/partitioning-overview.html
+			if mysql_version_is_at_least "5.01.00.00" ; then
+				myconf="${myconf} --with-partition"
+			fi
+		fi
+	fi
+
+	#glibc-2.3.2_pre fix; bug #16496
+	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
+
+	#the compiler flags are as per their "official" spec ;)
+	#CFLAGS="${CFLAGS/-O?/} -O3" \
+	export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti"
+	mysql_version_is_at_least "5.00.00.00" \
+	&& export CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+
+	econf \
+		--program-suffix="${MY_SUFFIX}" \
+		--libexecdir="/usr/sbin" \
+		--sysconfdir="${MY_SYSCONFDIR}" \
+		--localstatedir="${MY_LOCALSTATEDIR}" \
+		--sharedstatedir="${MY_SHAREDSTATEDIR}" \
+		--libdir="${MY_LIBDIR}" \
+		--includedir="${MY_INCLUDEDIR}" \
+		--with-low-memory \
+		--enable-assembler \
+		--enable-local-infile \
+		--with-mysqld-user=mysql \
+		--with-client-ldflags=-lstdc++ \
+		--enable-thread-safe-client \
+		--with-comment="Gentoo Linux ${PF}" \
+		--with-unix-socket-path="/var/run/mysqld/mysqld${MY_SUFFIX}.sock" \
+		--with-zlib-dir=/usr \
+		--with-lib-ccflags="-fPIC" \
+		--without-readline \
+		--without-docs \
+		${myconf} || die "bad ./configure"
+
+	# TODO Move this before autoreconf !!!
+	find . -name 'Makefile' \
+	-exec sed --in-place \
+	-e 's|^pkglibdir\s*=\s*$(libdir)/mysql|pkglibdir = $(libdir)|' \
+	-e 's|^pkgincludedir\s*=\s*$(includedir)/mysql|pkgincludedir = $(includedir)|' \
+	{} \;
+
+	emake || die "compile problem"
+}
+
+src_test() {
+	cd ${S}
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! useq minimal; then
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		mysql_version_is_at_least "5.00.15.00" \
+		&& make test-force-pl \
+		|| make test-pl
+		retstatus=$?
+
+		# to be sure ;)
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus -eq 0 ]] || die "make test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
+
+src_install() {
+
+	mysql_init_vars
+	make install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die
+
+	# create globally visible symlinks
+	# TODO : what abaut ndb ?
+	local mylib mylibfullver mylibtmpver maxdots sonamelist
+	pushd "${D}/${MY_LIBDIR}"
+	for mylib in libmysqlclient_r libmysqlclient libndbclient; do
+		mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
+		mylibtmpver="${mylibfullver}"
+		maxdots=0
+		while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
+			(( ++maxdots ))
+			dosym \
+				$(mysql_strip_double_slash "${MY_LIBDIR}/${mylibfullver}") \
+				$(mysql_strip_double_slash "${MY_LIBDIR}/../${mylibtmpver}")
+			mylibtmpver=${mylibtmpver%.*}
+		done
+	done
+	popd
+
+	insinto "${MY_INCLUDEDIR}"
+	doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
+
+	# convenience links
+	dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlanalyze${MY_SUFFIX}"
+	dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlrepair${MY_SUFFIX}"
+	dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqloptimize${MY_SUFFIX}"
+
+	# various junk (my-*.cnf moved elsewhere)
+	rm -rf "${D}/usr/share/info"
+	for removeme in  "mysql-log-rotate" mysql.server* \
+		binary-configure* my-*.cnf mi_test_all*
+	do
+		rm -f "${D}/usr/share/mysql/${removeme}"
+	done
+
+	# oops
+	mysql_check_version_range "5.00.16.00 to 5.00.16.99" \
+	&& cp "${WORKDIR}/mysql-extras/fill_help_tables.sql-5.0.15" "${D}/usr/share/mysql/"
+
+	# TODO change at Makefile-am level
+	for moveme in "mysql_fix_privilege_tables.sql" \
+		"fill_help_tables.sql" "ndb-config-2-node.ini"
+	do
+		mv "${D}/usr/share/mysql/${moveme}"/ "${D}/usr/share/mysql${MY_SUFFIX}/" 2>/dev/null
+	done
+
+	if [[ -n "${MY_SUFFIX}" ]] ; then
+		local notcatched=$(ls "${D}/usr/share/mysql"/*)
+		if [[ -n "${notcatched}" ]] ; then
+			ewarn "QA notice"
+			ewarn "${notcatched} files in /usr/share/mysql"
+			ewarn "bug mysql-herd to manage them"
+		fi
+		rm -rf "${D}/usr/share/mysql"
+	fi
+
+	# clean up stuff for a minimal build
+	# this is anything server-specific
+	if useq minimal; then
+		rm -rf ${D}${MY_SHAREDSTATEDIR}/{mysql-test,sql-bench}
+		rm -f ${D}/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
+		rm -f "${D}/usr/sbin/mysqld${MY_SUFFIX}"
+		rm -f ${D}${MY_LIBDIR}/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+	fi
+
+	# config stuff
+	insinto "${MY_SYSCONFDIR}"
+	doins scripts/mysqlaccess.conf
+	newins "${FILESDIR}/my.cnf-4.1" my.cnf
+	insinto "/etc/conf.d"
+	newins "${FILESDIR}/mysql-slot.conf.d-r1" "mysql"
+	mysql_version_is_at_least "5.00.11.00" \
+	&& newins "${FILESDIR}/mysqlmanager-slot.conf.d" "mysqlmanager"
+
+	local charset='utf8'
+	! useq utf8 && local charset='latin1'
+	sed --in-place \
+		-e "s/@MY_SUFFIX@/${MY_SUFFIX}/" \
+		-e "s/@CHARSET@/${charset}/" \
+		"${D}/etc/mysql${MY_SUFFIX}/my.cnf"
+
+	# minimal builds don't have the server
+	if ! useq minimal; then
+		exeinto /etc/init.d
+		newexe "${FILESDIR}/mysql-slot.rc6-r1" "mysql"
+		mysql_version_is_at_least "5.00.11.00" \
+		&& newexe "${FILESDIR}/mysqlmanager-slot.rc6" "mysqlmanager"
+		insinto /etc/logrotate.d
+		# TODO
+		newins "${FILESDIR}/logrotate.mysql" "mysql${MY_SUFFIX}"
+
+		#empty dirs...
+		diropts "-m0750"
+		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+			dodir "${DATADIR}"
+			keepdir "${DATADIR}"
+			chown -R mysql:mysql "${D}/${DATADIR}"
+		fi
+
+		diropts "-m0755"
+		for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
+			dodir "${folder}"
+			keepdir "${folder}"
+			chown -R mysql:mysql "${D}/${folder}"
+		done
+	fi
+
+	# docs
+	dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
+	# minimal builds don't have the server
+	if ! useq minimal; then
+		docinto "support-files"
+		for script in \
+			support-files/my-*.cnf \
+			support-files/magic \
+			support-files/ndb-config-2-node.ini
+		do
+			dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in \
+			$(ls scripts/mysql* | grep -v '.sh$')
+		do
+			dodoc "${script}"
+		done
+	fi
+}
+
+pkg_preinst() {
+
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 -1 /dev/null mysql \
+	|| die "problem adding user mysql"
+}
+
+pkg_postinst() {
+
+	mysql_init_vars
+
+	## TODO : make the check
+	## TODO : what abaut ndb ?
+	#local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
+	#pushd "${ROOT}/${MY_LIBDIR}"
+	#for mylib in libmysqlclient_r libmysqlclient libndbclient; do
+	#	mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
+	#	mylibtmpver="${mylibfullver}"
+	#	maxdots=0
+	#	while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
+	#		(( ++maxdots ))
+	#		prevlink=$(readlink -f "../${mylibtmpver}")
+	#		if [[ -n "${prevlink}" ]] ; then
+	#			if [[ "${mylibtmpver}" != "${mylibfullver}" ]] \
+	#			&& [[ "${prevlink##*/}" != "${mylibfullver}" ]]
+	#			then
+	#				# gah this is not totally correct
+	#				einfo "found previous library, please run"
+	#				einfo "revdep-rebuild --soname=${mylibtmpver}"
+	#			fi
+	#			rm -f "../${mylibtmpver}"
+	#		fi
+	#		ln -snf \
+	#			$(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/${mylibfullver}") \
+	#			$(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/../${mylibtmpver}")
+	#		mylibtmpver=${mylibtmpver%.*}
+	#	done
+	#done
+	#popd
+
+	# mind at FEATURES=collision-protect before to remove this
+	[ -d "${ROOT}/var/log/mysql" ] \
+		|| install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+	#secure the logfiles... does this bother anybody?
+	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
+	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
+	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
+
+	if ! useq minimal; then
+		# your friendly public service announcement...
+		einfo
+		einfo "You might want to run:"
+		einfo "\"emerge --config =${CATEGORY}/${PF}\""
+		einfo "if this is a new install."
+		einfo
+	fi
+
+	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
+}
+
+pkg_config() {
+	mysql_init_vars
+	[[ -z "${DATADIR}" ]] && die "sorry, unable to find DATADIR"
+
+	if built_with_use dev-db/mysql minimal; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+
+	local menusel
+
+	cat <<-EOF
+	 ========
+	||
+	|| 1) Create system database
+	|| 2) [TODO] Copy needed file to chroot
+	|| 3) [TODO] Make the default server (symlink)
+
+	EOF
+
+	read menusel
+	echo
+	[[ -z "${menusel}" ]] || [[ "${menusel}" == 0 ]] && return 0
+	if [[ "${menusel}" == '1' ]]
+	then
+		local pwd1="a"
+		local pwd2="b"
+		local maxtry=5
+
+		if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then
+			ewarn "You have already a MySQL database in place."
+			ewarn "(${ROOT}/${DATADIR}/*)"
+			ewarn "Please rename or delete it if you wish to replace it."
+			die "MySQL database already exists!"
+		fi
+
+		einfo "Creating the mysql database and setting proper"
+		einfo "permissions on it..."
+
+		einfo "Insert a password for the mysql 'root' user"
+		ewarn "Avoid [\"'\\_%] characters in the password"
+
+		read -rsp "    >" pwd1 ; echo
+		einfo "Check the password"
+		read -rsp "    >" pwd2 ; echo
+
+		if [[ "x$pwd1" != "x$pwd2" ]] ; then
+			die "Passwords are not the same"
+		fi
+
+		chown -R mysql:mysql ${ROOT}/${DATADIR}
+		chmod 0750 ${ROOT}/${DATADIR}
+
+		local options=""
+		local sqltmp="$(emktemp)"
+
+		local help_tables="${ROOT}/usr/share/doc/mysql-${PVR}/scripts/fill_help_tables.sql.gz"
+		[[ -r "${help_tables}" ]] \
+		&& zcat "${help_tables}" > "${TMPDIR}/fill_help_tables.sql" \
+		|| touch "${TMPDIR}/fill_help_tables.sql"
+		help_tables="${TMPDIR}/fill_help_tables.sql"
+
+		pushd "${TMPDIR}"
+		${ROOT}/usr/bin/mysql_install_db${MY_SUFFIX} || die "MySQL databases not installed"
+		popd
+
+		if mysql_version_is_at_least "4.01.03.00" ; then
+			options="--skip-ndbcluster"
+
+			# Filling timezones, see
+			# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+			${ROOT}/usr/bin/mysql_tzinfo_to_sql${MY_SUFFIX} ${ROOT}/usr/share/zoneinfo \
+			> "${sqltmp}"
+
+			if [[ -r "${help_tables}" ]] ; then
+				cat "${help_tables}" >> "${sqltmp}"
+			fi
+		fi
+
+		local socket=${ROOT}/var/run/mysqld/mysqld${MY_SUFFIX}${RANDOM}.sock
+		local pidfile=${ROOT}/var/run/mysqld/mysqld${MY_SUFFIX}${RANDOM}.sock
+		local mysqld="${ROOT}/usr/sbin/mysqld${MY_SUFFIX} \
+			${options} \
+			--skip-grant-tables \
+			--basedir=${ROOT}/usr \
+			--datadir=${ROOT}/${DATADIR} \
+			--skip-innodb \
+			--skip-bdb \
+			--max_allowed_packet=8M \
+			--net_buffer_length=16K \
+			--socket=${socket} \
+			--pid-file=${pidfile}"
+
+		$mysqld &
+		while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]]
+		do
+			maxtry=$(($maxtry-1))
+			echo -n "."
+			sleep 1
+		done
+
+		# do this from memory we don't want clear text password in temp files
+		local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'"
+		${ROOT}/usr/bin/mysql${MY_SUFFIX} \
+			--socket=${socket} \
+			-hlocalhost \
+			-e "${sql}"
+
+		einfo "Loading \"zoneinfo\" this step may require few seconds"
+
+		${ROOT}/usr/bin/mysql${MY_SUFFIX} \
+			--socket=${socket} \
+			-hlocalhost \
+			-uroot \
+			-p"${pwd1}" \
+			mysql < "${sqltmp}"
+
+		kill $(< "${pidfile}" )
+		rm  "${sqltmp}"
+		einfo "done"
+	fi # menusel
+}
+
author	Francesco Riosa <vivo@gentoo.org>	2005-12-08 14:54:31 +0000
committer	Francesco Riosa <vivo@gentoo.org>	2005-12-08 14:54:31 +0000
commit	54da25da76d4eb619008f8ff67c1ef83ad2026de (patch)
tree	5f7c745b2dc6d17ebbe60928081233782ff0b84e /dev-db/mysql
parent	Added local use flag for jldap. (diff)
download	gentoo-2-54da25da76d4eb619008f8ff67c1ef83ad2026de.tar.gz gentoo-2-54da25da76d4eb619008f8ff67c1ef83ad2026de.tar.bz2 gentoo-2-54da25da76d4eb619008f8ff67c1ef83ad2026de.zip