Sync with overlay, fix security bugs.

(Portage version: 2.1_pre10-r2)

25 files changed, 806 insertions, 120 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index a38987be364e..adc7c57aca2e 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.319 2006/04/27 14:59:48 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.320 2006/05/05 19:51:39 chtekk Exp $
+
+*mysql-5.0.21 (05 May 2006)
+*mysql-4.1.19 (05 May 2006)
+*mysql-4.0.26-r1 (05 May 2006)
+
+  05 May 2006; Luca Longinotti <chtekk@gentoo.org> +files/my.cnf-4.0,
+  -files/my.cnf-4.0.14-r1, -files/mysql-4.0.15.rc6, -files/my.cnf-4.0.24-r1,
+  -files/mysql-4.0.24-r1.rc6, -files/mysql-4.0.24-r2.rc6, files/my.cnf-4.1,
+  -files/my.cnf-4.1-r1, files/logrotate.mysql, -files/logrotate-slot.mysql,
+  +files/mysql.conf.d, -files/mysql.conf.d-r1, +files/mysql.rc6,
+  -files/mysql.rc6-r3, files/mysqlmanager.conf.d, files/mysqlmanager.rc6,
+  metadata.xml, mysql-4.0.25-r2.ebuild, -mysql-4.0.26.ebuild,
+  +mysql-4.0.26-r1.ebuild, mysql-4.1.14.ebuild, mysql-4.1.14-r1.ebuild,
+  mysql-4.1.18-r61.ebuild, +mysql-4.1.19.ebuild, mysql-5.0.19-r1.ebuild,
+  +mysql-5.0.21.ebuild, mysql-5.1.7_beta.ebuild:
+  Sync with overlay, update to 4.1.19 and 5.0.21 to fix some security issues,
+  see bug #132146.
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:
   Fixing SHA256 digest, pass four
diff --git a/dev-db/mysql/files/digest-mysql-4.0.26-r1 b/dev-db/mysql/files/digest-mysql-4.0.26-r1
new file mode 100644
index 000000000000..a469109b71c1
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.0.26-r1
@@ -0,0 +1,6 @@
+MD5 4e2060a3875470e0d853391e8647a019 mysql-4.0.26.tar.gz 11144366
+RMD160 274777aa46091618c8957aa42397d3e42d5318b4 mysql-4.0.26.tar.gz 11144366
+SHA256 571186c57c576dab262df4c2f2008254e1b083d5c2c14e17956e0a904de741dd mysql-4.0.26.tar.gz 11144366
+MD5 e2a54c15ca1b5ed99850e713035331ef mysql-patchset-4.0.26-r1.tar.bz2 4738
+RMD160 870c49a5fde7818d6d893f23544ea9ed636e2100 mysql-patchset-4.0.26-r1.tar.bz2 4738
+SHA256 89b40f118c6d9c2775abefa9932c781ce1ca43664a3e748dd02ec7335d659a90 mysql-patchset-4.0.26-r1.tar.bz2 4738
diff --git a/dev-db/mysql/files/digest-mysql-4.1.14-r1 b/dev-db/mysql/files/digest-mysql-4.1.14-r1
index 6856c37b02ab..ad7f119e6ab9 100644
--- a/dev-db/mysql/files/digest-mysql-4.1.14-r1
+++ b/dev-db/mysql/files/digest-mysql-4.1.14-r1
@@ -1,6 +1,6 @@
 MD5 98ba9caea24b0a48ee06bb242ff2e37f mysql-4.1.14.tar.gz 17074439
 RMD160 43a637109ac54f30ddd2c437f81f50776a5d0b2c mysql-4.1.14.tar.gz 17074439
 SHA256 00ca84538dc5e792abbc708e0452e649ea6b13edb262ae309e4282c5ca6fc58c mysql-4.1.14.tar.gz 17074439
-MD5 af22d4b42373382b9904850ad98216af mysql-extras-20060411.tar.bz2 10415
-RMD160 89712c8e7515648d9174eb495679d77ac6130471 mysql-extras-20060411.tar.bz2 10415
-SHA256 779477de24ade1b504790d383580c78426d7473ede270d5c1f681c9c74b76ba0 mysql-extras-20060411.tar.bz2 10415
+MD5 1a195bb5751e5862ada69e0713285853 mysql-patchset-4.1.14-r1.tar.bz2 3745
+RMD160 a0a64a7961a61626a6b76033b4d30d7bd5c0e689 mysql-patchset-4.1.14-r1.tar.bz2 3745
+SHA256 cded9e8877c87cf861fbb4ee19d3e4c6fbe0a77ff2ed7c2d748cc3d7af307794 mysql-patchset-4.1.14-r1.tar.bz2 3745
diff --git a/dev-db/mysql/files/digest-mysql-4.1.18-r61 b/dev-db/mysql/files/digest-mysql-4.1.18-r61
index 8473a2e7d8e3..37af00fb0871 100644
--- a/dev-db/mysql/files/digest-mysql-4.1.18-r61
+++ b/dev-db/mysql/files/digest-mysql-4.1.18-r61
@@ -1,6 +1,6 @@
 MD5 a2db4edb3e1e3b8e0f8c2242225ea513 mysql-4.1.18.tar.gz 17172994
 RMD160 6a761803092d9e34c15a18bad7e2c1c46f2e2429 mysql-4.1.18.tar.gz 17172994
 SHA256 7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd mysql-4.1.18.tar.gz 17172994
