dev-db/mysql-5.5.37-r1: revbump/merge (from mysql overlay)

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 13 insertions, 14 deletions

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index e39b028..ea3c309 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -2,10 +2,9 @@ AUX my.cnf 1249 SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c
 AUX my.cnf-4.0 4324 SHA256 2c9715f29b423207a92e6bc81f1179b152c2d8ff72f69e4af3cda37c114452df SHA512 51c3956b44e54dfc3aa2f1ac0d8aac3fefca1f2a8caa9298c218eff4fd64e33f4a49ea313aafc22d13582af7420edbc35034cec1ee2340f7689cfe49b180a3d5 WHIRLPOOL 839926eb7816ef93ee1bc480b0a2fc354f91db8d3053a8679bc5663fce785a0efa974cb1421c8b6c122d5d5f86f95305eafdeadc80e2c101cced6a6017f08ec7
 AUX my.cnf-4.1 4235 SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7 SHA512 8bb6a8cc05b9aea433f0a0f1184a03b5b99b6a4dd5e162abd173810db8a530de33db80a7ae0018e29879253c752a4b3a4522335a170cb2339a1ead76fd15318b WHIRLPOOL fa5e0f91100e8dd6ed42e095079635dd95ed171d96275340145136c86157805fd1d101b74b49873b6cc05f182ca209d6e981e0d16d4871adf5d24a279469b59b
 AUX my.cnf-5.1 4827 SHA256 8b11f33d086566d0ca21d46bb21b1020be6e24511038f3f12e146089a1d406c7 SHA512 5facc6fe5b6a4bf9e4ac9430d1c2a8195e7a859fb66d84cf4adebf2a9f4e3f422c5fc143beb5d8f327d9191200e654b636a564b6e082cc9cbac39cfb6516a086 WHIRLPOOL 185cb121d3ca0c5c249cfa58377e029a7dd4934de2bd240943cddb9d3c10116a3c3d90959bf8872d5f69627f8b2adf7fd001aa40947713a42bd13df7f733f068
-AUX my.cnf-5.5 5010 SHA256 b3b55b6e9ddae9f8cff38ca39bb86b3066408657552ea163c0263b18a9f91769 SHA512 aa0789eb6ef3e6b3e7a81ae88e96f4eb8324c67de8ddf29d9e06164bd0799bfddc60352d2e2597cc39aa810e74f06c5c9cf7f918f4e284b87d6953bc5fbe38b9 WHIRLPOOL 416d626a028f747e1303c673bb3b53dada7efdc987a7856f975a608260ab48cf610be2029b9bbf9f64d632990997b4f74552809be56aba887e3b967f5285302b
+AUX my.cnf-5.5 4901 SHA256 6a6d3593292c587b782b869251342fb63c4e39c64f0ab9a892c069c6706aabfb SHA512 5110ddce5ca9b3f4ccb5999928cf94727233a8958fb72270a939d72a9772ed1628e89060e50720b38ad62d3c3db2cc2965d9318dd3d8c3648f519db5883e2721 WHIRLPOOL d4e261d1e9b3cfbc464a16bee597838769d88d4acf881eee07421426ce6e417885e75a04e562b4ab7246600237990c223fbfa7a997e0046e0ae5db1824482e73
 AUX mysql.init 886 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 SHA512 4400e6e993fc9bb69efdb06e8dd2eaacd16a361d290031c38347a3dc1f912867bc3f0f62fe2d61e09671801a2355bf896bf22360e209e8044877ca976f4e0611 WHIRLPOOL 43a656123c687571158edc94363e9dfd742e4ef29f92551e7bba56ff9782795b75ae62fab1f659fc3d21bc6debab689c39269c0a5bfd28b6652162d38ae9dd5a
