[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/

["Brian Evans" <grknight@tuffmail.com>]

commit:     3c4b8772b55d693c3440fe99b5de66252681d1a8
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 12 17:18:25 2014 +0000
Commit:     Brian Evans <grknight <AT> tuffmail <DOT> com>
CommitDate: Tue Aug 12 17:18:59 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=3c4b8772

[mariadb] Version bump

---
 dev-db/mariadb/Manifest                            | 17 ++-------------
 ...db-10.0.11-r1.ebuild => mariadb-10.0.13.ebuild} | 24 ++++++++++++++--------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 2d359e2..b33c4df 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST mariadb-10.0.11.tar.gz 51084235 SHA256 631bc4d9e4078456a0c98466dad18572e4a361acad25feeda2190c6da70110dd SHA512 0e27b053f49a2e8db3bb2f000b2c48ae54f3bd6d0ef23efd39476eed1e7e729df02feb2c72ce6153982a2d8fb13af49575a6c9351ee011ff4a591d4ea29ea1d6 WHIRLPOOL 194df19c3863343962fdf2240b742715920f0b5e827702d0d64b8d841350af6832de79c20b76d0963ee0ef7b00ca6c14ae6e87d11d59db926da1321d905eb1ef
 DIST mariadb-10.0.12.tar.gz 51100726 SHA256 612bc7360997173d536b79d744e8418d3910924775cbb0614d0843d609be162d SHA512 09d14df652d7ddbfc42b7faa6743e85b013db258e9b3d29b27ca6f01f6b017a03425a900b29b4907e348195da01b59686dce8346371bab4bcd5dcf6778f7ee50 WHIRLPOOL 37808855569961d108f133d40bd7774cfed386289e5923f7c28369056fb1eb6a6d40d02248a214982c7c7d3d0740e2403b1ce3fb41b1b7b628a0ee081999ebd1
+DIST mariadb-10.0.13.tar.gz 51333762 SHA256 1a56a0ad1178e26723dfd7e77a2266a7da89552f12ea6bd5116a00bd13fa3c0d SHA512 4bee28c1a1f51dde607f59587f7d0281e9677d6af65501238d6ddf9c4fee9b3ab7bc7da8fc7f321fb7d859fbbfec96354bea3c7852ad36c9cae883fbdba22ac1 WHIRLPOOL 524bdf2131d4e090c2cb9a1f5ee7eb64599b0180db9c7f8b4483223d7b28e986f91d81589ded6f3c2df65e5ae0c6b1d218d1c860db8aa8d1c0e45b035cb975a7
 DIST mariadb-10.1.0.tar.gz 51216842 SHA256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a WHIRLPOOL edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
 DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
 DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
@@ -12,14 +9,4 @@ DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005eb
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e WHIRLPOOL 371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
 DIST mysql-extras-20140729-0112Z.tar.bz2 1494826 SHA256 a6963f853ae168ba04a2fea18bda6e44d6691c4be328496ba9f6818638f7cccf SHA512 72506cb13b8b0880b9bf8846b0f6e95f22a69760d5c4d48b6d346b2ed1b2c98c718c8833222457dbf832455846d6829e4e66f582b5c29fb3f6226df62086fad6 WHIRLPOOL 40245685a26acfddb882318813c689db28f4dc67e905c3e3b06e8e37c76d2d2aaa28a57cf5f147f1744bbc780731344e0e4c4ecc3069beb210f232eaab01f714
 DIST mysql-extras-20140729-2200Z.tar.bz2 1494219 SHA256 28363c7ba1893677911451e7f05402a31afc0ed0a48ea1b7cf1915ae1be81e20 SHA512 d90e104b3e73af5589eb32ddbcf9098ad9d69898b55d4d662ebc9578f0281e87fef6b5adb6cdc33fa19a04bf066e01121ead2e6a2bffa0d44ffc10b895392a1c WHIRLPOOL 531a9e08f9231bfcd758bbe8d5b6d5968bd2cfce9c70bc8c15517f497606322da7cffbecd77a0cabd837c3c0ba4f2381a569d583f2fa5ecb14e95a367a93ee11
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJT4RfDAAoJEE4V4vFnx44daOYH/3SVmrASAVqQ683P6z7qgm3v
-eiYpXSu60NRIK1Jlad4ipekHXzTdC2mVDvU8o+jToAgpfJdTeGV9hdMAsYliA4jU
-ShrMU1sy+SPJYDNbOMUZnjH2H/Cdg9gYDR4ZJJaVKSLATie3hBlOzif0R+Ho1M5r
-adzdrOhxis1h+WsODk4/HGwSvC/fJzxZ9WzcTgoHNJKYNBtpdqcwtHWFsBL/kYWX
-ZUVJr1USdWn6htXFCYnaGgky15I08nX6aQ6IPajv9YPHLYOmrOA8+GZDiNKygaxG
-kGVMm00Cgz+l+wa7E9gi5g0XAroXVi7J6AGz6cnQQdrqdKFMbfd3jtBBlZfDjGc=
-=Xdjy
------END PGP SIGNATURE-----
+DIST mysql-extras-20140811-2248Z.tar.bz2 1494408 SHA256 704df7c55261eda39eec8d0a7b90c079bf34d8d013e2f6e61364482c5d95a819 SHA512 906dc9527f16d15e86fc3929ec4ed1be2680895a28168f2ba78305a8c39c04d2e79f5decbda703c84745bd112f7035d07402c6258d0cea877efa716ae9910544 WHIRLPOOL 7fae2dd461e595d74bc4594be4af2bced6270400398e36f1e4181d3948a5204739e030fb58cf3c2ac90001af5806aacaa4460ce1240750ca3eb0868884bf2a5d

diff --git a/dev-db/mariadb/mariadb-10.0.11-r1.ebuild b/dev-db/mariadb/mariadb-10.0.13.ebuild
similarity index 83%
rename from dev-db/mariadb/mariadb-10.0.11-r1.ebuild
rename to dev-db/mariadb/mariadb-10.0.13.ebuild
index c81f927..d199046 100644
--- a/dev-db/mariadb/mariadb-10.0.11-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.13.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.13.ebuild,v 1.1 2014/08/12 17:16:36 grknight Exp $
 
 EAPI="5"
-MY_EXTRAS_VER="20140729-2200Z"
+MY_EXTRAS_VER="20140811-2248Z"
 
 inherit toolchain-funcs mysql-multilib
 # only to make repoman happy. it is really set in the eclass
@@ -23,7 +23,12 @@ RDEPEND="${RDEPEND}"
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mariadb-X.X.XX.ebuild \
 # digest clean package
-src_test() {
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
 
 	local TESTDIR="${BUILD_DIR}/mysql-test"
 	local retstatus_unit
@@ -62,18 +67,21 @@ src_test() {
 		# funcs_1.is_columns_mysql
 		# fails due to USE=-latin1 / utf8 default
 		#
-		# main.mysql_client_test, main.mysql_client_test_nonblock:
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
 		# segfaults at random under Portage only, suspect resource limits.
 		#
-		# plugins.unix_socket
-		# fails because portage strips out the USER enviornment variable
+		# innodb.innodb_simulate_comp_failures_small
+		# Has a very long timeout requirement to be consistent
+		# Upstream bug MDEV-6546
 		#
 
 		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			main.mysql_client_test_comp \
 			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help plugins.unix_socket \
+			main.mysqld--help innodb.innodb_simulate_comp_failures_small \
 			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
-				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
 		done
 
 		# Run mysql tests