-MD5 af22d4b42373382b9904850ad98216af mysql-extras-20060411.tar.bz2 10415
-RMD160 89712c8e7515648d9174eb495679d77ac6130471 mysql-extras-20060411.tar.bz2 10415
-SHA256 779477de24ade1b504790d383580c78426d7473ede270d5c1f681c9c74b76ba0 mysql-extras-20060411.tar.bz2 10415
+MD5 9a02a9e41e5355bf3fc715e2022747ac mysql-patchset-4.1.18-r1.tar.bz2 3751
+RMD160 4a443d12eadf6b4f87532891dcaaf1d23dfb67c1 mysql-patchset-4.1.18-r1.tar.bz2 3751
+SHA256 0d284a65e2699b10a4b5310ea423034c2a62b9a7eac70bbceaecc81d38bea963 mysql-patchset-4.1.18-r1.tar.bz2 3751
diff --git a/dev-db/mysql/files/digest-mysql-4.1.19 b/dev-db/mysql/files/digest-mysql-4.1.19
new file mode 100644
index 000000000000..b0b5a88025f6
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.1.19
@@ -0,0 +1,6 @@
+MD5 874514ef3cca9e729aaf4e0a894c5cbb mysql-4.1.19.tar.gz 17349799
+RMD160 8da54a0fa1f024237521de644af32821c6376fab mysql-4.1.19.tar.gz 17349799
+SHA256 b906d17712692f3b35242dc72e214f44b227fa31c20c53ee259715b087e6d45b mysql-4.1.19.tar.gz 17349799
+MD5 d1d289f83eae19a0256fdf05e7ebf889 mysql-patchset-4.1.19-r1.tar.bz2 3718
+RMD160 d860b1b84f9e4accd2115b218c049e248338de7a mysql-patchset-4.1.19-r1.tar.bz2 3718
+SHA256 1a8ccaa80646a3ce72d23d0d2fcc6aef31aafb50509ee67743380a63fe098c37 mysql-patchset-4.1.19-r1.tar.bz2 3718
diff --git a/dev-db/mysql/files/digest-mysql-5.0.19-r1 b/dev-db/mysql/files/digest-mysql-5.0.19-r1
index cca12503bce1..f5c4948d4e38 100644
--- a/dev-db/mysql/files/digest-mysql-5.0.19-r1
+++ b/dev-db/mysql/files/digest-mysql-5.0.19-r1
@@ -1,6 +1,6 @@
 MD5 d8a922fe657cca3b03d390e5f13d60a8 mysql-5.0.19.tar.gz 19454023
 RMD160 6d3fe75b11fd553652563f637476da8d2502c315 mysql-5.0.19.tar.gz 19454023
 SHA256 4e8faa4268b48c77a94792a637e785e87840513a316fe1b7eb8d0a5be77469a2 mysql-5.0.19.tar.gz 19454023
-MD5 af22d4b42373382b9904850ad98216af mysql-extras-20060411.tar.bz2 10415
-RMD160 89712c8e7515648d9174eb495679d77ac6130471 mysql-extras-20060411.tar.bz2 10415
-SHA256 779477de24ade1b504790d383580c78426d7473ede270d5c1f681c9c74b76ba0 mysql-extras-20060411.tar.bz2 10415
+MD5 0474a00bb39c18c53f79ed2296995f55 mysql-patchset-5.0.19-r2.tar.bz2 4183
+RMD160 e42c48f3a65e4682ccdbeef5c61e8b56046ba1d5 mysql-patchset-5.0.19-r2.tar.bz2 4183
+SHA256 9ae34912fbea938b35a07a205d5355caa4335c785886d4ae9dc71c00a5541c0d mysql-patchset-5.0.19-r2.tar.bz2 4183
diff --git a/dev-db/mysql/files/digest-mysql-5.0.21 b/dev-db/mysql/files/digest-mysql-5.0.21
new file mode 100644
index 000000000000..4c02f4e271c6
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.21
@@ -0,0 +1,6 @@
+MD5 c3165204c42e1db6fc3a95a4fd2cd22f mysql-5.0.21.tar.gz 19529703
+RMD160 4bbc85f2585c76c58ab09c74f144ee5bd701607e mysql-5.0.21.tar.gz 19529703
+SHA256 2ea4b3665438f6bfa8cbae91e32e2b6c2d5e92a9d6bc3a5ef2e4ebee1d0b5d2b mysql-5.0.21.tar.gz 19529703
+MD5 7d9e4539aeb422e7dd46d07dbc2796bb mysql-patchset-5.0.21-r2.tar.bz2 3496
+RMD160 5f117f83ad47a845c27c0ba5e050d997d2079fce mysql-patchset-5.0.21-r2.tar.bz2 3496
+SHA256 06e13505608942a48625d436890615830811df5cce84bd3bc8588754ccf0c86e mysql-patchset-5.0.21-r2.tar.bz2 3496
diff --git a/dev-db/mysql/files/digest-mysql-5.1.7_beta b/dev-db/mysql/files/digest-mysql-5.1.7_beta
index 58087ca215aa..b7fece795b66 100644
--- a/dev-db/mysql/files/digest-mysql-5.1.7_beta
+++ b/dev-db/mysql/files/digest-mysql-5.1.7_beta
@@ -1,6 +1,6 @@
 MD5 2949350c8719d49fcda5bc4fa8221348 mysql-5.1.7-beta.tar.gz 17360288
 RMD160 40638de7c8cd67560dfb4698cea52a863c8460b2 mysql-5.1.7-beta.tar.gz 17360288
 SHA256 5360cce9237dcd61a29d2f14a8545607c18945a74272570d42ef5ce27b13f8d6 mysql-5.1.7-beta.tar.gz 17360288
