commit: b3b87f4899f632c548354a91bd62b9192af46f74
Author: Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Fri Mar 28 16:47:01 2014 +0000
Commit: Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Mar 28 16:47:01 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b3b87f48
[mysql] Version bump for 5.5 series
Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>
---
dev-db/mysql/Manifest | 2 +-
dev-db/mysql/{mysql-5.5.36.ebuild => mysql-5.5.37.ebuild} | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5fa8d7f..204705c 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -4,7 +4,7 @@ DIST mysql-5.0.96.tar.gz 22686667 SHA256
43853814775158aa1650f483530a7dde1539575
DIST mysql-5.1.70.tar.gz 23984241 SHA256
9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512
5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3
WHIRLPOOL
58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d
DIST mysql-5.1.73.tar.gz 24023347 SHA256
05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 SHA512
2e3651ebc1370dad7e01158cdd99133ed3f90c985114766b6282d58b743ae7bce16db797e82819fa5bbc2fa53d89811fd76b278c7459338288e7957634a8c3ff
WHIRLPOOL
f47c3fe1cd98b8ca2163646c760bd9763c65eab0591b31fe30a8c55c72c8b10d7b549b394493695cf98f50999364409ef8158661141277e6d99b011835aef942
DIST mysql-5.5.35.tar.gz 21707804 SHA256
46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512
ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede
WHIRLPOOL
800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
-DIST mysql-5.5.36.tar.gz 21723910 SHA256
30f2cde5bf854cf1ef74ecd1ae2f6e5e9ec7d11eb5b50643e1aa91c911c75897 SHA512
594644e13fa68d96b6081bff488574e5926a449c86274d0045fe4f211200f7a7c80c1b06c7c64bbe9df4753ac6de11cb9de0eb05c0ff40d7508b4eff87ea9684
WHIRLPOOL
6b9db2023975cd7341b32e5c2dab52d84269b3f0e0898d0d38646993ce7fc9004e148f9564792345748a4e7f7d8ea7974d3fa179cb2bac35c3fbd153c63e68ec
+DIST mysql-5.5.37.tar.gz 21718944 SHA256
da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512
858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad
WHIRLPOOL
13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
DIST mysql-5.6.16.tar.gz 32821451 SHA256
70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0 SHA512
e54de791954e46bef295045ee98c0d7b9b5ec85ed7917e1a424f20d234d9fc47083fa44ae6439c6ab2198ab3016ce93ae621328b442084ba52c84c296113c60d
WHIRLPOOL
2e5035e703b54511d808c89e59d924d49918d1ec9ce4707b0ee33d422db7e84273776a8891b6eec6e4942652e1b23690145ca92b11481f6d96d3cb7835fd0ed2
DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256
04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512
34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da
WHIRLPOOL
aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb267777d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2
DIST mysql-extras-20070105.tar.bz2 50005 SHA256
17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512
65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34
WHIRLPOOL
3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
diff --git a/dev-db/mysql/mysql-5.5.36.ebuild b/dev-db/mysql/mysql-5.5.37.ebuild
similarity index 91%
rename from dev-db/mysql/mysql-5.5.36.ebuild
rename to dev-db/mysql/mysql-5.5.37.ebuild
index 3f679a3..ebb6824 100644
--- a/dev-db/mysql/mysql-5.5.36.ebuild
+++ b/dev-db/mysql/mysql-5.5.37.ebuild
@@ -67,6 +67,9 @@ src_test() {
# create directories because mysqladmin might right out of order
mkdir -p "${S}"/mysql-test/var-tests{,/log}
+ # create symlink for the tests to find mysql_tzinfo_to_sql
+ ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
# These are failing in MySQL 5.5 for now and are believed to be
# false positives:
#
@@ -91,11 +94,14 @@ src_test() {
# +mysqltest: Could not open connection 'default': 2026 SSL
connection
# error: error:00000001:lib(0):func(0):reason(1)
#
+ # main.mysql_tzinfo_to_sql_symlink
+ # fails due to missing mysql_test/std_data/zoneinfo/GMT file
from archive
+ #
for t in main.mysql_client_test \
binlog.binlog_statement_insert_delayed
main.information_schema \
main.mysqld--help-notwin main.flush_read_lock_kill \
- sys_vars.plugin_dir_basic main.openssl_1 ; do
+ sys_vars.plugin_dir_basic main.openssl_1
mysql_tzinfo_to_sql_symlink ; do
mysql-v2_disable_test "$t" "False positives in
Gentoo"
done
@@ -103,7 +109,8 @@ src_test() {
pushd "${TESTDIR}"
# run mysql-test tests
- perl mysql-test-run.pl --force
--vardir="${S}/mysql-test/var-tests"
+ perl mysql-test-run.pl --force
--vardir="${S}/mysql-test/var-tests" \
+ --testcase-timeout=30
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with
FEATURES=usersandbox"