-DIST mysql-5.5.35.tar.gz 21707804 SHA256 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512 ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede WHIRLPOOL 800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
-DIST mysql-extras-20130602-1946Z.tar.bz2 1478373 SHA256 843465190319464fdb035f4ddcf8a84ad3161780e3a81c1269c8f498b1524aab SHA512 95fc28f84618e11eeb2de22c12796eca5f8eff7b69ccc44d329d8f81aba4b015c834bad965a909f4e1e90a7f6012db98092ca21f31388ff5ab88268c8c1b60f3 WHIRLPOOL c04b1554663934969ab6b7773c96a5bd2388971dbea1eef138620014ef1e023904b5df326ff3e36538920be7bc50a2962e8f7a33435e42c1b5bdf5787ed2eb3a
-EBUILD mysql-5.5.35-r1.ebuild 4146 SHA256 55fc6187f327b348cd2f12222ddf599c995b8a56aff65a0cc8f359da1a812b82 SHA512 2e3e79c6f160faec791bd02b4f666cb9b46b708379ae08a14ee6722d0f4cc898136f1757dab5f89fc0fc9ab554133b37d7292296efafd212b27c83b367242453 WHIRLPOOL 87d7a3585443950ee7fdc212b3c3178e0ca095a5fea36ec7812af6d194f4b44d0df9f55365656ea64d9c93cf2360af3d85aeb4424256d15549af9d7cc0a15089
+DIST mysql-5.5.37.tar.gz 21718944 SHA256 da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512 858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad WHIRLPOOL 13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
+EBUILD mysql-5.5.37-r1.ebuild 4312 SHA256 cabad39aaf0570127355fac6f33c388569202013ce3b1ead2941d41ec0d92a0b SHA512 72b73ba0f33dbe73fc1555f2f802b2f51c5728a7afcd353b018105334474d6a764d7ed542638398dfc2c9eab83b7903baf0444bd58f0d99c7ee032b828b01fbc WHIRLPOOL 89f5ef716e5b3856258b24c9dd7673665b5a29f190275a8758503197c3291174e61270f101a95eb36406b838535057aa8a995d1de3cb7d94a27fbfe517a58a0c
 MISC ChangeLog 13471 SHA256 bb939ef2d4c36fab2236b6a9b9e855427a16c3a902a6d1555fd827e5c89cf512 SHA512 ebafe25d6036af0073a463e3228150353e1bf3a340114fc1eddb2e22ae7a255017167a317ef14fcbaee50d3f16fa08eb68d9b58e45edb45dad653aa1407b3cb2 WHIRLPOOL 927cca370bb44dd38b5e0d88126f9dba70feb632cf1cc4713aab891ce97841d28c5b8da47ba1fffb4d9cc46278b31ea3eccdf0b35247e79e3b5f9169554029dd
 MISC metadata.xml 1512 SHA256 2aa7aa3c625242463dcc8fbd52f0c33558507f375dd64c80412372e5d8456b70 SHA512 b9a09711b821ce7a962dcb23a4e249bfa83fd5605a45bc9416e4721a643e8fc740df4e22a7aba8d7245612361f6f3d779647f32c9469662fc2a2598030a2499e WHIRLPOOL 9d553da0a5501afbb99566ba46664f50e871e90a6ae839626f2aea9b7f28e9eadd1b8360483bed9a397082f59518009d1f70fef128399370c4bb1d6e85c2b5dd
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5
index fa7799f..eb4f859 100644
--- a/dev-db/mysql/files/my.cnf-5.5
+++ b/dev-db/mysql/files/my.cnf-5.5
@@ -86,10 +86,6 @@ tmpdir 						= @GENTOO_PORTAGE_EPREFIX@/tmp/
 #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
@@ -145,8 +141,8 @@ write_buffer 				= 2M
 [myisamchk]
 key_buffer_size				= 20M
 sort_buffer_size 			= 20M
-read_buffer 				= 2M
-write_buffer 				= 2M
+read_buffer_size			= 2M
+write_buffer_size			= 2M
 
 [mysqlhotcopy]
 interactive-timeout
diff --git a/dev-db/mysql/mysql-5.5.35-r1.ebuild b/dev-db/mysql/mysql-5.5.37-r1.ebuild
index 2392ab2..41f03c4 100644
--- a/dev-db/mysql/mysql-5.5.35-r1.ebuild
+++ b/dev-db/mysql/mysql-5.5.37-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-MY_EXTRAS_VER="20130602-1946Z"
+MY_EXTRAS_VER="live"
 MY_PV="${PV//_alpha_pre/-m}"
 MY_PV="${MY_PV//_/-}"
 
@@ -36,7 +36,7 @@ MULTILIB_WRAPPED_HEADERS=(
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
 # Official test instructions:
-# USE='berkdb -cluster embedded extraengine perl ssl community' \
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mysql-X.X.XX.ebuild \
 # digest clean package
@@ -79,11 +79,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
 
@@ -113,7 +116,8 @@ abi_post_test() {
 	pushd "${TESTDIR}"
 
 	# run mysql-test tests
-	perl mysql-test-run.pl --force --vardir="${TESTDIR}/var-tests"
+	perl mysql-test-run.pl --force --vardir="${TESTDIR}/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"