From 9c0f7f874a71b64def2f3091739421707b733a4f Mon Sep 17 00:00:00 2001 From: geos_one Date: Fri, 4 Dec 2009 21:35:25 +0000 Subject: [PATCH] dev-db/mysql: add missing file git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mysql@1604 6952d904-891a-0410-993b-d76249ca496b --- dev-db/mysql/ChangeLog | 4 + dev-db/mysql/Manifest | 9 +- dev-db/mysql/files/my.cnf-4.1 | 146 ++++++++++++++++++ dev-db/mysql/mysql-5.1.41-r1.ebuild | 70 --------- ...l-5.1.41-r2.ebuild => mysql-5.1.41.ebuild} | 0 5 files changed, 153 insertions(+), 76 deletions(-) create mode 100644 dev-db/mysql/files/my.cnf-4.1 delete mode 100644 dev-db/mysql/mysql-5.1.41-r1.ebuild rename dev-db/mysql/{mysql-5.1.41-r2.ebuild => mysql-5.1.41.ebuild} (100%) diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 4a7aecf..c2d1714 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.488 2009/07/06 19:08:59 robbat2 Exp $ + 04 Dec 2009; Mario Fetka +files/my.cnf-4.1, + +mysql-5.1.41.ebuild, -mysql-5.1.41-r1.ebuild, -mysql-5.1.41-r2.ebuild: + add missing file + 04 Dec 2009; Mario Fetka mysql-5.1.41-r2.ebuild: correct some storage engines diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 3c6e007..30527da 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,13 +1,10 @@ +AUX my.cnf-4.1 4121 RMD160 b90a15765b2baf10b5744b93840e1247bcde72ae SHA1 51f19b7aa01346d5d9e5070d904fc812b1e31c69 SHA256 8dc740d01911f7bb7b36e0e947973ac9f83cb2f0c25884cd4946da81440f752b DIST mysql-5.1.41.tar.gz 23026814 RMD160 f99d17a2bb43fc45222c7015a3b65c6b4f686129 SHA1 04f7cf87419ca233c2508c2912d72548767b7e2c SHA256 5cb721db43a5f61710d8503813adef335cb1b738c7164e3d7d2a9681af8dbc16 DIST mysql-storage-filesystem-0.1.1-gentoo-r5.tar.gz 17561 RMD160 c29d92331fcb4204180b0b3641403b297300a8ac SHA1 222e76bda9b8e419c653a8994c5ea4fedba73f30 SHA256 8bd48bcc5e00c468d1f7a8c55d2609611f23908d0fefc8853170cf58fd6701f4 DIST mysql-storage-innodb-1.0.6-gentoo.tar.gz 1393956 RMD160 470df6e7ad2a6171961d3a95b419ba7202ceeb65 SHA1 827529dddb02f92223d0b1cbdd901c5ecff0bacb SHA256 353714f6861ad5e1cb35afd28c612e8a1c363d10840e00ce565db1ca5513335f DIST mysql-storage-pbxt-1.0.09e-rc-gentoo-r2.tar.gz 2981565 RMD160 a055887f6fd33ba94146e5bab41778890fc8a3bc SHA1 c3109a5042ec9a6d1db4806d4d31950abb39bf3c SHA256 c4da4cb439b06a3c867c0d57f48180539891069b41396cbc6def62968286e140 -DIST mysql-storage-pbxt-1.0.09e-rc-gentoo.tar.gz 3302565 RMD160 04628ae993190cc6506a29f00d5801b37c4e9690 SHA1 b48624884263df31a872b223685f1c9518815ab4 SHA256 8713d2fc82d3defa46f977f78978a2a31fe6a0fcfd1065134c817ef63d9d471e DIST mysql-storage-revision-0.2-alpha-gentoo-r1.tar.gz 49110 RMD160 2e6237de9e88f8ca1b280b926fd5b24aae54b1c1 SHA1 77d23c289d0864b0e42fbe7cfb60fceb0a7e73dd SHA256 f79fd0766d678874888386d6ccd749023763256f862a1b19a3182c2aa91bea20 -DIST mysql-storage-revision-0.2-alpha-gentoo.tar.gz 130905 RMD160 a90cfdef2bca2f36de6970184534a5f398e7582f SHA1 391ce75592e5e1c0ec390565649bc32e40c9437b SHA256 dc21661cf7a66030468c41d8c1a552873e6d90a48018abf85eda89b0173ac998 DIST mysql-storage-soliddb-0081-gentoo.tar.gz 2278377 RMD160 705c2d1460d067385319ec4f6890a1798d33a286 SHA1 a5be03fd8e80f3e650257d60024672ec76ad60c4 SHA256 8e794aab8b6bdbab103004c70beecdcef8e85ca4db10cc16fff4a7e4641bfcba -DIST mysql-storage-xtradb-1.0.4-8-gentoo.tar.gz 1405802 RMD160 f7309e893ad439cc7ea351a0851a380a0321d771 SHA1 5fa76185c638cbc961a03fb1b007dbb030e590d4 SHA256 aa6cc2617169e0045d40c9faee6fdc7dff3b4d4a08d7952abbfcbec2a7e27a7c -EBUILD mysql-5.1.41-r1.ebuild 2532 RMD160 533d67d5660970cbf8886b5155d6ed6a3ba431df SHA1 9ba48e0b071740b884e30b33d393d5a6b7ca3589 SHA256 ecc065c4bf87b3d7e45cafec9ddbd14867ee8d25894b474451747ffbcad03595 -EBUILD mysql-5.1.41-r2.ebuild 2565 RMD160 18fa9ba9d2b9eccfc4d0b66081da1cf3fae9f6eb SHA1 d2c3fb1521bfa0e274d5e7bf8b2e5475adac6bbb SHA256 465b58d087c2b8365b9d004daef9ad11960dcb4a8992a7a968b37c394d8cb5fd -MISC ChangeLog 93958 RMD160 7e549400a845be3236b2b32eec249ed90fb4c168 SHA1 a7bc00a9c2b0b3ed1da0680a118fd23b7bfbca8c SHA256 9eea7b81c44ae8e5de92007bacccc44c92f4c5ddd48866e7041445d39caf60fe +EBUILD mysql-5.1.41.ebuild 2565 RMD160 18fa9ba9d2b9eccfc4d0b66081da1cf3fae9f6eb SHA1 d2c3fb1521bfa0e274d5e7bf8b2e5475adac6bbb SHA256 465b58d087c2b8365b9d004daef9ad11960dcb4a8992a7a968b37c394d8cb5fd +MISC ChangeLog 94122 RMD160 92da565c62b108121611d3d664254a8748594685 SHA1 827a93f2235e3dec7c545afaeba85043b129ce19 SHA256 625796b133d06db7c4e126d2edf24b1a5544ea9b6dfc53e2a1f2fe4c5637c53d MISC metadata.xml 918 RMD160 ee023d3ae746d0d29ac387c1c87f3f8dec7c9568 SHA1 10ef755d319f93d02de705b3158f4e73aca28af4 SHA256 046a9880921c49fea8861a819c1afd27fc5a873dea28b80b040da2733e029c47 diff --git a/dev-db/mysql/files/my.cnf-4.1 b/dev-db/mysql/files/my.cnf-4.1 new file mode 100644 index 0000000..8b89e7c --- /dev/null +++ b/dev-db/mysql/files/my.cnf-4.1 @@ -0,0 +1,146 @@ +# /etc/mysql/my.cnf: The global mysql configuration file. +# $Header: $ + +# 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 + +[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 diff --git a/dev-db/mysql/mysql-5.1.41-r1.ebuild b/dev-db/mysql/mysql-5.1.41-r1.ebuild deleted file mode 100644 index 6156659..0000000 --- a/dev-db/mysql/mysql-5.1.41-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.1.21_beta.ebuild,v 1.3 2008/11/14 09:43:04 robbat2 Exp $ - -#MY_EXTRAS_VER="20090713-1758Z" -MY_EXTRAS_VER="live" -#SERVER_URI="mirror://gentoo/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" -MYSQL_STORAGE="pbxt-1.0.09e-rc-gentoo - revision-0.2-alpha-gentoo - soliddb-0081-gentoo - xtradb-1.0.4-8-gentoo" - -inherit mysql -# only to make repoman happy. it is really set in the eclass -IUSE="$IUSE" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" - -src_test() { - make check || die "make check failed" - if ! use "minimal" ; then - cd "${S}/mysql-test" - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus - local t - local testopts="--force" - - addpredict /this-dir-does-not-exist/t9.MYI - - # mysqladmin start before dir creation - mkdir "${S}"/mysql-test/var{,/log} - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - - # sandbox make ndbd zombie - #X#hasq "sandbox" ${FEATURES} && testopts="${testopts} --skip-ndb" - - #X#if [[ ${UID} -eq 0 ]] ; then - #X# einfo "Disabling IM tests due to failure as root" - #X# mysql_disable_test "im_cmd_line" "fail as root" - #X# mysql_disable_test "im_daemon_life_cycle" "fail as root" - #X# mysql_disable_test "im_instance_conf" "fail as root" - #X# mysql_disable_test "im_life_cycle" "fail as root" - #X# mysql_disable_test "im_options" "fail as root" - #X# mysql_disable_test "im_utils" "fail as root" - #X# mysql_disable_test "trigger" "fail as root" - #X#fi - - #use "extraengine" && mysql_disable_test "federated" "fail with extraengine" - - #mysql_disable_test "view" "Already fixed: fail because now we are in year 2007" - - # from Makefile.am: - retstatus=1 - ./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=mixed \ - && ./mysql-test-run.pl ${testopts} --mysqld=--binlog-format=row \ - && ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=row \ - && ./mysql-test-run.pl ${testopts} --ps-protocol --mysqld=--binlog-format=mixed \ - && retstatus=0 - - # 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.41-r2.ebuild b/dev-db/mysql/mysql-5.1.41.ebuild similarity index 100% rename from dev-db/mysql/mysql-5.1.41-r2.ebuild rename to dev-db/mysql/mysql-5.1.41.ebuild