diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 0862e2f..1b856f8 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2010 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 $ + 30 May 2010; Mario Fetka files/my.cnf-4.1, + +files/my.cnf-5.1, +mysql-5.1.47-r2.ebuild, -mysql-5.5.0_pre2.ebuild, + +mysql-5.5.1_alpha_pre2-r2.ebuild: + Bump package and patches + 09 Apr 2010; Mario Fetka mysql-5.1.45-r2.ebuild: Bump innodb diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 3aeafd0..b29f4e0 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,29 +1,36 @@ AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af -AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7 +AUX my.cnf-4.1 4220 RMD160 853e06a3eff4baef6410823d86bb7ee230c98b49 SHA1 4d52ff3d0d8a50a7f0f973b8d4412ac996390446 SHA256 c114718e3fa93acea55d3570f58f28a1262011ec0f2ebe9ff3c147b5a56f8142 +AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4 AUX mysql-storage.diff 554 RMD160 9afe93a5d669ced77510e0c0a102f35a597a2fb4 SHA1 a29010c4a2b240acf642ef66a1b61d99fbaebf79 SHA256 065816864a15382aa74d6907c0d187b980e703aa104408f5a244f9f1fece9237 AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 +DIST go-mysql-patches-1.tar.gz 741 RMD160 fce041cf266abb7dafe995c47fe248557a5b0490 SHA1 c3a13dd05a44b00cb7e071177c6f3cf6d2bb8136 SHA256 cff2d8403f150a7ff5f51d25a69f413731385efd339ef5da2661c84009b8686d DIST mysql-5.1.41.tar.gz 23026814 RMD160 f99d17a2bb43fc45222c7015a3b65c6b4f686129 SHA1 04f7cf87419ca233c2508c2912d72548767b7e2c SHA256 5cb721db43a5f61710d8503813adef335cb1b738c7164e3d7d2a9681af8dbc16 DIST mysql-5.1.42.tar.gz 22267547 RMD160 03be40ad07238d0b13d82b3e763f5263962e3bef SHA1 b16a787b61dfc6f57ff6fb723223598c6f529db1 SHA256 9b4fcc5137b3f6ab7107f6f84248aa8c74702be55a73470091c24b451fe79abe DIST mysql-5.1.43.tar.gz 22319586 RMD160 51aa017edc165f13f2cb696ee210505b8f2a21ee SHA1 fff98e59f17487d646998662409bc894a422b7e9 SHA256 6e417c22c0ba91ba7fea15a6c7b63b581decd446b638ea5dac896cd5de90baf3 DIST mysql-5.1.44.tar.gz 23400457 RMD160 f98d25322893b422ee708d683ee73ec9e17ad40a SHA1 265fbca02b2ef62926e2845d5fdf394298eb3206 SHA256 15dfccb34082a633a3f1793c21c7bf1432bf009a35acef0068885b7b68ecb540 DIST mysql-5.1.45.tar.gz 22457274 RMD160 2fd173ac4484ae7a742f06d8d0cdb1c807c02bba SHA1 2a34650dc1a7e056788882522211d07791e0b352 SHA256 7dc2fabbdd8ab1d2878ee749be9c56ffc9efe970f7f0f094aa94b18b3cd15a72 -DIST mysql-5.5.0-m2.tar.gz 21399110 RMD160 6472960ccb45eda240dc1a0a4068ad327cde3dde SHA1 5e547ee11841f4f5c35141ee365edc6f1e139571 SHA256 b5e2d16b7c0720d9688f4335ebcfbb3e239e5bdbb65afa0892d899b2f0ce2dd5 +DIST mysql-5.1.47.tar.gz 23817441 RMD160 ee399fe1ba393c9cd4c19ec43ccea68a6a9f43e3 SHA1 9ea8b2cfedb366b884eaeb37757de1cdbbd85b45 SHA256 b80a2d2bf3b844c4dcd63c36339228fc6787b919e62f4481dba52b07899c53d5 +DIST mysql-5.5.1-m2.tar.gz 21459964 RMD160 aa36e78efe6fdbfc020cd1599fa63dd9aa60e91b SHA1 6eb787a884523ea30b4a8b900a928a0caa159e3a SHA256 26e8d98ae2341b8ee292bc173531560011e0150da63f2d873fad191d8dbce081 DIST mysql-extras-20100201-0104Z.tar.bz2 933785 RMD160 7780fcc370d2eb8e48993aaeba480e2ec7785c14 SHA1 ce098829243327c5941a9864a9e0632ae5cee418 SHA256 d06f7d2e6920576392adf0fa544931aa6dcecf45060dac4968ea8d88e84c2f70 DIST mysql-storage-filesystem-0.1.1-gentoo-r7.tar.gz 17099 RMD160 fcc3fe5a9f6d0b4f1b0f2d36969634c7f2701ff7 SHA1 b8e846b18b6b43927d050e9f418a75ac5728e2ba SHA256 0ece3795d61d25f8a61fa62e8add858c05415c4c47acb225f221afea1d7736af DIST mysql-storage-innodb-1.0.6-gentoo-r1.tar.gz 1391223 RMD160 78655bd8ae52cda0db8b9342a3a8104fb6d3d50d SHA1 768ed5968ccfe9e68c04ec0100ee6105692b8383 SHA256 b60ef8d16e1a8e645f8d6320dfded35819c73ff0eca71e5d090104e4748db80c DIST mysql-storage-innodb-1.0.6-gentoo-r2.tar.gz 1393145 RMD160 d4655b46fc9c7e32a7af4ecc56194ff5b82caf5f SHA1 cadff27c4e185da0ebd156270f488d1a9418090a SHA256 e237fbe9b7b7a1afbc7859ce51636092cbd4ea1f2da4b4720dfae782f8fed15e DIST mysql-storage-oqgraph-0.7-gentoo-r3.tar.gz 29818 RMD160 fec2071e0999547d1e70e9edacf0d53dbdec715b SHA1 e2ba0dc9fa10535cbe59f1a93d46673e92e77807 SHA256 b83bceede18bd27138ce126aacee6bc648de05410038c4793786194cd3e38573 +DIST mysql-storage-oqgraph-0.7-gentoo-r6.tar.gz 5215783 RMD160 4fb92c2f86ce5282d9abc74a970ff54c3d12d224 SHA1 ad9e1b475484c0478f485d2e771bb9d62928a350 SHA256 85b4cb5f6d91f5431808a8f2fcefb053f56baeed861873be5c90a414c0330315 DIST mysql-storage-pbms-0.5.09-alpha-gentoo-r11.tar.gz 266117 RMD160 ec61679db409e9f9f1697adf3e6ed072976b6f4b SHA1 5d4a14918fd38ac1c9b3027ce685c240ebe3e1f6 SHA256 945e56297816b3bab81f0871d58eb06ea3fa4cf1fce8202cb45b90e66e8d1c06 DIST mysql-storage-pbms-0.5.12-beta-gentoo-r3.tar.gz 310868 RMD160 09ba4c281f0d9d6bdd11ce417bae97d4fe76f9ab SHA1 b81b65c5018997f5d17009a5306fd489d4da68db SHA256 0a18f9a8a04a46ca9fa686818a4b67b2250192293e36f14e9fcd59e5e7fb2c94 DIST mysql-storage-pbxt-1.0.09e-rc-gentoo-r3.tar.gz 2994470 RMD160 61973b8817f4187c65cd0feaa9994e6cbb691095 SHA1 0b08901fc48b9460ad07b1b41090128b9c460af3 SHA256 526290dba18b7a36df7f5bf3d654cc41e6144592963c1d94b39fec4c0a28d23f DIST mysql-storage-pbxt-1.0.10c-rc-gentoo-r1.tar.gz 2979439 RMD160 b9b7962237fce65d06c60e48f5e506ee6fe47311 SHA1 544c3b295b5bde0be432fd159d2f6cc9b913e5ee SHA256 38ee94e9b1c80ef1e4717827a02c11e1bdd03038049b219d30400564b646615c DIST mysql-storage-pbxt-1.0.10i-rc-gentoo-r1.tar.gz 2983456 RMD160 1f07d1e55bde6f5e10e449cba3fcef128340331c SHA1 4501506dc41078f100cf6734580899cbb8815723 SHA256 959e2baa379b186fba3ff0ffe210d618c1bf140dd0ead34e134f2d917b6de1ca +DIST mysql-storage-pbxt-1.0.11-2-pre-ga-gentoo-r1.tar.gz 3004825 RMD160 dcfef25bd45548fa83d355be2bc81b72e9a7b630 SHA1 01338667eb22d5477e9b68d0d0f08e5ef73566e1 SHA256 c9b3f57fa882c6915032881ee11b5e8939c6f8d11ebaae2b08a593d89c3d805d DIST mysql-storage-revision-0.2-alpha-gentoo-r5.tar.gz 49492 RMD160 3703f8a572b1a191d39c361b1783799c43b7c351 SHA1 9232b1ebecbd4d52a41e275e4c07a58862f0f37c SHA256 4bee9556c9e6737bd1d3578b20582f1c838982fc6491a5edcf140ee491f07e7a DIST mysql-storage-soliddb-0081-gentoo-r2.tar.gz 2398914 RMD160 f46e3d7253990a4fb8341f6c99a7e275151ef96f SHA1 123ef79fc4fb4c759b064adc5ba9875a657c39ec SHA256 a79d0673379fae784a8e8edf7fe192b959b7061b04419959b7fbed8439307c03 DIST mysql-storage-soliddb-0081-gentoo-r3.tar.gz 2399242 RMD160 baf48801a5738d980b499e3fcde8f955d3a775fe SHA1 f7e9dff235bb4d157e38dd0e20f679ffc84882bf SHA256 3e423e3d3867ad4b823f3eb7722a2b1312af91ffe99699d0858c7436ece5343d DIST mysql-storage-sphinx-0.9.9-gentoo-r3.tar.gz 117988 RMD160 b18328ca54f919e3dc3b65abc8bdf54057f8b0a7 SHA1 9effa1de769e253b393eea5be0ec2a7d3007904d SHA256 ed7047ec91b0b00358cb6421110c09ce4ef3c9e8ffa1adc3b7406a80613ba848 DIST mysql-storage-spider-2.10-gentoo-r1.tar.gz 162512 RMD160 614e7dc1cab5a0b1b9856e9e596a5c7587a57d99 SHA1 d6893eb7314649c41a2e53d44201964c08044387 SHA256 842e219020c73862f71d280ce1c70c99cbeb9096b2a6944c8822237a5923ce0b +DIST mysql-storage-spider-2.20-gentoo-r1.tar.gz 176918 RMD160 043ac94be10e77fba1f22ec351b203dc3fd8de74 SHA1 54e36fe9928b7a70105ce124eea59e3fd668042c SHA256 0aee30d205240027c901a79ea5cd10be016c2a9c74a66c25d9a56af97db9362c +DIST mysql-storage-xtradb-1.0.6-10.1-gentoo-r1.tar.gz 1744500 RMD160 e600ba8e57e33fa6afcfdbde019e9acbfbbdce0d SHA1 ce2ed55153624244c87ef4efb36b1435c0fe2255 SHA256 c59215a225d71d654f2432ae84ee2e18bce8f2c3bf799ec43fb7b52d85f39de3 DIST mysql-storage-xtradb-1.0.6-9-gentoo-r2.tar.gz 1432782 RMD160 954baf9c64a53eaf2c5c95a05f51647133950b0d SHA1 cd3a3a6ac6ed6065b8bc446693e58b3eaef0dfd1 SHA256 8e5da5a5aa5263612697984aee61f618091a5dad3e2e99a2811c06b8beb0f416 DIST mysql-storage-xtradb-1.0.6-9.1-gentoo-r1.tar.gz 1724925 RMD160 6014439b4371c5f85e81a7b153378e7c9cbd5cf7 SHA1 8cc3005dc0e1fd553f248d6beec05ca6ff43f327 SHA256 e76862a29b8f8eee1b9a1df641324d8a9b8e38f16e73ecf015213dfa61d8be59 EBUILD mysql-5.1.41.ebuild 5087 RMD160 b9bc34589bb5f5ee19fd5808721ce5160ba680f5 SHA1 3d79b7051ab92079e102429b09caa551cc507c12 SHA256 2abacfaf4efcb9eb1a3c6e86fe052a35af628f68300231bc7f5d3d1aff16ea9d @@ -32,6 +39,7 @@ EBUILD mysql-5.1.42.ebuild 5087 RMD160 d745249ad43819fee58ceaf7c61159738b437755 EBUILD mysql-5.1.43-r1.ebuild 6572 RMD160 72a59ef1237801d62cbf98c9b65794c7c4c79644 SHA1 f63844835d90c0663bbcda693a39cc087bf906bd SHA256 c76fe07fa9b4e5aaf8cefb8ac104b7967b890aed33e8e5e4311d13d121e20b98 EBUILD mysql-5.1.44.ebuild 6572 RMD160 72a59ef1237801d62cbf98c9b65794c7c4c79644 SHA1 f63844835d90c0663bbcda693a39cc087bf906bd SHA256 c76fe07fa9b4e5aaf8cefb8ac104b7967b890aed33e8e5e4311d13d121e20b98 EBUILD mysql-5.1.45-r2.ebuild 6562 RMD160 1146db64cc50f4584bf3748f39919420d1e5b921 SHA1 2563f861c9555ce8a42cbfca712186f3647b4a88 SHA256 35b20202838abfea710d03d6942f66f11250b418df179cf608d03dbcb039d115 -EBUILD mysql-5.5.0_pre2.ebuild 4929 RMD160 00e97ca8efbe82f396404b461b9c31db6e1527e5 SHA1 cf7e57f1019b32fdf872b556f7ad0812cd1c733f SHA256 50b05c911523c7912d411384081455180fbfa0d2a9fd91d1cdbaeb02be683c4c -MISC ChangeLog 96239 RMD160 31b317ff84ede7204ffcc004b1a7ad0e594cc334 SHA1 12d241ceb93c6792e9b0ae96b50d52e518f4e3e6 SHA256 63cb08a10d5615db530ff67636f2e3e017f5ff3c58f12ab1082b23d9edda81dc +EBUILD mysql-5.1.47-r2.ebuild 6655 RMD160 4c93434dad589d660311f75677b7afd5043ace28 SHA1 32f07a09f792f165078a11f1bb57a05b3c737602 SHA256 3f675c1581d5ca67b905e2b70da56e6599e9de5da9716ced3e184c65df285cce +EBUILD mysql-5.5.1_alpha_pre2-r2.ebuild 7025 RMD160 eef0ca281f2f3a37824e9b10616447b6dd2c3c0d SHA1 d6be9d84f8d9877b5ab962c9e3042cb2ebdb5d66 SHA256 11f589cea18ead1bdd39761b1cd7078936227b692413cbec2f7db25fea855e25 +MISC ChangeLog 96445 RMD160 46739b456040c6c85b1a00dbe18025bea48276c9 SHA1 54c428bc360f2aa4eb033714f6ff1f4e2c508fc6 SHA256 461f5663374a4c59fbfa4537b5e0651d0298b3175b3d8380a594ba7ca074ba89 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 index 458a58a..2c89c73 100644 --- a/dev-db/mysql/files/my.cnf-4.1 +++ b/dev-db/mysql/files/my.cnf-4.1 @@ -117,7 +117,7 @@ innodb_log_file_size = 5M 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_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 diff --git a/dev-db/mysql/files/my.cnf-5.1 b/dev-db/mysql/files/my.cnf-5.1 new file mode 100644 index 0000000..2330a32 --- /dev/null +++ b/dev-db/mysql/files/my.cnf-5.1 @@ -0,0 +1,146 @@ +# /etc/mysql/my.cnf: The global mysql configuration file. +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1,v 1.4 2008/11/14 02:16:25 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 +character-set-server=utf8 + +[mysqladmin] +character-sets-dir=/usr/share/mysql/charsets +character-set-server=utf8 + +[mysqlcheck] +character-sets-dir=/usr/share/mysql/charsets +character-set-server=utf8 + +[mysqldump] +character-sets-dir=/usr/share/mysql/charsets +character-set-server=utf8 + +[mysqlimport] +character-sets-dir=/usr/share/mysql/charsets +character-set-server=utf8 + +[mysqlshow] +character-sets-dir=/usr/share/mysql/charsets +character-set-server=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/mysql/mysql-5.5.0_pre2.ebuild b/dev-db/mysql/mysql-5.1.47-r2.ebuild similarity index 63% rename from dev-db/mysql/mysql-5.5.0_pre2.ebuild rename to dev-db/mysql/mysql-5.1.47-r2.ebuild index c2efc87..a47b623 100644 --- a/dev-db/mysql/mysql-5.5.0_pre2.ebuild +++ b/dev-db/mysql/mysql-5.1.47-r2.ebuild @@ -5,7 +5,18 @@ MY_EXTRAS_VER="live" EAPI=2 -MYSQL_STORAGE="filesystem-0.1.1-gentoo-r7" +GO_MYSQL_PATCHES="http://ftp.disconnected-by-peer.at/mysql/go-mysql-patches-1.tar.gz" + +MYSQL_STORAGE="pbxt-1.0.11-2-pre-ga-gentoo-r1 + pbms-0.5.12-beta-gentoo-r3 + revision-0.2-alpha-gentoo-r5 + soliddb-0081-gentoo-r3 + innodb-1.0.6-gentoo-r2 + xtradb-1.0.6-10.1-gentoo-r1 + filesystem-0.1.1-gentoo-r7 + sphinx-0.9.9-gentoo-r3 + spider-2.20-gentoo-r1 + oqgraph-0.7-gentoo-r6" inherit toolchain-funcs mysql # only to make repoman happy. it is really set in the eclass @@ -14,9 +25,8 @@ IUSE="$IUSE" # Define the mysql-extras source EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" - # REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~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='' @@ -46,8 +56,9 @@ src_test() { has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" cd "${S}" einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus1 - local retstatus2 + local retstatus_unit + local retstatus_ns + local retstatus_ps local t addpredict /this-dir-does-not-exist/t9.MYI @@ -109,39 +120,76 @@ src_test() { "status2" \ "Broken in 5.0.72, new test is broken, upstream bug #41066" - # SSL certs expired shortly after the release of 5.0.76. Affects older - # versions as well. + # 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.0.[1-6]*|5.0.7[0-6]) - for t in openssl_1 rpl_openssl rpl_ssl ssl ssl_8k_key \ + 5.0.*|5.1.*) + for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ ssl_compress ssl_connect ; do \ mysql_disable_test \ "$t" \ - "OpenSSL tests broken in 5.0.76 due to expired certificates" + "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: + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + case ${PV} in + 5.1.*) + for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do + mysql_disable_test "$t" "False positives in Gentoo" + done + ;; + esac + # create directories because mysqladmin might right out of order mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} - + # We run the test protocols seperately + make -j1 test-unit + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns" - retstatus1=$? - [[ $retstatus1 -eq 0 ]] || eerror "test-ns failed" + retstatus_ns=$? + [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps" - retstatus2=$? - [[ $retstatus2 -eq 0 ]] || eerror "test-ps failed" + 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="" - [[ $retstatus1 -eq 0 ]] || failures="test-ns" - [[ $retstatus2 -eq 0 ]] || failures="${failures} test-ps" + [[ $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" diff --git a/dev-db/mysql/mysql-5.5.1_alpha_pre2-r2.ebuild b/dev-db/mysql/mysql-5.5.1_alpha_pre2-r2.ebuild new file mode 100644 index 0000000..6e41e19 --- /dev/null +++ b/dev-db/mysql/mysql-5.5.1_alpha_pre2-r2.ebuild @@ -0,0 +1,208 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.3 2010/02/15 21:27:54 robbat2 Exp $ + +MY_EXTRAS_VER="live" +EAPI=2 +MY_PV="${PV//_alpha_pre/-m}" +MY_PV="${MY_PV//_/-}" + +MYSQL_STORAGE="filesystem-0.1.1-gentoo-r7" + +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='' + +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" +RDEPEND="!media-sound/amarok[embedded]" + +# 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 + +# 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 + + 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 +}