1 |
commit: 7676df919e34ab6898e0f64e462703268e2fcd7f |
2 |
Author: Brian Evans <grknight <AT> tuffmail <DOT> com> |
3 |
AuthorDate: Thu Jan 23 03:26:25 2014 +0000 |
4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
5 |
CommitDate: Thu Jan 23 03:26:25 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=7676df91 |
7 |
|
8 |
[mysql] Bump to 5.7.3m13. 2 tests fail - fix outdated cnf options |
9 |
rpl.rpl_perfschema_execute_status_by_worker - binlog offset possibly due to USE="-latin1"? |
10 |
binlog.binlog_server_start_options - server options error?? |
11 |
|
12 |
--- |
13 |
dev-db/mysql/Manifest | 1 + |
14 |
dev-db/mysql/files/my.cnf-5.5 | 4 +- |
15 |
dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild | 125 ++++++++++++++++++++++++++++ |
16 |
3 files changed, 128 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest |
19 |
index 5154942..b744fe4 100644 |
20 |
--- a/dev-db/mysql/Manifest |
21 |
+++ b/dev-db/mysql/Manifest |
22 |
@@ -12,6 +12,7 @@ DIST mysql-5.6.13.tar.gz 35951160 SHA256 5d1b230c3ce896fbea47a69b14b9efb122621a1 |
23 |
DIST mysql-5.6.14.tar.gz 36005278 SHA256 7136963e07726abfb543b618cf368c8bb9480b5113327ca4a8f94c86f24b22c7 SHA512 655e88d9150d32b10b3fad360d36d7ff94c670be9dd1378cef4b9c8ea5c38d74e61eaacd9dbaf3d1aad743c11a2ccc1173b6e1f15d93af866884ef867895f141 WHIRLPOOL d3c2c79da1f3817fe5a0f3d83ba6c40741e73294a82cf8bab38db16755d2379aad7d4c3280c8927d5c391f5fc3f50a399cffce5027685413cec48616e569ba82 |
24 |
DIST mysql-5.6.15.tar.gz 32794954 SHA256 f0ed95faf51670eb9d57ae901e03b0cda79f6c5899f0494b9ec867b1686fe4c7 SHA512 4a9a9bdd251ffe2d40fb69bd62ae66e5421afa9193cd824341976c62f8d6c9374d6c11a23f277ec44d3ad0ede9c190f88ba0f290ae7868ed3b16f66830fbfe9d WHIRLPOOL 8fef93c989a9959bf9f2af23b9601005293f86d9c4380fb68edcd6e78bc0aab9ff84c05e50ea955e25571be2eb4cc058fec6a869bff7536ba033a45a2186abf0 |
25 |
DIST mysql-5.7.1-m11.tar.gz 36605947 SHA256 00630164b2f61c1ed08e8484c75fea81acff33137c94f7da4d49fa352df2f489 SHA512 dabd1fde56d297ee2296d06b0a3190210450ca01d3c6d46634af643e2f0d83b14ef5f5bd79f09c96def840fe153a9cdd9b17baa3c75bf408bc95445f8c0afcf1 WHIRLPOOL 229e3020bf4b610336bbd83049e6a4faa39d9fb91ec5bd4702aa3610d06f1d41c7003ff80c7faf45ebfe151fd3a1bc3bef7118cb89b9fd61fc5132892b0b7589 |
26 |
+DIST mysql-5.7.3-m13.tar.gz 43134145 SHA256 04a4f36c2e33b23a2f1c12274dbbd6aa45fcb36f9919e14c4d8b6bdcd2f4bf0a SHA512 34e9230f0ec55d1cb10362ebc9780c0c59b208ccdabf05d7fe62b0e3cc412616c81361a1a1e8d92f13025fc87d1ca639f1c2e3af3087ba5a7d1d783f53b828da WHIRLPOOL aa8a618759d62769582ea338306326bfd4d00cbd1c309faf8114683a6a4db0def7716d7eb267777d7bf6e4a3edda80ce7e052afdb0b17a7b382719775e919de2 |
27 |
DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec |
28 |
DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551 |
29 |
DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213 |
30 |
|
31 |
diff --git a/dev-db/mysql/files/my.cnf-5.5 b/dev-db/mysql/files/my.cnf-5.5 |
32 |
index fa7799f..0b30a16 100644 |
33 |
--- a/dev-db/mysql/files/my.cnf-5.5 |
34 |
+++ b/dev-db/mysql/files/my.cnf-5.5 |
35 |
@@ -145,8 +145,8 @@ write_buffer = 2M |
36 |
[myisamchk] |
37 |
key_buffer_size = 20M |
38 |
sort_buffer_size = 20M |
39 |
-read_buffer = 2M |
40 |
-write_buffer = 2M |
41 |
+read_buffer_size = 2M |
42 |
+write_buffer_size = 2M |
43 |
|
44 |
[mysqlhotcopy] |
45 |
interactive-timeout |
46 |
|
47 |
diff --git a/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild b/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild |
48 |
new file mode 100644 |
49 |
index 0000000..2977f9b |
50 |
--- /dev/null |
51 |
+++ b/dev-db/mysql/mysql-5.7.3_alpha_pre13.ebuild |
52 |
@@ -0,0 +1,125 @@ |
53 |
+# Copyright 1999-2013 Gentoo Foundation |
54 |
+# Distributed under the terms of the GNU General Public License v2 |
55 |
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.8 2010/04/01 20:41:21 robbat2 Exp $ |
56 |
+ |
57 |
+EAPI="4" |
58 |
+ |
59 |
+MY_EXTRAS_VER="none" |
60 |
+MY_PV="${PV//_alpha_pre/-m}" |
61 |
+MY_PV="${MY_PV//_/-}" |
62 |
+ |
63 |
+# Build type |
64 |
+BUILD="cmake" |
65 |
+ |
66 |
+inherit toolchain-funcs mysql-v2 |
67 |
+# only to make repoman happy. it is really set in the eclass |
68 |
+IUSE="$IUSE" |
69 |
+ |
70 |
+# Define the mysql-extras source |
71 |
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" |
72 |
+ |
73 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
74 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" |
75 |
+ |
76 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
77 |
+EPATCH_EXCLUDE='' |
78 |
+ |
79 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
80 |
+RDEPEND="${RDEPEND}" |
81 |
+ |
82 |
+# Please do not add a naive src_unpack to this ebuild |
83 |
+# If you want to add a single patch, copy the ebuild to an overlay |
84 |
+# and create your own mysql-extras tarball, looking at 000_index.txt |
85 |
+ |
86 |
+# Official test instructions: |
87 |
+# USE='berkdb -cluster embedded extraengine perl ssl community' \ |
88 |
+# FEATURES='test userpriv -usersandbox' \ |
89 |
+# ebuild mysql-X.X.XX.ebuild \ |
90 |
+# digest clean package |
91 |
+src_test() { |
92 |
+ |
93 |
+ local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test" |
94 |
+ local retstatus_unit |
95 |
+ local retstatus_tests |
96 |
+ |
97 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
98 |
+ # localhost. Also causes weird failures. |
99 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
100 |
+ |
101 |
+ if ! use "minimal" ; then |
102 |
+ |
103 |
+ if [[ $UID -eq 0 ]]; then |
104 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
105 |
+ fi |
106 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
107 |
+ |
108 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
109 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
110 |
+ |
111 |
+ # Run CTest (test-units) |
112 |
+ cmake-utils_src_test |
113 |
+ retstatus_unit=$? |
114 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
115 |
+ |
116 |
+ # Ensure that parallel runs don't die |
117 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
118 |
+ |
119 |
+ # create directories because mysqladmin might right out of order |
120 |
+ mkdir -p "${S}"/mysql-test/var-tests{,/log} |
121 |
+ |
122 |
+ # These are failing in MySQL 5.5 for now and are believed to be |
123 |
+ # false positives: |
124 |
+ # |
125 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
126 |
+ # main.mysqld--help-notwin, funcs_1.is_columns_mysql, |
127 |
+ # funcs_1.is_tables_mysql, funcs_1.is_triggers, |
128 |
+ # binlog.binlog_mysqlbinlog_filter, perfschema.binlog_edge_mix, |
129 |
+ # perfschema.binlog_edge_stmt |
130 |
+ # fails due to USE=-latin1 / utf8 default |
131 |
+ # |
132 |
+ # main.mysql_client_test: |
133 |
+ # segfaults at random under Portage only, suspect resource limits. |
134 |
+ # |
135 |
+ # sys_vars.plugin_dir_basic |
136 |
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin |
137 |
+ # instead of MYSQL_LIBDIR/plugin |
138 |
+ # |
139 |
+ # main.flush_read_lock_kill |
140 |
+ # fails because of unknown system variable 'DEBUG_SYNC' |
141 |
+ for t in main.mysql_client_test \ |
142 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
143 |
+ main.mysqld--help-notwin funcs_1.is_columns_mysql \ |
144 |
+ funcs_1.is_tables_mysql funcs_1.is_triggers \ |
145 |
+ binlog.binlog_mysqlbinlog_filter perfschema.binlog_edge_mix \ |
146 |
+ perfschema.binlog_edge_stmt; do |
147 |
+ mysql-v2_disable_test "$t" "False positives in Gentoo" |
148 |
+ done |
149 |
+ |
150 |
+ # Run mysql tests |
151 |
+ pushd "${TESTDIR}" |
152 |
+ |
153 |
+ # run mysql-test tests |
154 |
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" |
155 |
+ retstatus_tests=$? |
156 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
157 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
158 |
+ |
159 |
+ popd |
160 |
+ |
161 |
+ # Cleanup is important for these testcases. |
162 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
163 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
164 |
+ |
165 |
+ failures="" |
166 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
167 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
168 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
169 |
+ |
170 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
171 |
+ einfo "Tests successfully completed" |
172 |
+ |
173 |
+ else |
174 |
+ |
175 |
+ einfo "Skipping server tests due to minimal build." |
176 |
+ fi |
177 |
+} |