add missing files

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mysql@1377 6952d904-891a-0410-993b-d76249ca496b

dev-db/mysql-community/ChangeLog

@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/ChangeLog,v 1.27 2009/07/07 16:10:48 robbat2 Exp $
 
+  14 Jul 2009; Mario Fetka <mario.fetka@gmail.com> +files/my.cnf-4.1:
+  add missing files
+
   14 Jul 2009; Mario Fetka <mario.fetka@gmail.com>
   mysql-community-5.1.36.ebuild:
   readd soliddb support

dev-db/mysql-community/Manifest

@@ -1,6 +1,7 @@
+AUX my.cnf-4.1 4245 RMD160 5783022319074444a50d11b4a023e3226c1937f0 SHA1 8ceac9259f63cb56c376f8ef563183b8f0812f52 SHA256 9ad20532a6b8cae01af353207c6132e2f9055d500f26080a3f620337654963d0
 DIST mysql-5.1.36.tar.gz 36010524 RMD160 cf945d809876202fcc28811c3915a5aa8832bb9b SHA1 5603b078e89f382327db6b5b956021d0498cad58 SHA256 38ab56ab593090dc3d708edc42c1e4f61b2ee6ed42b5af1ae3072f7986273a75
 DIST pbxt-1.0.08-rc.tar.gz 3134898 RMD160 5efb700d53a64c7081121c7d29db67e08f593c30 SHA1 4012233d65498c5598598e12efc013a1d41220ed SHA256 0344be37d57bfb1f245384b10449012d47cf200764155135b0145bed91330b7f
 DIST solidmysql-5.1.22-beta-0080.tar.gz 2954796 RMD160 e040e9064debb406b9bf19b75579f8158e748d8d SHA1 e387fe3b13c34e5f65c22032f89b22cf682cbd3a SHA256 b8445d77f469815087396674681dc848fb9868252ae354c892d4acf22d2967b1
 EBUILD mysql-community-5.1.36.ebuild 2479 RMD160 13ab89bd7bb71befb6ae1eb66691e60bdf0fef51 SHA1 1f6201efeeb8c41e3f4047b6c3698419448c0348 SHA256 dd84e5a1da345688f4910ee61d84c90d82d2cfd81d9dbecf25934e0ea23b9e85
-MISC ChangeLog 6803 RMD160 ccca4b1cd2caceec5aed7c5838e41332028d820b SHA1 caefcf31b2c2b90195f7f799ed601b37201acb68 SHA256 b193b9e6d201aeab9f2710cff01bfc61c774ececc65e2a12cb7b16cf2a98411b
+MISC ChangeLog 6894 RMD160 1a502b10c764ac8d5a94fb9c7d390effc3254364 SHA1 530c58723486618cf2debb8328a7a128db071558 SHA256 c4e4ea97e7eebb5fb192062e05baf179a264ac35c1b0b39b283212a5613d65a5
 MISC metadata.xml 922 RMD160 b90fe8d96ddd7c5af7d986ef190f0317b504ae09 SHA1 0c6b72314c7694e66486215c689819a6b4dd6a52 SHA256 1447bd98b6379c56bed585e7a29333c40f7c26dd338b4bcc2e2538beabf1a368

dev-db/mysql-community/files/my.cnf-4.1

@@ -0,0 +1,147 @@
+# /etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/files/my.cnf-4.1,v 1.2 2008/11/14 03:34:01 robbat2 Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= /var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=/usr/share/mysql/charsets
+
+[myisampack]
+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
+[mysqld]
+character-set-server		= utf8
+default-character-set		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= /var/run/mysqld/mysqld.sock
+pid-file 					= /var/run/mysqld/mysqld.pid
+log-error 					= /var/log/mysql/mysqld.err
+basedir 					= /usr
+datadir 					= @DATADIR@
+skip-locking
+key_buffer 					= 16M
+max_allowed_packet 			= 1M
+table_cache 				= 64
+sort_buffer_size 			= 512K
+net_buffer_length 			= 8K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+language 					= /usr/share/mysql/english
+
+# 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
+tmpdir 						= /tmp/
+#log-update 				= /path-to-dedicated-directory/hostname
+
+# 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 happening in your server ;)
+
+#log						= /tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# uncomment the following directives if you are using BDB tables
+#bdb_cache_size				= 4M
+#bdb_max_lock				= 10000
+
+# 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
+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
+# 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)
+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_file_per_table
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[mysqlhotcopy]
+interactive-timeout

eclass/mysql.eclass

@@ -100,6 +100,10 @@ mysql_version_is_at_least "5.1.12" \
 && SRC_URI="${SRC_URI} http://www.primebase.org/download/pbxt-${PBXT_VERSION}.tar.gz
 				mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz"
 
+mysql_version_is_at_least "5.1.22" \
+&& [[ -n "${SOLIDDB_VERSION}" ]] \
+&& SRC_URI="${SRC_URI} mirror://sourceforge/soliddb/solidmysql-${SOLIDDB_VERSION}.tar.gz"
+
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
 HOMEPAGE="http://www.mysql.com/"
 LICENSE="GPL-2"
@@ -124,6 +128,9 @@ mysql_version_is_at_least "5.1" \
 mysql_version_is_at_least "5.1.12" \
 && IUSE="${IUSE} pbxt"
 
+mysql_version_is_at_least "5.1.22" \
+&& IUSE="${IUSE} soliddb"
+
 mysql_version_is_at_least "5.1.30" \
 && IUSE="${IUSE} -static_mysqld -fast-mutexes"
 
@@ -409,6 +416,11 @@ configure_51() {
 		[[ ! -d storage/pbxt ]] && eerror "use pbxt but no Primebase plugin"
 	fi
 
+	if use soliddb ; then
+		[[ -d storage/soliddb ]] && plugins="${plugins},soliddb"
+		[[ ! -d storage/soliddb ]] && eerror "use soliddb but no Solid DB plugin"
+	fi
+
 	if use mariadb ; then
 		[[ -d storage/maria ]] && plugins="${plugins},maria"
 		[[ ! -d storage/maria ]] && eerror "use mariadb but no Maria DB plugin"
@@ -480,6 +492,13 @@ mysql_src_unpack() {
 		fi
 	fi
 
+	if mysql_version_is_at_least "5.1.22" ; then
+		if [ -n "${SOLIDDB_VERSION}" ]; then
+			mv -f "${WORKDIR}/solidmysql-${SOLIDDB_VERSION}/soliddb" "${S}/storage/soliddb"
+			mv -f "${WORKDIR}/solidmysql-${SOLIDDB_VERSION}/docs" "${S}/storage/soliddb/docs"
+		fi
+	fi
+
 	cd "${S}"
 
 	# Apply the patches for this MySQL version