diff options
Diffstat (limited to 'dev-db/mariadb')
-rw-r--r-- | dev-db/mariadb/ChangeLog | 48 | ||||
-rw-r--r-- | dev-db/mariadb/Manifest | 5 | ||||
-rw-r--r-- | dev-db/mariadb/files/my.cnf-5.1 | 146 | ||||
-rw-r--r-- | dev-db/mariadb/mariadb-5.1.51.ebuild | 225 |
4 files changed, 0 insertions, 424 deletions
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog deleted file mode 100644 index 685bff7..0000000 --- a/dev-db/mariadb/ChangeLog +++ /dev/null @@ -1,48 +0,0 @@ -# ChangeLog for dev-db/mariadb -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.9 2010/10/07 19:05:47 robbat2 Exp $ - - 07 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.50.ebuild: - We need a newer libtool now, bug #339717 comment #3. - -*mariadb-5.1.50 (06 Oct 2010) - - 06 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> +mariadb-5.1.50.ebuild: - Version bump. Amarok use of embedded libmysqld.so is supported again. - - 01 Apr 2010; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.42.ebuild, - mariadb-5.1.42-r1.ebuild: - Followup on bug #284946, #293801, #310615, #307251: In 5.0.87, the mutex - locking code was changed a lot again, so that while 5.0.84 required a - newer GCC due to the HAVE_ATOMIC_BUILTINS error, newer releases do NOT - need those GCC versions anymore. This also frees up ~hppa to do more - stabilization. - -*mariadb-5.1.42-r1 (24 Mar 2010) - - 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> files/my.cnf-5.1, - +mariadb-5.1.42-r1.ebuild: - Missed copying back last version of the new my.cnf from my personal - overlay, and caused bug #311151. - - 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.42.ebuild: - Bug #310131: fix lineendings in mariadb specific patch that broke compile - on some systems. - - 24 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +files/my.cnf-5.1: - Just add new config files that gets rid of some deprecated warnings, so - the eclass does not break anything. - - 22 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> mariadb-5.1.42.ebuild: - Bug #224751: Fix false positive fail of the profiling tests. - - 16 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> Manifest: - Fix Manifest. - -*mariadb-5.1.42 (15 Mar 2010) - - 15 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +files/my.cnf-4.1, - +mariadb-5.1.42.ebuild, +metadata.xml: - Add MariaDB. Bug #303130, based on the submission by Brian Evans - <grknight@scent-team.com>. - diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest deleted file mode 100644 index 24a05de..0000000 --- a/dev-db/mariadb/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX my.cnf-5.1 4201 RMD160 e8ca0bff1ccc68d6995ed2a2fab923fa6390d603 SHA1 094c10068980c63e57b9a8588a3a76044005e15e SHA256 1adcdc79da66e760bc52c71c01bf76a2ee3485096793bdfb5e22d56b9fbf6fd8 -DIST mariadb-5.1.51.tar.gz 24620563 RMD160 558181ad1ec6feb2f5f5578f96a82b1b9bd41c54 SHA1 2626a4d08cb185e1caae25da1eab7a4970056eff SHA256 65ae03f90c63ec814cad2743e167b56741be3b85a5b938514b42e213c42c02d8 -DIST mysql-extras-20101006-0004Z.tar.bz2 1251792 RMD160 ee333704688e4e9f07f5e7fb68961d3ffaff0755 SHA1 c1633295abb7f3d2ff463938f85e1bc8ed708b4f SHA256 a42c4988a25113bef5cc727fb24c994502f4d02469246ff839f8ea2a08c07bb7 -EBUILD mariadb-5.1.51.ebuild 7590 RMD160 ea7f368dfa04bde4f1b771c11de590fa3782650c SHA1 82b5b1ef07a57e0436dc99a473cba840aca4a02d SHA256 4fbd5515487e09d2ed1e5528c64f4144e0409a1d1a3bfe14aeaa5a92f927ed9d -MISC ChangeLog 1986 RMD160 f25556ce9a432a06b03f8adb6a0bb94680586e31 SHA1 8a4f8f146e6dba278202dda7748ebeea77800a8b SHA256 7ce02e672e2cd04826744d87e60c9103ff550863cfc7ddb8dccd53528815aa9e diff --git a/dev-db/mariadb/files/my.cnf-5.1 b/dev-db/mariadb/files/my.cnf-5.1 deleted file mode 100644 index 3a4b17c..0000000 --- a/dev-db/mariadb/files/my.cnf-5.1 +++ /dev/null @@ -1,146 +0,0 @@ -# /etc/mysql/my.cnf: The global mysql configuration file. -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/files/my.cnf-5.1,v 1.2 2010/03/24 18:27:39 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 -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-external-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 -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 diff --git a/dev-db/mariadb/mariadb-5.1.51.ebuild b/dev-db/mariadb/mariadb-5.1.51.ebuild deleted file mode 100644 index 2724a59..0000000 --- a/dev-db/mariadb/mariadb-5.1.51.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.51.ebuild,v 1.2 2010/10/07 19:05:47 robbat2 Exp $ - -EAPI=2 -MY_EXTRAS_VER="20101006-0004Z" - -inherit toolchain-funcs 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 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" - -# When MY_EXTRAS is bumped, the index should be revised to exclude these. -EPATCH_EXCLUDE='02040_all_embedded-library-shared-maria-5.1.50.patch' - -# Most of these are in the eclass -RDEPEND="" -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) - >=sys-devel/libtool-2.2.10" - -# Please do not add a naive src_unpack to this ebuild -# If you want to add a single patch, copy the ebuild to an overlay -# and create your own mysql-extras tarball, looking at 000_index.txt -src_prepare() { - sed -i \ - -e '/^noinst_PROGRAMS/s/basic-t//g' \ - "${S}"/unittest/mytap/t/Makefile.am - mysql_src_prepare -} - -# Official test instructions: -# USE='berkdb -cluster embedded extraengine perl ssl community' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mysql-X.X.XX.ebuild \ -# digest clean package -src_test() { - # Bug #213475 - MySQL _will_ object strenously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - emake check || die "make check failed" - if ! use "minimal" ; then - if [[ $UID -eq 0 ]]; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - cd "${S}" - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus_unit - local retstatus_ns - local retstatus_ps - local t - addpredict /this-dir-does-not-exist/t9.MYI - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - - # archive_gis really sucks a lot, but it's only relevant for the - # USE=extraengines case - case ${PV} in - 5.0.42) - mysql_disable_test "archive_gis" "Totally broken in 5.0.42" - ;; - - 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87) - [ "$(tc-endian)" == "big" ] && \ - mysql_disable_test \ - "archive_gis" \ - "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only" - ;; - esac - - # This was a slight testcase breakage when the read_only security issue - # was fixed. - case ${PV} in - 5.0.54|5.0.51*) - mysql_disable_test \ - "read_only" \ - "Broken in 5.0.51-54, output in wrong order" - ;; - esac - - # Ditto to read_only - [ "${PV}" == "5.0.51a" ] && \ - mysql_disable_test \ - "view" \ - "Broken in 5.0.51, output in wrong order" - - # x86-specific, OOM issue with some subselects on low memory servers - [ "${PV}" == "5.0.54" ] && \ - [ "${ARCH/x86}" != "${ARCH}" ] && \ - mysql_disable_test \ - "subselect" \ - "Testcase needs tuning on x86 for oom condition" - - # Broke with the YaSSL security issue that didn't affect Gentoo. - [ "${PV}" == "5.0.56" ] && \ - for t in openssl_1 rpl_openssl rpl_ssl ssl \ - ssl_8k_key ssl_compress ssl_connect ; do \ - mysql_disable_test \ - "$t" \ - "OpenSSL tests broken on 5.0.56" - done - - # New test was broken in first time - # Upstream bug 41066 - # http://bugs.mysql.com/bug.php?id=41066 - [ "${PV}" == "5.0.72" ] && \ - mysql_disable_test \ - "status2" \ - "Broken in 5.0.72, new test is broken, upstream bug #41066" - - # The entire 5.0 series has pre-generated SSL certificates, they have - # mostly expired now. ${S}/mysql-tests/std-data/*.pem - # The certs really SHOULD be generated for the tests, so that they are - # not expiring like this. We cannot do so ourselves as the tests look - # closely as the cert path data, and we do not have the CA key to regen - # ourselves. Alternatively, upstream should generate them with at least - # 50-year validity. - # - # Known expiry points: - # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09 - # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27 - # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28 - # - # mysql-test/std_data/untrusted-cacert.pem is MEANT to be - # expired/invalid. - case ${PV} in - 5.0.*|5.1.*|5.4.*|5.5.*) - for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ - ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ - mysql_disable_test \ - "$t" \ - "These OpenSSL tests break due to expired certificates" - done - ;; - esac - - # These are also failing in MySQL 5.1 for now, and are believed to be - # false positives: - # - # main.mysql_comment, main.mysql_upgrade, main.information_schema, - # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers: - # fails due to USE=-latin1 / utf8 default - # - # main.mysql_client_test: - # segfaults at random under Portage only, suspect resource limits. - # - # main.not_partition: - # Failure reason unknown at this time, must resolve before package.mask - # removal FIXME - case ${PV} in - 5.1.*|5.4.*|5.5.*) - for t in main.mysql_client_test main.mysql_comments \ - main.mysql_upgrade \ - main.information_schema \ - main.not_partition funcs_1.is_columns_mysql \ - funcs_1.is_tables_mysql funcs_1.is_triggers; do - mysql_disable_test "$t" "False positives in Gentoo" - done - ;; - esac - - # New failures in 5.1.50/5.1.51, reported by jmbsvicetto. - # These tests are picking up a 'connect-timeout' config from somewhere, - # which is not valid, and since it does not have 'loose-' in front of - # it, it's causing a failure - case ${PV} in - 5.1.5*|5.4.*|5.5.*|6*) - for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do - mysql_disable_test "$t" \ - "False positives in Gentoo: connect-timeout" - done - ;; - esac - - use profiling && use community \ - || mysql_disable_test main.profiling \ - "Profiling test needs profiling support" - - if [ "${PN}" == "mariadb" ]; then - for t in \ - parts.part_supported_sql_func_ndb \ - parts.partition_auto_increment_ndb ; do - mysql_disable_test $t "ndb not supported in mariadb" - done - fi - - # create directories because mysqladmin might make out of order - mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} - - # We run the test protocols seperately - emake test-unit - retstatus_unit=$? - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" - - emake test-ns force="--force --vardir=${S}/mysql-test/var-ns" - retstatus_ns=$? - [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - emake test-ps force="--force --vardir=${S}/mysql-test/var-ps" - retstatus_ps=$? - [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - # TODO: - # When upstream enables the pr and nr testsuites, we need those as well. - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - failures="" - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" - [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns" - [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - [[ -z "$failures" ]] || die "Test failures: $failures" - einfo "Tests successfully completed" - else - einfo "Skipping server tests due to minimal build." - fi -} |