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

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

commit:     ed77a974ae5947be8d33e207d0e974492e1b6e9d
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Wed Apr  2 12:58:52 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Apr  2 12:58:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ed77a974

[mysql] Version bump for 5.7 rpl.rpl_typeconv test fails due to timeout.  resources?

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

---
 dev-db/mysql/Manifest                                    |  2 +-
 ...alpha_pre13.ebuild => mysql-5.7.4_alpha_pre14.ebuild} | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 491f5c0..a9d6217 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -6,7 +6,7 @@ DIST mysql-5.1.73.tar.gz 24023347 SHA256 05ebe21305408b24407d14b77607a3e5ffa3c30
 DIST mysql-5.5.35.tar.gz 21707804 SHA256 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a SHA512 ff36020a4657b6102fb69d968d272656e9a28063a14db905b9361980410b3b3c13f478ac2aa72c83cee384150a4df43118eaf2be2768f6d57e1a1ccb0c405ede WHIRLPOOL 800e1bdee611e7d1bb69a1f3fe4f167f03a60060c9e26f867cffbd2bcc1d084cd220aa6dd080bad3c42195378499bbb830b381fa77b471d3a40c33efc4f880f1
 DIST mysql-5.5.37.tar.gz 21718944 SHA256 da1ac0a3813d0b03a26618fcf003a5df16a4afc2dddc0c98b13f41923aab02a8 SHA512 858333faeb4f2ac6dc8517f09d970bffae645ebaad4583fd2f2e9a0d8537c05e18a76d259ecfc80e2860387392f9d1ab6658ed0f1f8a3c8542b404e37d3bc5ad WHIRLPOOL 13516a8e8d89d1bee4bede634e3a460a580b2ae2beb8f8518a17d4c57fbcf653182f6ca6dc59f4fd3981550cbf356836fdd76ab0784d31d3a4d4d0298e93e0f3
 DIST mysql-5.6.17.tar.gz 32862539 SHA256 f8ed0a1abd60ed9152b71a027446825d8686c48e99def6e74e0d12d24e9a1d9b SHA512 36b9c9456f2ccc0efd26fb4b4ce4280849e9915f06c19183700345aa39a72cf94d940ef98b113c14de0bfea27e3f4135e6f163635c8a14629a9f58c8c12845d7 WHIRLPOOL 47f86e99ad5d192d2a82e48e174dbe0fbd8f941b6b1494ab6a9621967aac77bb0579b2bb2e11c432d2856df7ab34d4cde9a4266923a0499577e035ac699bbc9f
-DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256 04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512 34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da WHIRLPOOL aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb267777d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2
+DIST mysql-5.7.4-m14.tar.gz 44115280 SHA256 3c6b29641b50c6622db31e3067e4b9ed542f620b55f44372f398040219349732 SHA512 7dea15db9a08a4b94272babd5d5d45ddf8a0bf932291d37c90c5f49962b2d2e732c37d3aeaecc445631d7c8a1ee9717e8561c1b2abf4f52d853ce2a06a715c1b WHIRLPOOL 6738a6fbc1a71b6f8244ad5fbaa76facf55ec0cda6b78f5895f693f0b780582e89bab297e54bd16a17b6c8e88dcb3760f5d78ed2f776c769e7117991b50b153c
 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec
 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551
 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213

diff --git a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild b/dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
similarity index 90%
rename from dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
rename to dev-db/mysql/mysql-5.7.4_alpha_pre14.ebuild
index a650318..9026213 100644
--- a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild
+++ b/dev-db/mysql/mysql-5.7.4_alpha_pre14.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:
 		#
@@ -80,18 +83,15 @@ src_test() {
 		# main.mysql_client_test:
 		# segfaults at random under Portage only, suspect resource limits.
 		#
-		# sys_vars.plugin_dir_basic
-		# fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin
-		# instead of MYSQL_LIBDIR/plugin
-		#
-		# main.flush_read_lock_kill
-		# fails because of unknown system variable 'DEBUG_SYNC'
+                # 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 funcs_1.is_columns_mysql \
 			funcs_1.is_tables_mysql funcs_1.is_triggers \
 			binlog.binlog_mysqlbinlog_filter perfschema.binlog_edge_mix \
-			perfschema.binlog_edge_stmt; do
+			perfschema.binlog_edge_stmt main.mysql_tzinfo_to_sql_symlink ; do
 				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 
@@ -103,7 +103,7 @@ src_test() {
 
 		# run mysql-test tests
 		perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
-			--suite-timeout=5000
+			--suite-timeout=5000 --testcase-timeout=30
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"