-MD5 a986948fcbb3dd9cd5dd8a79289f90ac mysql-extras-20060316.tar.bz2 4719
-RMD160 e4434ee53990bf9622e4a8bdedba63ecad35524e mysql-extras-20060316.tar.bz2 4719
-SHA256 9c5552d40f6ca77ad47f74dd55306ab4d318f24b3f69f2910595b5d480d661d3 mysql-extras-20060316.tar.bz2 4719
+MD5 df78e0e04b3aafe36d630494d102431e mysql-patchset-5.1.7-r1.tar.bz2 1719
+RMD160 3fe2d5295d8404ae98220a39208d210aaf1e8b48 mysql-patchset-5.1.7-r1.tar.bz2 1719
+SHA256 7fde97c1999d95a1a50632bb4f9c017fbcad96c05ec257da7847b2503d28ecfb mysql-patchset-5.1.7-r1.tar.bz2 1719
diff --git a/dev-db/mysql/files/logrotate.mysql b/dev-db/mysql/files/logrotate.mysql
index 11f9408a3ff7..dc9f222c78f2 100644
--- a/dev-db/mysql/files/logrotate.mysql
+++ b/dev-db/mysql/files/logrotate.mysql
@@ -1,6 +1,7 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/logrotate.mysql,v 1.4 2005/02/01 21:52:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/logrotate.mysql,v 1.5 2006/05/05 19:51:40 chtekk Exp $
+
 /var/log/mysql/mysql.err /var/log/mysql/mysql.log /var/log/mysql/mysqld.err {
 monthly
 create 660 mysql mysql
diff --git a/dev-db/mysql/files/my.cnf-4.0 b/dev-db/mysql/files/my.cnf-4.0
new file mode 100644
index 000000000000..80fe6630d4fb
--- /dev/null
+++ b/dev-db/mysql/files/my.cnf-4.0
@@ -0,0 +1,112 @@
+# /etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0,v 1.1 2006/05/05 19:51:40 chtekk Exp $
+#
+# This file can be simultaneously placed in three places:
+# 1. /etc/mysql/my.cnf to set global options.
+# 2. /var/lib/mysql/my.cnf to set server-specific options.
+# 3. ~/.my.cnf to set user-specific options.
+#
+# One can use all long options that the program supports.
+# Run the program with --help to get a list of them.
+#
+# The following values assume you have at least 64M RAM!
+
+[client]
+#password	= my_password
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+[safe_mysqld]
+err-log		= /var/log/mysql/mysql.err
+
+[mysqld]
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+log-error	= /var/log/mysql/mysqld.err
+# If set, mysql logs all queries (general query log). This will be deprecated in
+# MySQL 5.0. This logs all queries, even error queries and is slow.
+# log          = /var/log/mysql/mysql.log
+#
+# If you really need logging, you'd rather use binary logging. Especially when doing
+# replication. Read file:/usr/share/doc/mysql-*/manual.html.gz#Replication for info.
+# You can use PURGE MASTER LOGS TO '$hostname-bin.010' to get rid of old logs
+# from $hostname-bin.01 up to $hostname-bin.09 while the slave server is
+# running.
+# Before doing that, check which logfile slave curently uses by running
+# mysql> SHOW SLAVE STATUS
+# To list logfiles on master do:
+# mysql> SHOW MASTER LOGS
+# Then use PURGE for those not needed anymore only! Never remove the files
+# manually!
+#
+# Also consult RESET MASTER and RESET SLAVE commands before doing any changes
+# mysql> RESET MASTER - Deletes all binary logs listed in the index
+#                       file, resetting the binlog index file to be empty.
+# mysql> RESET SLAVE - Makes the slave forget its replication position in
+#                      the master logs.
+# mysql> SET SQL_LOG_BIN=0  - this turns off logging (execute on MASTER only)
+# mysql> SET SQL_LOG_BIN=1  - this turns on logging (execute on MASTER only)
+#
+# log-bin
+# set-variable  = binlog-do-db=non_existant
+# set-variable  = binlog-ignore-db=database_name
+#
+# server-id has to unique for each master or slave in your network,
+# lets use the last number from IP address
+# server-id	= 207
+basedir		= /usr
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+language	= /usr/share/mysql/english
+skip-locking
+set-variable	= key_buffer=16M
+set-variable	= max_allowed_packet=1M
+set-variable	= thread_stack=128K
+# be secure by default!
+bind-address    = 127.0.0.1
+port			= 3306
+# this can make it even more secure:
+#skip-networking
+#
+# the following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+set-variable = innodb_buffer_pool_size=32M
+# this is the default, increase it if you have lots of tables
+set-variable = innodb_additional_mem_pool_size=1M
+#
+# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under /var/lib/mysql/, so that's the route
+# we have to take for the moment
+innodb_data_home_dir = /var/lib/mysql/
+innodb_log_arch_dir = /var/lib/mysql/
+innodb_log_group_home_dir = /var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+set-variable = innodb_log_file_size=8M
+# this is the default, increase it if you have very large transactions going on
+set-variable = innodb_log_buffer_size=1M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+set-variable = innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+
+[mysqldump]
+quick
+set-variable	= max_allowed_packet=16M
+
+[mysql]
+#no-auto-rehash	# faster start of mysql but no tab completion
+
+[isamchk]
+set-variable	= key_buffer=16M
diff --git a/dev-db/mysql/files/my.cnf-4.1 b/dev-db/mysql/files/my.cnf-4.1
index 39f0d3a32378..98ba864d961e 100644
--- a/dev-db/mysql/files/my.cnf-4.1
+++ b/dev-db/mysql/files/my.cnf-4.1
@@ -1,5 +1,5 @@
 # /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1,v 1.2 2005/07/26 17:14:23 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1,v 1.3 2006/05/05 19:51:40 chtekk Exp $
 
 # The following options will be passed to all MySQL clients
 [client]
@@ -8,40 +8,40 @@ port						= 3306
 socket						= /var/run/mysqld/mysqld.sock
 
 [mysql]
-character-sets-dir=utf8
+character-sets-dir=/usr/share/mysql/charsets
 default-character-set=utf8
 
 [mysqladmin]
-character-sets-dir=utf8
+character-sets-dir=/usr/share/mysql/charsets
 default-character-set=utf8
 
 [mysqlcheck]
-character-sets-dir=utf8
+character-sets-dir=/usr/share/mysql/charsets
 default-character-set=utf8
 
 [mysqldump]
-character-sets-dir=utf8
+character-sets-dir=/usr/share/mysql/charsets
 default-character-set=utf8
 
 [mysqlimport]
-character-sets-dir=utf8
+character-sets-dir=/usr/share/mysql/charsets
 default-character-set=utf8
 
 [mysqlshow]
-character-sets-dir=utf8
+character-sets-dir=/usr/share/mysql/charsets
 default-character-set=utf8
 
 [myisamchk]
-character-sets-dir=utf8
+character-sets-dir=/usr/share/mysql/charsets
 
 [myisampack]
-character-sets-dir=utf8
+character-sets-dir=/usr/share/mysql/charsets
 
 # use [safe_mysqld] with mysql-3
 [mysqld_safe]
 err-log						= /var/log/mysql/mysql.err
 
-# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations.
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
 [mysqld]
 character-set-server		= utf8
 default-character-set		= utf8
@@ -51,9 +51,8 @@ socket 						= /var/run/mysqld/mysqld.sock
 pid-file 					= /var/run/mysqld/mysqld.pid
 log-error 					= /var/log/mysql/mysqld.err
 basedir 					= /usr
-datadir 					= /var/lib/mysql
+datadir 					= @DATADIR@
 skip-locking
-#skip-innodb
 key_buffer 					= 16M
 max_allowed_packet 			= 1M
 table_cache 				= 64
@@ -64,43 +63,43 @@ read_rnd_buffer_size 		= 512K
 myisam_sort_buffer_size 	= 8M
 language 					= /usr/share/mysql/english
 
-#security:
-#using "localhost" in connects use sockets by default
-#skip-networking
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
 bind-address				= 127.0.0.1
 
 log-bin
 server-id 					= 1
 
-# Point the following paths to different dedicated disks
+# point the following paths to different dedicated disks
 tmpdir 						= /tmp/
 #log-update 				= /path-to-dedicated-directory/hostname
 
-# you need debug use flag enabled to use this ones.
-# if needed uncomment them, start the server and issue 
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue 
 # #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
-# this will show you *exactly* what's appening in your server ;)
+# this will show you *exactly* what's happening in your server ;)
 
 #log						= /tmp/mysqld.sql
 #gdb
 #debug						= d:t:i:o,/tmp/mysqld.trace
 #one-thread
 
-# Uncomment the following if you are using BDB tables
+# uncomment the following directives if you are using BDB tables
 #bdb_cache_size				= 4M
 #bdb_max_lock				= 10000
 
-# The following is the InnoDB configuration
+# the following is the InnoDB configuration
 # if you wish to disable innodb instead
 # uncomment just the next line
 #skip-innodb
 #
 # the rest of the innodb config follows:
-# don't eat too much memory, we're trying to be safe on 64Mb boxes.
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
 # you might want to bump this up a bit on boxes with more RAM
-innodb_buffer_pool_size		= 16M
-# this is the default, increase if you have lots of tables
-innodb_additional_mem_pool_size	= 2M
+innodb_buffer_pool_size = 16M
+# this is the default, increase it if you have lots of tables
+innodb_additional_mem_pool_size = 2M
 #
 # i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
 # and upstream wants things to be under /var/lib/mysql/, so that's the route
@@ -110,26 +109,25 @@ innodb_additional_mem_pool_size	= 2M
 #innodb_log_group_home_dir	= /var/lib/mysql/
 # you may wish to change this size to be more suitable for your system
 # the max is there to avoid run-away growth on your machine
-innodb_data_file_path		= ibdata1:10M:autoextend
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
 # we keep this at around 25% of of innodb_buffer_pool_size
 # sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
-innodb_log_file_size		= 5M
-# this is the default, increase if you have very large transactions.
-innodb_log_buffer_size		= 8M
-# this is the default, and won't hurt you.
-# you shouldn't need to tweak it.
-set-variable				= innodb_log_files_in_group=2
+innodb_log_file_size = 5M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+set-variable = innodb_log_files_in_group=2
 # see the innodb config docs, the other options are not always safe
-innodb_flush_log_at_trx_commit	= 1
-innodb_lock_wait_timeout	= 50
-
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
 
 [mysqldump]
 quick
 max_allowed_packet 			= 16M
 
 [mysql]
-# Remove the next comment character if you are not familiar with SQL
+# uncomment the next directive if you are not familiar with SQL
 #safe-updates
 
 [isamchk]
@@ -146,7 +144,3 @@ write_buffer 				= 2M
 
 [mysqlhotcopy]
 interactive-timeout
-
-#vim: set tabstop=4 :
-#vim: set shiftwidth=4 :
-
diff --git a/dev-db/mysql/files/mysql.conf.d b/dev-db/mysql/files/mysql.conf.d
new file mode 100644
index 000000000000..15ff170cc98a
--- /dev/null
+++ b/dev-db/mysql/files/mysql.conf.d
@@ -0,0 +1,80 @@
+#  Here is where we define which server(s) to start.
+#  Additional parameters to be passed to mysqld at startup may be added here,
+#  which 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
+#  directly!
+#  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 15
+#                 : 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.
+#                 : Looses any meaning if skip-networking is set.
+# ----------------+-----------------------------------------------------------
+# skip-networking : NULL
+#                 : Don't allow connection through 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, accepts 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
+#
+
+# The parameters are passed in a bash array variable,
+# the variable name is mysql_slot_0_[server-num]
+# "server-num" is an optional number used to start multiple servers
+#
+# Examples:
+#
+# start a default server with default options:
+#mysql_slot_0=()
+#
+# start MySQL reniced, overriding some start parameters
+#mysql_slot_0=(
+#   "nice=-5"
+#   "server-id=123"
+#   "log-bin="myhost"
+#   "port=3307"
+#)
+#
+# start another server, different my.cnf
+#mysql_slot_0_1=(
+#   "mycnf=/home/test/my.cnf"
+#   "server-id=124"
+#)
+#
diff --git a/dev-db/mysql/files/mysql.rc6 b/dev-db/mysql/files/mysql.rc6
new file mode 100644
index 000000000000..f49ca3998df1
--- /dev/null
+++ b/dev-db/mysql/files/mysql.rc6
@@ -0,0 +1,355 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.rc6,v 1.3 2006/05/05 19:51:40 chtekk Exp $
+
+# external binaries used: which, sed, tac
+
+# int in_list(char * elem, char * list)
+function in_list() {
+	local elem=${1:-"none"}
+	local list=${2:-","}
+
+	[[ "${list}" == "${list/,${elem},/}" ]] \
+	&& return 1 \
+	|| return 0
+}
+
+function wdebug() {
+	if [[ "${DEBUG}" -ge "${1}" ]] ; then
+		shift
+		echo "dbg:  ${@}"
+	fi
+}
+
+depend() {
+	use dns net localmount netmount nfsmount
+}
+
+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() {
+	wdebug 4 ">>> get_slot_config()"
+
+	local srv srv_slot srv_num
+	srv_slot="${1:-"0"}"
+	srv_num="${2}"
+	MY_SUFFIX="-${srv_slot}"
+	# srv=array(0 => [srv_slot], 1 => [srv_num] )
+	srv=( ${srv_slot} ${srv_num} )
+
+	local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]"
+	local conf_d_parameters="${!tmp_eval}"
+	if [[ "${srv_slot}" == "0" ]] ; then
+		MY_SUFFIX=''
+		# try some other default for the default server
+		[[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=${mysql_slot[@]}
+	fi
+	[[ -z "${conf_d_parameters[@]}" ]] && conf_d_parameters=( )
+	basedir="" datadir="" pidfile="" socket=""
+	CHROOT="" NICE="" STARTUPTIMEOUT=5 STOPTIMEOUT=120
+
+	wdebug 3 "srv                ${srv[@]}"
+	wdebug 3 "srv_slot           ${srv_slot}"
+	wdebug 3 "srv_num            ${srv_num}"
+	wdebug 3 "tmp_eval           ${tmp_eval}"
+	wdebug 3 "conf_d_parameters  ${conf_d_parameters[@]}"
+	wdebug 3 "MY_SUFFIX          ${MY_SUFFIX}"
+
+	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 overriden
+				collations="$( do_escape "${my_default}" ) ${collations}"
+				;;
+		esac
+	done
+
+	# some parameters
+	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}"
+
+	wdebug 3 "chroot dir => ${CHROOT}"
+	wdebug 3 "niceness   => ${NICE}"
+	wdebug 3 "basedir    => ${basedir}"
+	wdebug 3 "datadir    => ${datadir}"
+	wdebug 3 "pidfile    => ${pidfile}"
+	wdebug 3 "socket     => ${socket}"
+	wdebug 3 "Unamanged  => ${unmanagedparams}"
+
+	# extension for sleep tenth of seconds, not very portable so check it before
+	if sleep 0.01 ; then
+		STARTUPTIMEOUT=$(( STARTUPTIMEOUT * 10 ))
+		STOPTIMEOUT=$(( STOPTIMEOUT * 10 ))
+		TIMEUNIT=0.1
+	else
+		TIMEUNIT=1
+	fi
+
+	# push these out to the script
+	export MY_SUFFIX NICE MY_CNF pidfile datadir basedir socket CHROOT
+	export unmanagedparams STARTUPTIMEOUT STOPTIMEOUT TIMEUNIT
+	wdebug 4 "<<< get_slot_config() ok"
+	return 0
+}
+
+checkconfig() {
+	wdebug 4 ">>> checkconfig(\"${1}\")"
+	local datadir="${1}" pidfile="${2}" socket="${3}"
+
+	if [[ -n "${NOCHECK}" ]] ; then
+		rm -f "${pidfile}" "${socket}"
+		return 0
+	fi
+
+	if [[ ! -d "${datadir}" ]] ; then
+		eerror "MySQL datadir is empty or invalid"
+		eerror "Please check your my.cnf : ${MY_CNF}"
+		wdebug 4 "<<< 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..."
+		wdebug 4 "<<< checkconfig() KO"
+		return 1
+	fi
+
+	if [[ -f "${pidfile}" ]] ; then
+		kill -15 $(< ${pidfile}) 2>/dev/null
+		if [[ $? -eq 0 ]] ; then
+			# the process exist, we have a problem
+			eerror "\"${pidfile}\" is still present and the process is running."
+			eerror "Please stop it \"kill $(< ${pidfile})\" maybe ?"
+			wdebug 4 "<<< checkconfig() KO"
+			return 1
+		else
+			rm -f "${pidfile}"
+		fi
+	fi
+
+	if [[ -S "${socket}" ]] ; then
+		ewarn "Strange, the socket file already exist in \"${socket}\""
+		ewarn "it will be removed now and re-created by the MySQL server"
+		ewarn "BUT please make your checks."
+		rm -f "${socket}"
+	fi
+
+	wdebug 4 "<<< checkconfig() ok"
+	return 0
+}
+
+start() {
+	wdebug 4 ">>> 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=','
+	local ssd_thing=1
+	local mysqld_thing tmpnice
+
+	ebegin
+	# try to start each server
+	for srv in ${serverlist[*]} ; do
+
+		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
+
+		# checks
+		if ! checkconfig "${datadir}" "${pidfile}" "${socket}" ; then
+			retstatus=2 ; continue
+		fi
+		if in_list "${pidfile}" "${pidfilelist}" ; then
+			eerror "Sorry, won't start with same pid-file: ${pidfile}"
+			retstatus=3 ; continue
+		fi
+		if in_list "${datadir}" "${datadirlist}" ; then
+			eerror "Sorry, won't start with same datadir: ${datadir}"
+			retstatus=4 ; continue
+		fi
+		if in_list "${socket}" "${socketlist}" ; then
+			eerror "Sorry, won't start with same socket: ${socket}"
+			retstatus=5 ; continue
+		fi
+
+		einfo "Starting ${myservice} (${MY_CNF})"
+
+		mysqld_thing="${MY_CNF:+"--defaults-file="}${MY_CNF}"
+		mysqld_thing="${mysqld_thing} ${unmanagedparams}"
+		mysqld_thing="${mysqld_thing} --basedir=${basedir}"
+		mysqld_thing="${mysqld_thing} --datadir=${datadir}"
+		mysqld_thing="${mysqld_thing} --pid-file=${pidfile}"
+		mysqld_thing="${mysqld_thing} --socket=${socket}"
+
+		wdebug 2 "starting mysqld with: ${mysqld_thing}"
+
+		if [[ ${ssd_thing} -eq 1 ]] ; then
+			tmpnice="${NICE:+"--nicelevel "}${NICE}"
+			start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --start \
+			--background ${tmpnice} \
+			--exec ${basedir}/sbin/mysqld${MY_SUFFIX} -- ${mysqld_thing}
+			retstatus=$?
+		else
+			tmpnice="${NICE:+"nice -n "}${NICE}"
+			${tmpnice} ${basedir}/sbin/mysqld${MY_SUFFIX} ${mysqld_thing} &
+			retstatus=0
+		fi
+
+		# only the first run is done by start-stop-daemon
+		ssd_thing=""
+
+		# wait for socket creation
+		wdebug 1
+		while ! [[ -S "${socket}" || "${STARTUPTIMEOUT}" -lt 1 || "${retstatus}" -ne 0 ]] ; do
+			STARTUPTIMEOUT=$(( STARTUPTIMEOUT - 1 ))
+			[[ ${DEBUG} -ge 1 ]] && echo -n "${STARTUPTIMEOUT},"
+			sleep ${TIMEUNIT}
+		done
+		wdebug 1 ""
+		if [[ ! -S "${socket}" ]] ; then
+			eerror "MySQL${MY_SUFFIX} NOT started (${retstatus})"
+			retstatus=1
+		else
+			globretstatus=0
+			pidfilelist="${pidfilelist}${pidfile},"
+			datadirlist="${datadirlist}${datadir},"
+			socketlist="${socketlist}${socket},"
+			echo "${srv_slot}${srv_num:+"_"}${srv_num}=${pidfile}" >> "${MYSQL_GLOB_PID_FILE}"
+		fi
+	done
+	# successfull if at least one mysqld started
+	wdebug 4 "<<< start()"
+	eend $globretstatus
+}
+
+stop() {
+	get_slot_config &> /dev/null
+	MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-mysqld"}
+	local runwhat pidfile shutdown_elem
+	local PID cnt timeout=${STOPTIMEOUT:-"120"}
+	local retstatus=0
+	local shutdown_list="$(< "${MYSQL_GLOB_PID_FILE}" )"
+
+	ebegin "Stopping ${myservice}"
+	for shutdown_elem in ${shutdown_list} ; do
+		runwhat=${shutdown_elem%%=*}
+		pidfile=${shutdown_elem#*=}
+		timeout=${STOPTIMEOUT:-"120"}
+		PID=$(< "${pidfile}" )
+		wdebug 3 "runwhat            ${runwhat}"
+		wdebug 3 "pidfile            ${pidfile}"
+		wdebug 3 "timeout            ${timeout}"
+		wdebug 3 "PID                ${PID}"
+
+		einfo "Stopping mysqld (${runwhat})"
+
+		start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --stop --pidfile "${pidfile}" &
+		wdebug 1 ""
+		while [[ -n "$PID" ]] \
+			&& $( ps -Ao pid | grep -q "^ *$PID$" ) \
+			&& [[ "${timeout}" -ge 1 ]]
+		do
+			timeout=$(($timeout - 1))
+			[[ ${DEBUG} -ge 1 ]] && echo -n "$(( $STOPTIMEOUT - $timeout )),"
+			sleep ${TIMEUNIT}
+		done
+		[[ "${timeout}" -lt 1 ]] && retstatus=1
+	done
+	sleep ${TIMEUNIT}
+	[[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE"
+	eend ${retstatus}
+}
diff --git a/dev-db/mysql/files/mysqlmanager.conf.d b/dev-db/mysql/files/mysqlmanager.conf.d
index a36241ad4c01..8666f71596cc 100644
--- a/dev-db/mysql/files/mysqlmanager.conf.d
+++ b/dev-db/mysql/files/mysqlmanager.conf.d
@@ -1,13 +1,13 @@
-#  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".
+#  Here is where we define which server(s) to start.
+#  Additional parameters to be passed to mysqlmanager at startup may be added here,
+#  which 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
+#  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
+#  Below are described some suggested parameters to use.
+#  The parameters not recognized will be passed through to the mysqlmanager directly.
 #
 #  Parameter      : description
 
@@ -17,12 +17,12 @@
 #                 : may contain a [manager] section
 # ----------------+-----------------------------------------------------------
 #
-# easy default
+# Basic default
 #
 #mysqlmanager_slot_0=()
 #
-# start MySQL 7.5.x reniced, chrooted and overriding some start parameters
-#mysqlmanager_slot_705=(
+# Start MySQL 5.0.X overriding the my.cnf path
+#mysqlmanager_slot_500=(
 #	"mycnf=/home/test/my.cnf"
 #)
 #
diff --git a/dev-db/mysql/files/mysqlmanager.rc6 b/dev-db/mysql/files/mysqlmanager.rc6
index 5dc58f4bfc90..989cf75dcc2c 100644
--- a/dev-db/mysql/files/mysqlmanager.rc6
+++ b/dev-db/mysql/files/mysqlmanager.rc6
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager.rc6,v 1.1 2006/03/16 20:39:44 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysqlmanager.rc6,v 1.2 2006/05/05 19:51:40 chtekk Exp $
 
-# external binaryes used: which, sed, tac
+# external binaries used: which, sed, tac
 
 depend() {
 	use dns net localmount netmount nfsmount
@@ -16,8 +16,8 @@ function in_list() {
 	local list=${2:-","}
 
 	[[ "${list}" == "${list/,${elem},/}" ]] \
-		&& return 1 \
-		|| return 0
+	&& return 1 \
+	|| return 0
 }
 
 do_escape() {
@@ -43,11 +43,11 @@ get_slot_config() {
 
 	MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf"
 	# summa of unmanaged parameters
-	#>some parameters may be present multiple times
+	# some parameters may be present multiple times
 	unmanagedparams=""
 
 	# grab the parameters from conf.d/mysql definition
-	for my_default in ${conf_d_parameters[*]}; do
+	for my_default in ${conf_d_parameters[*]} ; do
 		case "${my_default}" in
 			mycnf=*) MY_CNF="${my_default#mycnf=}" ;;
 			basedir=*) basedir="${my_default#basedir=}" ;;
@@ -64,26 +64,26 @@ get_slot_config() {
 		esac
 	done
 
-	if [[ ! -r "${MY_CNF}" ]]; then
+	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
+		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 )
+			--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
+	# conf.d/mysql
+	for my_default in ${my_defaults} ; do
 		case "${my_default}" in
 			--pid-file=*)
 				[[ -z "${pidfile}" ]] && pidfile="${my_default#--pid-file=}" ;;
@@ -92,7 +92,7 @@ get_slot_config() {
 		esac
 	done
 
-	# still empty, I'm in doubt if assign a default or break, will see
+	# some parameters
 	basedir="${basedir:-"/usr"}"
 	pidfile="${pidfile:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.pid"}"
 	socket="${socket:-"/var/run/mysqld/mysqlmanager${MY_SUFFIX}.sock"}"
@@ -151,7 +151,7 @@ start() {
 		retstatus=0
 		get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1
 
-		# timeout (seconds) before declare failed the startup
+		# timeout (seconds) before declaring the startup failed
 
 		# pre_run checks
 		if [[ "$retstatus" -eq 0 ]] ; then
@@ -205,7 +205,7 @@ stop () {
 
 	# shutdown in reverse order
 	ebegin
-	for shutdown_elem in $shutdown_list; do
+	for shutdown_elem in ${shutdown_list} ; do
 		runwhat=${shutdown_elem%%=*}
 		pidfile=${shutdown_elem#*=}
 		timeout=${STOPTIMEOUT:-"10"}
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 801e6972d273..abf3529deac0 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql</herd>
-<maintainer>
-	<email>mysql-bugs@gentoo.org</email>
-	<description>MySQL herd will not have a mysql@gentoo.org email</description>
-</maintainer>
+	<herd>mysql</herd>
 </pkgmetadata>
diff --git a/dev-db/mysql/mysql-4.0.25-r2.ebuild b/dev-db/mysql/mysql-4.0.25-r2.ebuild
index d5066fe2d273..d154e7cc9177 100644
--- a/dev-db/mysql/mysql-4.0.25-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.25-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.27 2006/04/12 04:12:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.28 2006/05/05 19:51:39 chtekk Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -317,12 +317,12 @@ src_install() {
 	# config stuff
 	insinto /etc/mysql
 	doins scripts/mysqlaccess.conf
-	newins ${FILESDIR}/my.cnf-4.0.24-r1 my.cnf
+	newins "${FILESDIR}/my.cnf-4.0" my.cnf
 
 	# minimal builds don't have the server
 	if ! useq minimal; then
 		exeinto /etc/init.d
-		newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql
+		newexe "${FILESDIR}/mysql.rc6" mysql
 		insinto /etc/logrotate.d
 		newins "${FILESDIR}/logrotate.mysql" mysql
 
diff --git a/dev-db/mysql/mysql-4.0.26-r1.ebuild b/dev-db/mysql/mysql-4.0.26-r1.ebuild
new file mode 100644
index 000000000000..7b124353aa91
--- /dev/null
+++ b/dev-db/mysql/mysql-4.0.26-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.26-r1.ebuild,v 1.1 2006/05/05 19:51:40 chtekk Exp $
+
+# Leave this empty
+MYSQL_VERSION_ID=""
+# Set the patchset revision to use, must be either empty or a decimal number
+MYSQL_PATCHSET_REV="1"
+
+inherit mysql
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+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
+
+		cd mysql-test
+		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
+		./mysql-test-run
+		retstatus=$?
+
+		# Just 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
+}
diff --git a/dev-db/mysql/mysql-4.1.14-r1.ebuild b/dev-db/mysql/mysql-4.1.14-r1.ebuild
index 22e0b4cdd6da..b0f4f4c34d36 100644
--- a/dev-db/mysql/mysql-4.1.14-r1.ebuild
+++ b/dev-db/mysql/mysql-4.1.14-r1.ebuild
@@ -1,28 +1,31 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14-r1.ebuild,v 1.3 2006/04/12 04:12:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14-r1.ebuild,v 1.4 2006/05/05 19:51:39 chtekk Exp $
 
+# Leave this empty
 MYSQL_VERSION_ID=""
-MY_EXTRAS_VER=""
+# Set the patchset revision to use, must be either empty or a decimal number
+MYSQL_PATCHSET_REV="1"
 
 inherit mysql
+
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 
 src_test() {
-	cd ${S}
+	cd "${S}"
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
 	make check || die "make check failed"
-	if ! useq minimal; then
+	if ! useq "minimal" ; then
 		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
 		local retstatus
 		addpredict /this-dir-does-not-exist/t9.MYI
 
 		cd mysql-test
-		sed -i -e "s|MYSQL_TCP_PORT=3306|MYSQL_TCP_PORT=3307|" mysql-test-run
+		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
 		./mysql-test-run
 		retstatus=$?
 
-		# to be sure ;)
+		# Just 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"
@@ -30,4 +33,3 @@ src_test() {
 		einfo "Skipping server tests due to minimal build."
 	fi
 }
-
diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild
index d5f6136087d5..a5a97ab3d060 100644
--- a/dev-db/mysql/mysql-4.1.14.ebuild
+++ b/dev-db/mysql/mysql-4.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.36 2006/04/13 12:55:40 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.37 2006/05/05 19:51:39 chtekk Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -440,7 +440,7 @@ src_install() {
 	# minimal builds don't have the server
 	if ! useq minimal; then
 		exeinto /etc/init.d
-		newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql
+		newexe "${FILESDIR}/mysql.rc6" mysql
 		insinto /etc/logrotate.d
 		newins "${FILESDIR}/logrotate.mysql" mysql
 
diff --git a/dev-db/mysql/mysql-4.1.18-r61.ebuild b/dev-db/mysql/mysql-4.1.18-r61.ebuild
index 419385b0fd7b..9de9d751fcda 100644
--- a/dev-db/mysql/mysql-4.1.18-r61.ebuild
+++ b/dev-db/mysql/mysql-4.1.18-r61.ebuild
@@ -1,28 +1,31 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.18-r61.ebuild,v 1.3 2006/04/12 04:12:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.18-r61.ebuild,v 1.4 2006/05/05 19:51:39 chtekk Exp $
 
+# Leave this empty
 MYSQL_VERSION_ID=""
-MY_EXTRAS_VER=""
+# Set the patchset revision to use, must be either empty or a decimal number
+MYSQL_PATCHSET_REV="1"
 
 inherit mysql
+
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 src_test() {
-	cd ${S}
+	cd "${S}"
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
 	make check || die "make check failed"
-	if ! useq minimal; then
+	if ! useq "minimal" ; then
 		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
 		local retstatus
 		addpredict /this-dir-does-not-exist/t9.MYI
 
 		cd mysql-test
-		sed -i -e "s|MYSQL_TCP_PORT=3306|MYSQL_TCP_PORT=3307|" mysql-test-run
+		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
 		./mysql-test-run
 		retstatus=$?
 
-		# to be sure ;)
+		# Just 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"
@@ -30,4 +33,3 @@ src_test() {
 		einfo "Skipping server tests due to minimal build."
 	fi
 }
-
diff --git a/dev-db/mysql/mysql-4.1.19.ebuild b/dev-db/mysql/mysql-4.1.19.ebuild
new file mode 100644
index 000000000000..89d22ed622d7
--- /dev/null
+++ b/dev-db/mysql/mysql-4.1.19.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.19.ebuild,v 1.1 2006/05/05 19:51:40 chtekk Exp $
+
+# Leave this empty
+MYSQL_VERSION_ID=""
+# Set the patchset revision to use, must be either empty or a decimal number
+MYSQL_PATCHSET_REV="1"
+
+inherit mysql
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+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
+
+		cd mysql-test
+		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
+		./mysql-test-run
+		retstatus=$?
+
+		# Just 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
+}
diff --git a/dev-db/mysql/mysql-5.0.19-r1.ebuild b/dev-db/mysql/mysql-5.0.19-r1.ebuild
index d5ec7c76ec2e..732086dd72f1 100644
--- a/dev-db/mysql/mysql-5.0.19-r1.ebuild
+++ b/dev-db/mysql/mysql-5.0.19-r1.ebuild
@@ -1,28 +1,31 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.19-r1.ebuild,v 1.4 2006/04/22 21:20:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.19-r1.ebuild,v 1.5 2006/05/05 19:51:39 chtekk Exp $
 
+# Leave this empty
 MYSQL_VERSION_ID=""
-MY_EXTRAS_VER=""
+# Set the patchset revision to use, must be either empty or a decimal number
+MYSQL_PATCHSET_REV="2"
 
 inherit mysql
+
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 
 src_test() {
-	cd ${S}
+	cd "${S}"
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
 	make check || die "make check failed"
-	if ! useq minimal; then
+	if ! useq "minimal" ; then
 		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
 		local retstatus
 		addpredict /this-dir-does-not-exist/t9.MYI
 
 		cd mysql-test
-		sed -i -e "s|MYSQL_TCP_PORT=3306|MYSQL_TCP_PORT=3307|" mysql-test-run
+		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
 		./mysql-test-run
 		retstatus=$?
 
-		# to be sure ;)
+		# Just 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"
@@ -30,4 +33,3 @@ src_test() {
 		einfo "Skipping server tests due to minimal build."
 	fi
 }
-
diff --git a/dev-db/mysql/mysql-5.0.21.ebuild b/dev-db/mysql/mysql-5.0.21.ebuild
new file mode 100644
index 000000000000..99b255241b30
--- /dev/null
+++ b/dev-db/mysql/mysql-5.0.21.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.21.ebuild,v 1.1 2006/05/05 19:51:40 chtekk Exp $
+
+# Leave this empty
+MYSQL_VERSION_ID=""
+# Set the patchset revision to use, must be either empty or a decimal number
+MYSQL_PATCHSET_REV="2"
+
+inherit mysql
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+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
+
+		cd mysql-test
+		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
+		./mysql-test-run
+		retstatus=$?
+
+		# Just 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
+}
diff --git a/dev-db/mysql/mysql-5.1.7_beta.ebuild b/dev-db/mysql/mysql-5.1.7_beta.ebuild
index ebf783d3e01f..7fce9f8e9df9 100644
--- a/dev-db/mysql/mysql-5.1.7_beta.ebuild
+++ b/dev-db/mysql/mysql-5.1.7_beta.ebuild
@@ -1,28 +1,31 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.7_beta.ebuild,v 1.6 2006/04/12 04:12:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.7_beta.ebuild,v 1.7 2006/05/05 19:51:40 chtekk Exp $
 
-MY_EXTRAS_VER="20060316"
+# Leave this empty
 MYSQL_VERSION_ID=""
+# Set the patchset revision to use, must be either empty or a decimal number
+MYSQL_PATCHSET_REV="1"
 
 inherit mysql
+
 KEYWORDS="-*"
 
 src_test() {
-	cd ${S}
+	cd "${S}"
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
 	make check || die "make check failed"
-	if ! useq minimal; then
+	if ! useq "minimal" ; then
 		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
 		local retstatus
 		addpredict /this-dir-does-not-exist/t9.MYI
 
 		cd mysql-test
-		sed -i -e "s|MYSQL_TCP_PORT=3306|MYSQL_TCP_PORT=3307|" mysql-test-run
+		sed -i -e "s|PORT=3306|PORT=3307|g" mysql-test-run
 		./mysql-test-run
 		retstatus=$?
 
-		# to be sure ;)
+		# Just 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"
@@ -30,4 +33,3 @@ src_test() {
 		einfo "Skipping server tests due to minimal build."
 	fi
 }
-