summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/mysql
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-05-10 18:54:00 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2013-08-27 16:39:31 +0100
commit72e23c12296fbc77193898c38426add58d0c2d71 (patch)
treeeed39116603d211504dabf316db4d42970b89871 /meta-oe/recipes-support/mysql
parent336123c49e3d9a16429150dd96f60d423ccbd77b (diff)
downloadmeta-openembedded-72e23c12296fbc77193898c38426add58d0c2d71.tar.gz
mysql5: replace with mariadb 5.1.67 and tweak
Switch to MariaDB (which is a drop-in replacement for MySQL) and use the latest stable release from the 5.1 series. * Update LIC_FILES_CHKSUM due to reformatted GPLv2 license text with updated FSF address * Refresh patches * Add two patches from the upstream 5.1 branch to fix CVE-2013-1861 * Add a package for libmysqld (the embedded server library) * Disable "maria" plugin since this fails to compile and doesn't appear to be critical * Drop some unrecognised/redundant options from EXTRA_OECONF * Fix text relocation QA warnings introduced in the upgrade * Convert to use useradd.bbclass for creating mysql user * Set SUMMARY instead of description * Move SRC_URI checksums to the version-specific inc file * Clear out cruft in files/ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-oe/recipes-support/mysql')
-rw-r--r--meta-oe/recipes-support/mysql/files/autofoo.patch319
-rw-r--r--meta-oe/recipes-support/mysql/files/my.cnf21
-rw-r--r--meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb (renamed from meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb)8
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/Makefile.am.patch (renamed from meta-oe/recipes-support/mysql/mysql5/Makefile.am.patch)0
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/configure-ps-cache-check.patch (renamed from meta-oe/recipes-support/mysql/files/configure-ps-cache-check.patch)0
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/configure.in.patch13
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-1.patch174
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-2.patch257
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch (renamed from meta-oe/recipes-support/mysql/files/fix_host_path.patch)0
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/misc.m4.patch (renamed from meta-oe/recipes-support/mysql/mysql5/misc.m4.patch)0
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/my.cnf (renamed from meta-oe/recipes-support/mysql/mysql5/my.cnf)2
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/mysqld.sh (renamed from meta-oe/recipes-support/mysql/files/mysqld.sh)0
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/plug.in.patch405
-rw-r--r--meta-oe/recipes-support/mysql/mariadb_5.1.67.bb14
-rw-r--r--meta-oe/recipes-support/mysql/mariadb_5.1.67.inc (renamed from meta-oe/recipes-support/mysql/mysql5_5.1.40.inc)62
-rw-r--r--meta-oe/recipes-support/mysql/mysql5/configure-ps-cache-check.patch27
-rw-r--r--meta-oe/recipes-support/mysql/mysql5/configure.in.patch54
-rw-r--r--meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch77
-rw-r--r--meta-oe/recipes-support/mysql/mysql5/fix_host_path.patch37
-rw-r--r--meta-oe/recipes-support/mysql/mysql5/mysqld.sh24
-rw-r--r--meta-oe/recipes-support/mysql/mysql5/plug.in.patch40
-rw-r--r--meta-oe/recipes-support/mysql/mysql5_5.1.40.bb6
22 files changed, 908 insertions, 632 deletions
diff --git a/meta-oe/recipes-support/mysql/files/autofoo.patch b/meta-oe/recipes-support/mysql/files/autofoo.patch
deleted file mode 100644
index 669393a23..000000000
--- a/meta-oe/recipes-support/mysql/files/autofoo.patch
+++ /dev/null
@@ -1,319 +0,0 @@
1diff -aurp mysql-4.1.22.old/acinclude.m4 mysql-4.1.22/acinclude.m4
2--- mysql-4.1.22.old/acinclude.m4 2008-09-18 13:00:13.000000000 -0500
3+++ mysql-4.1.22/acinclude.m4 2008-09-18 12:58:41.000000000 -0500
4@@ -1,5 +1,88 @@
5 # Local macros for automake & autoconf
6
7+AH_TEMPLATE([SPRINTF_RETURNS_INT], [sprintf returns an int])
8+AH_TEMPLATE([SPRINTF_RETURNS_PTR], [sprintf returns a char *])
9+AH_TEMPLATE([SPRINTF_RETURNS_GARBAGE], [sprintf returns something unknown to us])
10+
11+AC_DEFUN([MYSQL_SPRINTF_RET], [
12+ AC_CACHE_CHECK([return type of sprintf],
13+ [mysql_cv_func_sprintf_ret], [
14+ old_CFLAGS="$CFLAGS"
15+ CFLAGS="$CFLAGS -Werror"
16+ AC_COMPILE_IFELSE([
17+#include <stdio.h>
18+int sprintf(char *str, const char *format, ...);
19+ ], [mysql_cv_func_sprintf_ret=int],
20+ AC_COMPILE_IFELSE([
21+#include <stdio.h>
22+char * sprintf(char *str, const char *format, ...);
23+ ], [mysql_cv_func_sprintf_ret=ptr],
24+ [mysql_cv_func_sprintf_ret=unknown])
25+ )
26+ CFLAGS="$old_CFLAGS"
27+ ])
28+ if test x"$mysql_cv_func_sprintf_ret" = "xint"; then
29+ AC_DEFINE([SPRINTF_RETURNS_INT], [1])
30+ elif test x"$mysql_cv_func_sprintf_ret" = "xptr"; then
31+ AC_DEFINE([SPRINTF_RETURNS_PTR], [1])
32+ else
33+ AC_DEFINE([SPRINTF_RETURNS_GARBAGE], [1])
34+ fi
35+])
36+
37+# _MYSQL_FUNC_ATOMIC_ADD
38+# ----------------------
39+# Check for Linux specific atomic_add function
40+AC_DEFUN([_MYSQL_FUNC_ATOMIC_ADD],
41+[AC_CACHE_CHECK([for atomic_add], [mysql_cv_func_atomic_add],
42+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <asm/atomic.h>]],
43+ [
44+int main()
45+{
46+ atomic_t v;
47+
48+ atomic_set(&v, 23);
49+ atomic_add(5, &v);
50+ return atomic_read(&v) == 28 ? 0 : -1;
51+}
52+ ])],
53+ [mysql_cv_func_atomic_add=yes],
54+ [mysql_cv_func_atomic_add=no])])
55+ if test x"$mysql_func_atomic_add" = "xyes"; then
56+ AC_DEFINE([HAVE_ATOMIC_ADD], [1])
57+ fi[]dnl
58+])# _MYSQL_FUNC_ATOMIC_ADD
59+
60+# _MYSQL_FUNC_ATOMIC_SUB
61+# ----------------------
62+# Check for Linux specific atomic_sub function
63+AC_DEFUN([_MYSQL_FUNC_ATOMIC_SUB],
64+[AC_CACHE_CHECK([for atomic_sub], [mysql_cv_func_atomic_sub],
65+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <asm/atomic.h>]],
66+ [
67+int main()
68+{
69+ atomic_t v;
70+
71+ atomic_set(&v, 23);
72+ atomic_sub(5, &v);
73+ return atomic_read(&v) == 18 ? 0 : -1;
74+}
75+ ])],
76+ [mysql_cv_func_atomic_sub=yes],
77+ [mysql_cv_func_atomic_sub=no])])
78+ if test x"$mysql_func_atomic_sub" = "xyes"; then
79+ AC_DEFINE([HAVE_ATOMIC_SUB], [1])
80+ fi[]dnl
81+])# _MYSQL_FUNC_ATOMIC_SUB
82+
83+# MYSQL_FUNCS_ATOMIC
84+# ------------------
85+# Check for Linux specific atomic add and sub functions
86+AC_DEFUN([MYSQL_FUNCS_ATOMIC], [
87+ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_ADD])dnl
88+ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_SUB])dnl
89+])# MYSQL_FUNCS_ATOMIC
90
91 AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY], [
92 AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared,
93@@ -344,7 +427,7 @@ dnl ------------------------------------
94 AC_DEFUN([MYSQL_CHECK_ULONG],
95 [AC_MSG_CHECKING(for type ulong)
96 AC_CACHE_VAL(ac_cv_ulong,
97-[AC_TRY_RUN([#include <stdio.h>
98+[AC_TRY_LINK([#include <stdio.h>
99 #include <sys/types.h>
100 main()
101 {
102@@ -362,7 +445,7 @@ fi
103 AC_DEFUN([MYSQL_CHECK_UCHAR],
104 [AC_MSG_CHECKING(for type uchar)
105 AC_CACHE_VAL(ac_cv_uchar,
106-[AC_TRY_RUN([#include <stdio.h>
107+[AC_TRY_LINK([#include <stdio.h>
108 #include <sys/types.h>
109 main()
110 {
111@@ -380,7 +463,7 @@ fi
112 AC_DEFUN([MYSQL_CHECK_UINT],
113 [AC_MSG_CHECKING(for type uint)
114 AC_CACHE_VAL(ac_cv_uint,
115-[AC_TRY_RUN([#include <stdio.h>
116+[AC_TRY_LINK([#include <stdio.h>
117 #include <sys/types.h>
118 main()
119 {
120@@ -399,7 +482,7 @@ fi
121 AC_DEFUN([MYSQL_CHECK_IN_ADDR_T],
122 [AC_MSG_CHECKING(for type in_addr_t)
123 AC_CACHE_VAL(ac_cv_in_addr_t,
124-[AC_TRY_RUN([#include <stdio.h>
125+[AC_TRY_LINK([#include <stdio.h>
126 #include <sys/types.h>
127 #include <sys/socket.h>
128 #include <netinet/in.h>
129@@ -460,7 +543,7 @@ fi
130 AC_DEFUN([MYSQL_CHECK_FP_EXCEPT],
131 [AC_MSG_CHECKING(for type fp_except)
132 AC_CACHE_VAL(ac_cv_fp_except,
133-[AC_TRY_RUN([#include <stdio.h>
134+[AC_TRY_LINK([#include <stdio.h>
135 #include <sys/types.h>
136 #include <ieeefp.h>
137 main()
138diff -aurp mysql-4.1.22.old/configure.in mysql-4.1.22/configure.in
139--- mysql-4.1.22.old/configure.in 2008-09-18 13:00:14.000000000 -0500
140+++ mysql-4.1.22/configure.in 2008-09-18 12:54:00.000000000 -0500
141@@ -236,8 +236,6 @@ then
142 else
143 AC_PATH_PROG(AS, as, as)
144 fi
145-# Still need ranlib for readline; local static use only so no libtool.
146-AC_PROG_RANLIB
147 # We use libtool
148 #AC_LIBTOOL_WIN32_DLL
149 AC_PROG_LIBTOOL
150@@ -258,44 +256,7 @@ AC_PROG_YACC
151 AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
152 AC_CHECK_PROG(DVIS, tex, manual.dvi)
153
154-AC_MSG_CHECKING("return type of sprintf")
155-
156-#check the return type of sprintf
157-case $SYSTEM_TYPE in
158- *netware*)
159- AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int")
160- ;;
161- *)
162-AC_TRY_RUN([
163- int main()
164- {
165- char* s = "hello";
166- char buf[6];
167- if((int)sprintf(buf, s) == strlen(s))
168- return 0;
169-
170- return -1;
171- }
172- ],
173- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
174- AC_MSG_RESULT("int")],
175- [AC_TRY_RUN([
176- int main()
177- {
178- char* s = "hello";
179- char buf[6];
180- if((char*)sprintf(buf,s) == buf + strlen(s))
181- return 0;
182- return -1;
183- } ],
184- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
185- AC_MSG_RESULT("ptr")],
186- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
187- AC_MSG_RESULT("garbage")])
188- ])
189- ;;
190-esac
191-
192+MYSQL_SPRINTF_RET
193
194 # option, cache_name, variable,
195 # code to execute if yes, code to exectute if fail
196@@ -878,47 +839,7 @@ struct request_info *req;
197 AC_SUBST(WRAPLIBS)
198
199 if test "$TARGET_LINUX" = "true"; then
200- AC_MSG_CHECKING([for atomic operations])
201-
202- AC_LANG_SAVE
203- AC_LANG_CPLUSPLUS
204-
205- atom_ops=
206- AC_TRY_RUN([
207-#include <asm/atomic.h>
208-int main()
209-{
210- atomic_t v;
211-
212- atomic_set(&v, 23);
213- atomic_add(5, &v);
214- return atomic_read(&v) == 28 ? 0 : -1;
215-}
216- ],
217- [AC_DEFINE([HAVE_ATOMIC_ADD], [1],
218- [atomic_add() from <asm/atomic.h> (Linux only)])
219- atom_ops="${atom_ops}atomic_add "],
220- )
221- AC_TRY_RUN([
222-#include <asm/atomic.h>
223-int main()
224-{
225- atomic_t v;
226-
227- atomic_set(&v, 23);
228- atomic_sub(5, &v);
229- return atomic_read(&v) == 18 ? 0 : -1;
230-}
231- ],
232- [AC_DEFINE([HAVE_ATOMIC_SUB], [1],
233- [atomic_sub() from <asm/atomic.h> (Linux only)])
234- atom_ops="${atom_ops}atomic_sub "],
235- )
236-
237- if test -z "$atom_ops"; then atom_ops="no"; fi
238- AC_MSG_RESULT($atom_ops)
239-
240- AC_LANG_RESTORE
241+ MYSQL_FUNC_ATOMIC
242
243 AC_ARG_WITH(pstack,
244 [ --with-pstack Use the pstack backtrace library],
245@@ -971,13 +892,13 @@ fi
246 # Later in this script LIBS will be augmented with a threads library.
247 NON_THREADED_LIBS="$LIBS"
248
249-AC_MSG_CHECKING([for int8])
250+AC_CACHE_CHECK([for int8], [mysql_cv_type_int8], [
251 case $SYSTEM_TYPE in
252 *netware)
253 AC_MSG_RESULT([no])
254 ;;
255 *)
256-AC_TRY_RUN([
257+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
258 #ifdef HAVE_STDLIB_H
259 #include <stdlib.h>
260 #endif
261@@ -988,22 +909,21 @@ AC_TRY_RUN([
262
263 #ifdef HAVE_SYS_TYPES_H
264 #include <sys/types.h>
265-#endif
266-
267+#endif]], [
268 int main()
269 {
270 int8 i;
271 return 0;
272-}
273-],
274-[AC_DEFINE([HAVE_INT_8_16_32], [1],
275- [whether int8, int16 and int32 types exist])
276-AC_MSG_RESULT([yes])],
277-[AC_MSG_RESULT([no])]
278-)
279+}])], [mysql_cv_type_int8=yes], [mysql_cv_type_int8=no])
280 ;;
281 esac
282
283+if test x"$mysql_cv_type_int8" = "xyes"; then
284+ AC_DEFINE([HAVE_INT_8_16_32], [1],
285+ [whether int8, int16 and int32 types exist])
286+fi
287+])
288+
289 #
290 # Some system specific hacks
291 #
292@@ -1814,7 +1734,7 @@ then
293 AC_MSG_ERROR("MySQL needs a long long type.")
294 fi
295 # off_t is not a builtin type
296-MYSQL_CHECK_SIZEOF(off_t, 4)
297+AC_CHECK_SIZEOF(off_t, 4)
298 if test "$ac_cv_sizeof_off_t" -eq 0
299 then
300 AC_MSG_ERROR("MySQL needs a off_t type.")
301diff -aurp mysql-4.1.22.old/innobase/configure.in mysql-4.1.22/innobase/configure.in
302--- mysql-4.1.22.old/innobase/configure.in 2008-09-18 13:00:14.000000000 -0500
303+++ mysql-4.1.22/innobase/configure.in 2008-09-18 12:55:39.000000000 -0500
304@@ -3,6 +3,7 @@ AC_INIT
305 AC_CANONICAL_SYSTEM
306 AM_MAINTAINER_MODE
307 AM_CONFIG_HEADER(ib_config.h)
308+AC_CONFIG_AUX_DIR([..])
309 AM_INIT_AUTOMAKE(ib, 0.90)
310
311 # This is need before AC_PROG_CC
312@@ -32,7 +33,6 @@ CFLAGS="$CFLAGS "
313 CXXFLAGS="$CXXFLAGS "
314
315 AC_PROG_CC
316-AC_PROG_RANLIB
317 AC_PROG_INSTALL
318 AC_PROG_LIBTOOL
319 AC_CHECK_HEADERS(aio.h sched.h)
diff --git a/meta-oe/recipes-support/mysql/files/my.cnf b/meta-oe/recipes-support/mysql/files/my.cnf
deleted file mode 100644
index 85560ebf5..000000000
--- a/meta-oe/recipes-support/mysql/files/my.cnf
+++ /dev/null
@@ -1,21 +0,0 @@
1[client]
2#password = password
3port = 3306
4socket = /tmp/mysql.sock
5
6[mysqld_safe]
7err-log = /var/log/mysql.err
8
9[mysqld]
10user = mysql
11port = 3306
12socket = /tmp/mysql.sock
13pid-file = /var/lib/mysql/mysqld.pid
14log-error = /var/log/mysqld.err
15basedir = /usr
16datadir = /var/mysql
17skip-locking
18skip-innodb
19skip-networking
20bind-address = localhost
21
diff --git a/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
index dcaf0c69c..19cc33baf 100644
--- a/meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb
+++ b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
@@ -1,9 +1,5 @@
1require mysql5_${PV}.inc 1require mariadb_${PV}.inc
2inherit native 2inherit native
3PR ="r3"
4
5SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \
6 file://fix-abi-check-gcc45.patch"
7 3
8RDEPENDS_${PN} = "" 4RDEPENDS_${PN} = ""
9PACKAGES = "" 5PACKAGES = ""
@@ -20,5 +16,3 @@ do_install() {
20 install -m 0755 sql/gen_lex_hash ${D}${bindir}/ 16 install -m 0755 sql/gen_lex_hash ${D}${bindir}/
21} 17}
22 18
23SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad"
24SRC_URI[sha256sum] = "2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432"
diff --git a/meta-oe/recipes-support/mysql/mysql5/Makefile.am.patch b/meta-oe/recipes-support/mysql/mariadb/Makefile.am.patch
index 33fd17acd..33fd17acd 100644
--- a/meta-oe/recipes-support/mysql/mysql5/Makefile.am.patch
+++ b/meta-oe/recipes-support/mysql/mariadb/Makefile.am.patch
diff --git a/meta-oe/recipes-support/mysql/files/configure-ps-cache-check.patch b/meta-oe/recipes-support/mysql/mariadb/configure-ps-cache-check.patch
index 3b5b3fd06..3b5b3fd06 100644
--- a/meta-oe/recipes-support/mysql/files/configure-ps-cache-check.patch
+++ b/meta-oe/recipes-support/mysql/mariadb/configure-ps-cache-check.patch
diff --git a/meta-oe/recipes-support/mysql/mariadb/configure.in.patch b/meta-oe/recipes-support/mysql/mariadb/configure.in.patch
new file mode 100644
index 000000000..6fe2dfaa1
--- /dev/null
+++ b/meta-oe/recipes-support/mysql/mariadb/configure.in.patch
@@ -0,0 +1,13 @@
1Index: mysql-5.1.40/configure.in
2===================================================================
3--- mysql-5.1.40.orig/configure.in
4+++ mysql-5.1.40/configure.in
5@@ -226,8 +226,6 @@ else
6 AC_PATH_PROG(AS, as, as)
7 fi
8
9-# Still need ranlib for readline; local static use only so no libtool.
10-AC_PROG_RANLIB
11 # We use libtool
12 #AC_LIBTOOL_WIN32_DLL
13 AC_PROG_LIBTOOL
diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-1.patch b/meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-1.patch
new file mode 100644
index 000000000..df2e7086c
--- /dev/null
+++ b/meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-1.patch
@@ -0,0 +1,174 @@
1From 24404044ad4c28026e400e1fcd85358f2060aa96 Mon Sep 17 00:00:00 2001
2From: Alexey Botchkov <holyfoot@askmonty.org>
3Date: Sun, 10 Mar 2013 23:08:05 +0400
4Subject: [PATCH] MDEV-4252 geometry query crashes server. The bug was
5 found by Alyssa Milburn. If the number of points of a geometry feature
6 read from binary representation is greater than 0x10000000, then
7 the (uint32) (num_points * 16) will cut the higher byte, which leads to
8 various errors. Fixed by additional check if (num_points >
9 max_n_points).
10
11Upstream-Status: Backport
12Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
13
14---
15 mysql-test/r/gis.result | 3 +++
16 mysql-test/t/gis.test | 1 +
17 sql/spatial.cc | 27 ++++++++++++++++++---------
18 sql/spatial.h | 9 +++++----
19 4 files changed, 27 insertions(+), 13 deletions(-)
20
21diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
22index 8dad72f..69e73d0 100644
23--- a/mysql-test/r/gis.result
24+++ b/mysql-test/r/gis.result
25@@ -1087,4 +1087,7 @@ NULL
26 #
27 SELECT GEOMETRYCOLLECTION((SELECT @@OLD));
28 ERROR 22007: Illegal non geometric '' value found during parsing
29+select astext(0x0100000000030000000100000000000010);
30+astext(0x0100000000030000000100000000000010)
31+NULL
32 End of 5.1 tests
33diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
34index abda3e9..cc5d158 100644
35--- a/mysql-test/t/gis.test
36+++ b/mysql-test/t/gis.test
37@@ -826,5 +826,6 @@ SELECT ISCLOSED(CONVERT(CONCAT(' ', 0x2), BINARY(20)));
38 --error ER_ILLEGAL_VALUE_FOR_TYPE
39 SELECT GEOMETRYCOLLECTION((SELECT @@OLD));
40
41+select astext(0x0100000000030000000100000000000010);
42
43 --echo End of 5.1 tests
44diff --git a/sql/spatial.cc b/sql/spatial.cc
45index eec028e..94d0238 100644
46--- a/sql/spatial.cc
47+++ b/sql/spatial.cc
48@@ -556,7 +556,7 @@ bool Gis_line_string::get_data_as_wkt(String *txt, const char **end) const
49 n_points= uint4korr(data);
50 data += 4;
51
52- if (n_points < 1 ||
53+ if (n_points < 1 || n_points > max_n_points ||
54 no_data(data, SIZEOF_STORED_DOUBLE * 2 * n_points) ||
55 txt->reserve(((MAX_DIGITS_IN_DOUBLE + 1)*2 + 1) * n_points))
56 return 1;
57@@ -594,7 +594,8 @@ int Gis_line_string::geom_length(double *len) const
58 return 1;
59 n_points= uint4korr(data);
60 data+= 4;
61- if (n_points < 1 || no_data(data, SIZEOF_STORED_DOUBLE * 2 * n_points))
62+ if (n_points < 1 || n_points > max_n_points ||
63+ no_data(data, SIZEOF_STORED_DOUBLE * 2 * n_points))
64 return 1;
65
66 get_point(&prev_x, &prev_y, data);
67@@ -628,7 +629,7 @@ int Gis_line_string::is_closed(int *closed) const
68 return 0;
69 }
70 data+= 4;
71- if (n_points == 0 ||
72+ if (n_points == 0 || n_points > max_n_points ||
73 no_data(data, SIZEOF_STORED_DOUBLE * 2 * n_points))
74 return 1;
75
76@@ -798,7 +799,8 @@ bool Gis_polygon::get_data_as_wkt(String *txt, const char **end) const
77 return 1;
78 n_points= uint4korr(data);
79 data+= 4;
80- if (no_data(data, (SIZEOF_STORED_DOUBLE*2) * n_points) ||
81+ if (n_points > max_n_points ||
82+ no_data(data, (SIZEOF_STORED_DOUBLE*2) * n_points) ||
83 txt->reserve(2 + ((MAX_DIGITS_IN_DOUBLE + 1) * 2 + 1) * n_points))
84 return 1;
85 txt->qs_append('(');
86@@ -852,7 +854,8 @@ int Gis_polygon::area(double *ar, const char **end_of_data) const
87 if (no_data(data, 4))
88 return 1;
89 n_points= uint4korr(data);
90- if (no_data(data, (SIZEOF_STORED_DOUBLE*2) * n_points))
91+ if (n_points > max_n_points ||
92+ no_data(data, (SIZEOF_STORED_DOUBLE*2) * n_points))
93 return 1;
94 get_point(&prev_x, &prev_y, data+4);
95 data+= (4+SIZEOF_STORED_DOUBLE*2);
96@@ -888,7 +891,8 @@ int Gis_polygon::exterior_ring(String *result) const
97 n_points= uint4korr(data);
98 data+= 4;
99 length= n_points * POINT_DATA_SIZE;
100- if (no_data(data, length) || result->reserve(1+4+4+ length))
101+ if (n_points > max_n_points ||
102+ no_data(data, length) || result->reserve(1+4+4+ length))
103 return 1;
104
105 result->q_append((char) wkb_ndr);
106@@ -973,7 +977,8 @@ int Gis_polygon::centroid_xy(double *x, double *y) const
107 return 1;
108 org_n_points= n_points= uint4korr(data);
109 data+= 4;
110- if (no_data(data, (SIZEOF_STORED_DOUBLE*2) * n_points))
111+ if (n_points > max_n_points ||
112+ no_data(data, (SIZEOF_STORED_DOUBLE*2) * n_points))
113 return 1;
114 get_point(&prev_x, &prev_y, data);
115 data+= (SIZEOF_STORED_DOUBLE*2);
116@@ -1260,7 +1265,8 @@ bool Gis_multi_line_string::get_data_as_wkt(String *txt,
117 return 1;
118 n_points= uint4korr(data + WKB_HEADER_SIZE);
119 data+= WKB_HEADER_SIZE + 4;
120- if (no_data(data, n_points * (SIZEOF_STORED_DOUBLE*2)) ||
121+ if (n_points > max_n_points ||
122+ no_data(data, n_points * (SIZEOF_STORED_DOUBLE*2)) ||
123 txt->reserve(2 + ((MAX_DIGITS_IN_DOUBLE + 1) * 2 + 1) * n_points))
124 return 1;
125 txt->qs_append('(');
126@@ -1521,7 +1527,8 @@ bool Gis_multi_polygon::get_data_as_wkt(String *txt, const char **end) const
127 return 1;
128 uint32 n_points= uint4korr(data);
129 data+= 4;
130- if (no_data(data, (SIZEOF_STORED_DOUBLE * 2) * n_points) ||
131+ if (n_points > max_n_points ||
132+ no_data(data, (SIZEOF_STORED_DOUBLE * 2) * n_points) ||
133 txt->reserve(2 + ((MAX_DIGITS_IN_DOUBLE + 1) * 2 + 1) * n_points,
134 512))
135 return 1;
136@@ -1604,6 +1611,8 @@ int Gis_multi_polygon::geometry_n(uint32 num, String *result) const
137 if (no_data(data, 4))
138 return 1;
139 n_points= uint4korr(data);
140+ if (n_points > max_n_points)
141+ return 1;
142 data+= 4 + POINT_DATA_SIZE * n_points;
143 }
144 } while (--num);
145diff --git a/sql/spatial.h b/sql/spatial.h
146index 20b3856..7d25425 100644
147--- a/sql/spatial.h
148+++ b/sql/spatial.h
149@@ -197,6 +197,11 @@ struct MBR
150 class Geometry
151 {
152 public:
153+ // Maximum number of points in feature that can fit into String
154+ static const uint32 max_n_points=
155+ (uint32) (UINT_MAX32 - WKB_HEADER_SIZE - 4 /* n_points */) /
156+ POINT_DATA_SIZE;
157+public:
158 Geometry() {} /* Remove gcc warning */
159 virtual ~Geometry() {} /* Remove gcc warning */
160 static void *operator new(size_t size, void *buffer)
161@@ -379,10 +384,6 @@ class Gis_point: public Geometry
162
163 class Gis_line_string: public Geometry
164 {
165- // Maximum number of points in LineString that can fit into String
166- static const uint32 max_n_points=
167- (uint32) (UINT_MAX32 - WKB_HEADER_SIZE - 4 /* n_points */) /
168- POINT_DATA_SIZE;
169 public:
170 Gis_line_string() {} /* Remove gcc warning */
171 virtual ~Gis_line_string() {} /* Remove gcc warning */
172--
1731.8.1.6
174
diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-2.patch b/meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-2.patch
new file mode 100644
index 000000000..c35cdfb64
--- /dev/null
+++ b/meta-oe/recipes-support/mysql/mariadb/fix-cve-2013-1861-2.patch
@@ -0,0 +1,257 @@
1From 9f714cdd3bf4bd8ee06cd38dcd2c6e8990a4ec48 Mon Sep 17 00:00:00 2001
2From: Alexey Botchkov <holyfoot@askmonty.org>
3Date: Mon, 18 Mar 2013 17:58:00 +0400
4Subject: [PATCH] MDEV-4252 geometry query crashes server. Additional fixes
5 for possible overflows in length-related calculations in 'spatial'
6 implementations. Checks added to the ::get_data_size() methods.
7 max_n_points decreased to occupy less 2G size. An object of that size is
8 practically inoperable anyway.
9
10Upstream-Status: Backport
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12
13---
14 mysql-test/r/gis.result | 12 +++++++++
15 mysql-test/t/gis.test | 6 +++++
16 sql/spatial.cc | 67 ++++++++++++++++++++++++++++++++++---------------
17 sql/spatial.h | 2 +-
18 4 files changed, 66 insertions(+), 21 deletions(-)
19
20diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result
21index 69e73d0..7566f0b 100644
22--- a/mysql-test/r/gis.result
23+++ b/mysql-test/r/gis.result
24@@ -1087,7 +1087,19 @@ NULL
25 #
26 SELECT GEOMETRYCOLLECTION((SELECT @@OLD));
27 ERROR 22007: Illegal non geometric '' value found during parsing
28+#
29+# MDEV-4252 geometry query crashes server
30+#
31 select astext(0x0100000000030000000100000000000010);
32 astext(0x0100000000030000000100000000000010)
33 NULL
34+select envelope(0x0100000000030000000100000000000010);
35+envelope(0x0100000000030000000100000000000010)
36+NULL
37+select geometryn(0x0100000000070000000100000001030000000200000000000000ffff0000, 1);
38+geometryn(0x0100000000070000000100000001030000000200000000000000ffff0000, 1)
39+NULL
40+select geometryn(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1);
41+geometryn(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1)
42+NULL
43 End of 5.1 tests
44diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test
45index cc5d158..c42541e 100644
46--- a/mysql-test/t/gis.test
47+++ b/mysql-test/t/gis.test
48@@ -826,6 +826,12 @@ SELECT ISCLOSED(CONVERT(CONCAT(' ', 0x2), BINARY(20)));
49 --error ER_ILLEGAL_VALUE_FOR_TYPE
50 SELECT GEOMETRYCOLLECTION((SELECT @@OLD));
51
52+--echo #
53+--echo # MDEV-4252 geometry query crashes server
54+--echo #
55 select astext(0x0100000000030000000100000000000010);
56+select envelope(0x0100000000030000000100000000000010);
57+select geometryn(0x0100000000070000000100000001030000000200000000000000ffff0000, 1);
58+select geometryn(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1);
59
60 --echo End of 5.1 tests
61diff --git a/sql/spatial.cc b/sql/spatial.cc
62index 94d0238..5a4b768 100644
63--- a/sql/spatial.cc
64+++ b/sql/spatial.cc
65@@ -394,18 +394,19 @@ const char *Geometry::append_points(String *txt, uint32 n_points,
66 const char *Geometry::get_mbr_for_points(MBR *mbr, const char *data,
67 uint offset) const
68 {
69- uint32 points;
70+ uint32 n_points;
71 /* read number of points */
72 if (no_data(data, 4))
73 return 0;
74- points= uint4korr(data);
75+ n_points= uint4korr(data);
76 data+= 4;
77
78- if (no_data(data, (SIZEOF_STORED_DOUBLE * 2 + offset) * points))
79+ if (n_points > max_n_points ||
80+ no_data(data, (POINT_DATA_SIZE + offset) * n_points))
81 return 0;
82
83 /* Calculate MBR for points */
84- while (points--)
85+ while (n_points--)
86 {
87 data+= offset;
88 mbr->add_xy(data, data + SIZEOF_STORED_DOUBLE);
89@@ -484,9 +485,12 @@ const Geometry::Class_info *Gis_point::get_class_info() const
90
91 uint32 Gis_line_string::get_data_size() const
92 {
93- if (no_data(m_data, 4))
94+ uint32 n_points, size;
95+ if (no_data(m_data, 4) ||
96+ (n_points= uint4korr(m_data)) > max_n_points ||
97+ no_data(m_data, (size= 4 + n_points * POINT_DATA_SIZE)))
98 return GET_SIZE_ERROR;
99- return 4 + uint4korr(m_data) * POINT_DATA_SIZE;
100+ return size;
101 }
102
103
104@@ -665,6 +669,9 @@ int Gis_line_string::end_point(String *result) const
105 if (no_data(m_data, 4))
106 return 1;
107 n_points= uint4korr(m_data);
108+ if (n_points == 0 || n_points > max_n_points ||
109+ no_data(m_data, POINT_DATA_SIZE * n_points))
110+ return 1;
111 return create_point(result, m_data + 4 + (n_points - 1) * POINT_DATA_SIZE);
112 }
113
114@@ -674,11 +681,14 @@ int Gis_line_string::point_n(uint32 num, String *result) const
115 uint32 n_points;
116 if (no_data(m_data, 4))
117 return 1;
118+ num--;
119 n_points= uint4korr(m_data);
120- if ((uint32) (num - 1) >= n_points) // means (num > n_points || num < 1)
121+ if (num >= n_points ||
122+ num > max_n_points || // means (num > n_points || num < 1)
123+ no_data(m_data, num * POINT_DATA_SIZE))
124 return 1;
125
126- return create_point(result, m_data + 4 + (num - 1) * POINT_DATA_SIZE);
127+ return create_point(result, m_data + 4 + num*POINT_DATA_SIZE);
128 }
129
130 const Geometry::Class_info *Gis_line_string::get_class_info() const
131@@ -692,6 +702,7 @@ const Geometry::Class_info *Gis_line_string::get_class_info() const
132 uint32 Gis_polygon::get_data_size() const
133 {
134 uint32 n_linear_rings;
135+ uint32 n_points;
136 const char *data= m_data;
137
138 if (no_data(data, 4))
139@@ -701,10 +712,13 @@ uint32 Gis_polygon::get_data_size() const
140
141 while (n_linear_rings--)
142 {
143- if (no_data(data, 4))
144+ if (no_data(data, 4) ||
145+ (n_points= uint4korr(data)) > max_n_points)
146 return GET_SIZE_ERROR;
147- data+= 4 + uint4korr(data)*POINT_DATA_SIZE;
148+ data+= 4 + n_points*POINT_DATA_SIZE;
149 }
150+ if (no_data(data, 0))
151+ return GET_SIZE_ERROR;
152 return (uint32) (data - m_data);
153 }
154
155@@ -1037,9 +1051,14 @@ const Geometry::Class_info *Gis_polygon::get_class_info() const
156
157 uint32 Gis_multi_point::get_data_size() const
158 {
159- if (no_data(m_data, 4))
160- return GET_SIZE_ERROR;
161- return 4 + uint4korr(m_data)*(POINT_DATA_SIZE + WKB_HEADER_SIZE);
162+ uint32 n_points;
163+ uint32 size;
164+
165+ if (no_data(m_data, 4) ||
166+ (n_points= uint4korr(m_data)) > max_n_points ||
167+ no_data(m_data, (size= 4 + n_points*(POINT_DATA_SIZE + WKB_HEADER_SIZE))))
168+ return GET_SIZE_ERROR;
169+ return size;
170 }
171
172
173@@ -1107,7 +1126,8 @@ bool Gis_multi_point::get_data_as_wkt(String *txt, const char **end) const
174 return 1;
175
176 n_points= uint4korr(m_data);
177- if (no_data(m_data+4,
178+ if (n_points > max_n_points ||
179+ no_data(m_data+4,
180 n_points * (SIZEOF_STORED_DOUBLE * 2 + WKB_HEADER_SIZE)) ||
181 txt->reserve(((MAX_DIGITS_IN_DOUBLE + 1) * 2 + 1) * n_points))
182 return 1;
183@@ -1160,6 +1180,7 @@ const Geometry::Class_info *Gis_multi_point::get_class_info() const
184 uint32 Gis_multi_line_string::get_data_size() const
185 {
186 uint32 n_line_strings;
187+ uint32 n_points;
188 const char *data= m_data;
189
190 if (no_data(data, 4))
191@@ -1169,11 +1190,13 @@ uint32 Gis_multi_line_string::get_data_size() const
192
193 while (n_line_strings--)
194 {
195- if (no_data(data, WKB_HEADER_SIZE + 4))
196+ if (no_data(data, WKB_HEADER_SIZE + 4) ||
197+ (n_points= uint4korr(data + WKB_HEADER_SIZE)) > max_n_points)
198 return GET_SIZE_ERROR;
199- data+= (WKB_HEADER_SIZE + 4 + uint4korr(data + WKB_HEADER_SIZE) *
200- POINT_DATA_SIZE);
201+ data+= (WKB_HEADER_SIZE + 4 + n_points*POINT_DATA_SIZE);
202 }
203+ if (no_data(data, 0))
204+ return GET_SIZE_ERROR;
205 return (uint32) (data - m_data);
206 }
207
208@@ -1327,7 +1350,7 @@ int Gis_multi_line_string::geometry_n(uint32 num, String *result) const
209 return 1;
210 n_points= uint4korr(data + WKB_HEADER_SIZE);
211 length= WKB_HEADER_SIZE + 4+ POINT_DATA_SIZE * n_points;
212- if (no_data(data, length))
213+ if (n_points > max_n_points || no_data(data, length))
214 return 1;
215 if (!--num)
216 break;
217@@ -1407,6 +1430,7 @@ const Geometry::Class_info *Gis_multi_line_string::get_class_info() const
218 uint32 Gis_multi_polygon::get_data_size() const
219 {
220 uint32 n_polygons;
221+ uint32 n_points;
222 const char *data= m_data;
223
224 if (no_data(data, 4))
225@@ -1425,11 +1449,14 @@ uint32 Gis_multi_polygon::get_data_size() const
226
227 while (n_linear_rings--)
228 {
229- if (no_data(data, 4))
230+ if (no_data(data, 4) ||
231+ (n_points= uint4korr(data)) > max_n_points)
232 return GET_SIZE_ERROR;
233- data+= 4 + uint4korr(data) * POINT_DATA_SIZE;
234+ data+= 4 + n_points * POINT_DATA_SIZE;
235 }
236 }
237+ if (no_data(data, 0))
238+ return GET_SIZE_ERROR;
239 return (uint32) (data - m_data);
240 }
241
242diff --git a/sql/spatial.h b/sql/spatial.h
243index 7d25425..d7632c1 100644
244--- a/sql/spatial.h
245+++ b/sql/spatial.h
246@@ -199,7 +199,7 @@ class Geometry
247 public:
248 // Maximum number of points in feature that can fit into String
249 static const uint32 max_n_points=
250- (uint32) (UINT_MAX32 - WKB_HEADER_SIZE - 4 /* n_points */) /
251+ (uint32) (INT_MAX32 - WKB_HEADER_SIZE - 4 /* n_points */) /
252 POINT_DATA_SIZE;
253 public:
254 Geometry() {} /* Remove gcc warning */
255--
2561.8.1.6
257
diff --git a/meta-oe/recipes-support/mysql/files/fix_host_path.patch b/meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch
index 4f69cd519..4f69cd519 100644
--- a/meta-oe/recipes-support/mysql/files/fix_host_path.patch
+++ b/meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch
diff --git a/meta-oe/recipes-support/mysql/mysql5/misc.m4.patch b/meta-oe/recipes-support/mysql/mariadb/misc.m4.patch
index 7b0acff21..7b0acff21 100644
--- a/meta-oe/recipes-support/mysql/mysql5/misc.m4.patch
+++ b/meta-oe/recipes-support/mysql/mariadb/misc.m4.patch
diff --git a/meta-oe/recipes-support/mysql/mysql5/my.cnf b/meta-oe/recipes-support/mysql/mariadb/my.cnf
index 7f557e425..84708170a 100644
--- a/meta-oe/recipes-support/mysql/mysql5/my.cnf
+++ b/meta-oe/recipes-support/mysql/mariadb/my.cnf
@@ -15,7 +15,7 @@ log-error = /var/log/mysqld.err
15basedir = /usr 15basedir = /usr
16datadir = /var/mysql 16datadir = /var/mysql
17skip-locking 17skip-locking
18loose-skip-innodb
19skip-networking 18skip-networking
19ignore-builtin-innodb
20bind-address = localhost 20bind-address = localhost
21 21
diff --git a/meta-oe/recipes-support/mysql/files/mysqld.sh b/meta-oe/recipes-support/mysql/mariadb/mysqld.sh
index 479ebdb25..479ebdb25 100644
--- a/meta-oe/recipes-support/mysql/files/mysqld.sh
+++ b/meta-oe/recipes-support/mysql/mariadb/mysqld.sh
diff --git a/meta-oe/recipes-support/mysql/mariadb/plug.in.patch b/meta-oe/recipes-support/mysql/mariadb/plug.in.patch
new file mode 100644
index 000000000..156fd1082
--- /dev/null
+++ b/meta-oe/recipes-support/mysql/mariadb/plug.in.patch
@@ -0,0 +1,405 @@
1diff --git a/storage/innodb_plugin/plug.in b/storage/innodb_plugin/plug.in
2index 7650251..3cc22c5 100644
3--- a/storage/innodb_plugin/plug.in
4+++ b/storage/innodb_plugin/plug.in
5@@ -56,180 +56,10 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
6 esac
7 AC_SUBST(INNODB_DYNAMIC_CFLAGS)
8
9- AC_MSG_CHECKING(whether GCC atomic builtins are available)
10- # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
11- AC_TRY_RUN(
12- [
13- int main()
14- {
15- long x;
16- long y;
17- long res;
18- char c;
19-
20- x = 10;
21- y = 123;
22- res = __sync_bool_compare_and_swap(&x, x, y);
23- if (!res || x != y) {
24- return(1);
25- }
26-
27- x = 10;
28- y = 123;
29- res = __sync_bool_compare_and_swap(&x, x + 1, y);
30- if (res || x != 10) {
31- return(1);
32- }
33-
34- x = 10;
35- y = 123;
36- res = __sync_add_and_fetch(&x, y);
37- if (res != 123 + 10 || x != 123 + 10) {
38- return(1);
39- }
40-
41- c = 10;
42- res = __sync_lock_test_and_set(&c, 123);
43- if (res != 10 || c != 123) {
44- return(1);
45- }
46-
47- return(0);
48- }
49- ],
50- [
51- AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
52- [GCC atomic builtins are available])
53- AC_MSG_RESULT(yes)
54- ],
55- [
56- AC_MSG_RESULT(no)
57- ]
58- )
59-
60- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
61- # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
62- AC_TRY_RUN(
63- [
64- #include <pthread.h>
65- #include <string.h>
66-
67- int main(int argc, char** argv) {
68- pthread_t x1;
69- pthread_t x2;
70- pthread_t x3;
71-
72- memset(&x1, 0x0, sizeof(x1));
73- memset(&x2, 0x0, sizeof(x2));
74- memset(&x3, 0x0, sizeof(x3));
75-
76- __sync_bool_compare_and_swap(&x1, x2, x3);
77-
78- return(0);
79- }
80- ],
81- [
82- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
83- [pthread_t can be used by GCC atomic builtins])
84- AC_MSG_RESULT(yes)
85- ],
86- [
87- AC_MSG_RESULT(no)
88- ]
89- )
90-
91- AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
92- # Define HAVE_IB_SOLARIS_ATOMICS if _all_ of the following
93- # functions are present.
94- AC_CHECK_FUNCS(atomic_add_long_nv \
95- atomic_cas_32 \
96- atomic_cas_64 \
97- atomic_cas_ulong \
98- atomic_swap_uchar)
99-
100- if test "${ac_cv_func_atomic_add_long_nv}" = "yes" -a \
101- "${ac_cv_func_atomic_cas_32}" = "yes" -a \
102- "${ac_cv_func_atomic_cas_64}" = "yes" -a \
103- "${ac_cv_func_atomic_cas_ulong}" = "yes" -a \
104- "${ac_cv_func_atomic_swap_uchar}" = "yes" ; then
105-
106- AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
107- [Define to 1 if Solaris libc atomic functions are available]
108- )
109- fi
110-
111- AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
112- # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
113- AC_TRY_RUN(
114- [
115- #include <pthread.h>
116- #include <string.h>
117-
118- int main(int argc, char** argv) {
119- pthread_t x1;
120- pthread_t x2;
121- pthread_t x3;
122-
123- memset(&x1, 0x0, sizeof(x1));
124- memset(&x2, 0x0, sizeof(x2));
125- memset(&x3, 0x0, sizeof(x3));
126-
127- if (sizeof(pthread_t) == 4) {
128-
129- atomic_cas_32(&x1, x2, x3);
130-
131- } else if (sizeof(pthread_t) == 8) {
132-
133- atomic_cas_64(&x1, x2, x3);
134-
135- } else {
136-
137- return(1);
138- }
139-
140- return(0);
141- }
142- ],
143- [
144- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1],
145- [pthread_t can be used by solaris atomics])
146- AC_MSG_RESULT(yes)
147- ],
148- [
149- AC_MSG_RESULT(no)
150- ]
151- )
152-
153 # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
154 # to use in the source
155 AC_CHECK_SIZEOF([pthread_t], [], [#include <pthread.h>])
156
157- # Check for x86 PAUSE instruction
158- AC_MSG_CHECKING(for x86 PAUSE instruction)
159- # We have to actually try running the test program, because of a bug
160- # in Solaris on x86_64, where it wrongly reports that PAUSE is not
161- # supported when trying to run an application. See
162- # http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684
163- # We use ib_ prefix to avoid collisoins if this code is added to
164- # mysql's configure.in.
165- AC_TRY_RUN(
166- [
167- int main() {
168- __asm__ __volatile__ ("pause");
169- return(0);
170- }
171- ],
172- [
173- AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist])
174- AC_MSG_RESULT(yes)
175- ],
176- [
177- AC_MSG_RESULT(no)
178- ],
179- [
180- AC_MSG_RESULT(no)
181- ]
182- )
183 ])
184
185 # vim: set ft=config:
186diff --git a/storage/xtradb/plug.in b/storage/xtradb/plug.in
187index 3fadacc..a33f4dc 100644
188--- a/storage/xtradb/plug.in
189+++ b/storage/xtradb/plug.in
190@@ -56,215 +56,10 @@ MYSQL_PLUGIN_ACTIONS(xtradb, [
191 esac
192 AC_SUBST(INNODB_DYNAMIC_CFLAGS)
193
194- AC_MSG_CHECKING(whether GCC atomic builtins are available)
195- # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
196- AC_TRY_RUN(
197- [
198- int main()
199- {
200- long x;
201- long y;
202- long res;
203- char c;
204-
205- x = 10;
206- y = 123;
207- res = __sync_bool_compare_and_swap(&x, x, y);
208- if (!res || x != y) {
209- return(1);
210- }
211-
212- x = 10;
213- y = 123;
214- res = __sync_bool_compare_and_swap(&x, x + 1, y);
215- if (res || x != 10) {
216- return(1);
217- }
218-
219- x = 10;
220- y = 123;
221- res = __sync_add_and_fetch(&x, y);
222- if (res != 123 + 10 || x != 123 + 10) {
223- return(1);
224- }
225-
226- c = 10;
227- res = __sync_lock_test_and_set(&c, 123);
228- if (res != 10 || c != 123) {
229- return(1);
230- }
231- return(0);
232- }
233- ],
234- [
235- AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
236- [GCC atomic builtins are available])
237- AC_MSG_RESULT(yes)
238- ],
239- [
240- AC_MSG_RESULT(no)
241- ]
242- )
243-
244- AC_MSG_CHECKING(whether GCC 64-bit atomic builtins are available)
245- # either define HAVE_IB_GCC_ATOMIC_BUILTINS_64 or not
246- AC_TRY_RUN(
247- [
248- #include <stdint.h>
249- int main()
250- {
251- int64_t x, y, res;
252-
253- x = 10;
254- y = 123;
255- res = __sync_bool_compare_and_swap(&x, x, y);
256- if (!res || x != y) {
257- return(1);
258- }
259-
260- x = 10;
261- y = 123;
262- res = __sync_add_and_fetch(&x, y);
263- if (res != 123 + 10 || x != 123 + 10) {
264- return(1);
265- }
266-
267- return(0);
268- }
269- ],
270- [
271- AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS_64], [1],
272- [GCC 64-bit atomic builtins are available])
273- AC_MSG_RESULT(yes)
274- ],
275- [
276- AC_MSG_RESULT(no)
277- ]
278- )
279-
280- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
281- # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
282- AC_TRY_RUN(
283- [
284- #include <pthread.h>
285- #include <string.h>
286-
287- int main(int argc, char** argv) {
288- pthread_t x1;
289- pthread_t x2;
290- pthread_t x3;
291-
292- memset(&x1, 0x0, sizeof(x1));
293- memset(&x2, 0x0, sizeof(x2));
294- memset(&x3, 0x0, sizeof(x3));
295-
296- __sync_bool_compare_and_swap(&x1, x2, x3);
297-
298- return(0);
299- }
300- ],
301- [
302- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
303- [pthread_t can be used by GCC atomic builtins])
304- AC_MSG_RESULT(yes)
305- ],
306- [
307- AC_MSG_RESULT(no)
308- ]
309- )
310-
311- AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
312- # Define HAVE_IB_SOLARIS_ATOMICS if _all_ of the following
313- # functions are present.
314- AC_CHECK_FUNCS(atomic_add_long_nv \
315- atomic_cas_32 \
316- atomic_cas_64 \
317- atomic_cas_ulong \
318- atomic_swap_uchar)
319-
320- if test "${ac_cv_func_atomic_add_long_nv}" = "yes" -a \
321- "${ac_cv_func_atomic_cas_32}" = "yes" -a \
322- "${ac_cv_func_atomic_cas_64}" = "yes" -a \
323- "${ac_cv_func_atomic_cas_ulong}" = "yes" -a \
324- "${ac_cv_func_atomic_swap_uchar}" = "yes" ; then
325-
326- AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
327- [Define to 1 if Solaris libc atomic functions are available]
328- )
329- fi
330-
331- AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
332- # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
333- AC_TRY_RUN(
334- [
335- #include <pthread.h>
336- #include <string.h>
337-
338- int main(int argc, char** argv) {
339- pthread_t x1;
340- pthread_t x2;
341- pthread_t x3;
342-
343- memset(&x1, 0x0, sizeof(x1));
344- memset(&x2, 0x0, sizeof(x2));
345- memset(&x3, 0x0, sizeof(x3));
346-
347- if (sizeof(pthread_t) == 4) {
348-
349- atomic_cas_32(&x1, x2, x3);
350-
351- } else if (sizeof(pthread_t) == 8) {
352-
353- atomic_cas_64(&x1, x2, x3);
354-
355- } else {
356-
357- return(1);
358- }
359-
360- return(0);
361- }
362- ],
363- [
364- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1],
365- [pthread_t can be used by solaris atomics])
366- AC_MSG_RESULT(yes)
367- ],
368- [
369- AC_MSG_RESULT(no)
370- ]
371- )
372-
373 # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
374 # to use in the source
375 AC_CHECK_SIZEOF([pthread_t], [], [#include <pthread.h>])
376
377- # Check for x86 PAUSE instruction
378- AC_MSG_CHECKING(for x86 PAUSE instruction)
379- # We have to actually try running the test program, because of a bug
380- # in Solaris on x86_64, where it wrongly reports that PAUSE is not
381- # supported when trying to run an application. See
382- # http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684
383- # We use ib_ prefix to avoid collisoins if this code is added to
384- # mysql's configure.in.
385- AC_TRY_RUN(
386- [
387- int main() {
388- __asm__ __volatile__ ("pause");
389- return(0);
390- }
391- ],
392- [
393- AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist])
394- AC_MSG_RESULT(yes)
395- ],
396- [
397- AC_MSG_RESULT(no)
398- ],
399- [
400- AC_MSG_RESULT(no)
401- ]
402- )
403 ])
404
405 # vim: set ft=config:
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
new file mode 100644
index 000000000..fdf20dcce
--- /dev/null
+++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
@@ -0,0 +1,14 @@
1require ${PN}_${PV}.inc
2
3DEPENDS += "mariadb-native"
4
5PROVIDES += "mysql5"
6
7RPROVIDES_${PN}-client = "mysql5-client"
8RREPLACES_${PN}-client = "mysql5-client"
9RCONFLICTS_${PN}-client = "mysql5-client"
10
11RPROVIDES_${PN}-server = "mysql5-server"
12RREPLACES_${PN}-server = "mysql5-server"
13RCONFLICTS_${PN}-server = "mysql5-server"
14
diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
index 1a38e9fb2..c535a416c 100644
--- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
+++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
@@ -1,38 +1,58 @@
1DESCRIPTION = "The MySQL Open Source Database System" 1SUMMARY = "A robust, scalable, and reliable SQL server"
2HOMEPAGE = "http://www.mysql.com/" 2HOMEPAGE = "http://mariadb.org"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=477ab0a4c8ca64b482b3f2a365d0fdfa" 5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
6 6
7DEPENDS = "ncurses zlib" 7DEPENDS = "ncurses zlib"
8PR = "r11"
9 8
10SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \ 9SRC_URI = "http://mirrors.coreix.net/mariadb/mariadb-${PV}/kvm-tarbake-jaunty-x86/mariadb-${PV}.tar.gz \
11 file://configure.in.patch \ 10 file://configure.in.patch \
12 file://plug.in.patch \ 11 file://plug.in.patch \
13 file://misc.m4.patch \ 12 file://misc.m4.patch \
14 file://Makefile.am.patch \ 13 file://Makefile.am.patch \
15 file://fix_host_path.patch \ 14 file://fix_host_path.patch \
16 file://configure-ps-cache-check.patch \ 15 file://configure-ps-cache-check.patch \
17 file://fix-abi-check-gcc45.patch \ 16 file://fix-cve-2013-1861-1.patch \
17 file://fix-cve-2013-1861-2.patch \
18 file://my.cnf \ 18 file://my.cnf \
19 file://mysqld.sh" 19 file://mysqld.sh"
20 20
21S = "${WORKDIR}/mysql-${PV}" 21SRC_URI[md5sum] = "44c331fa91943155e4796f89e17a0612"
22SRC_URI[sha256sum] = "33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8"
23
24S = "${WORKDIR}/mariadb-${PV}"
22 25
23BINCONFIG_GLOB = "mysql_config" 26BINCONFIG_GLOB = "mysql_config"
24 27
25inherit autotools binconfig update-rc.d 28inherit autotools binconfig update-rc.d useradd
26 29
27INITSCRIPT_PACKAGES = "${PN}-server" 30INITSCRIPT_PACKAGES = "${PN}-server"
28INITSCRIPT_NAME = "mysqld" 31INITSCRIPT_NAME = "mysqld"
29INITSCRIPT_PARAMS = "start 45 5 . stop 45 0 6 1 ." 32INITSCRIPT_PARAMS = "start 45 5 . stop 45 0 6 1 ."
30 33
34USERADD_PACKAGES = "${PN}-server"
35USERADD_PARAM_${PN}-server = "--system --home-dir /var/mysql -g nogroup mysql"
36
37
31export ac_cv_path_PS="/bin/ps" 38export ac_cv_path_PS="/bin/ps"
32export ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" 39export ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null"
33PARALLEL_MAKE = " " 40PARALLEL_MAKE = " "
34EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" 41EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
35EXTRA_OECONF = " --with-atomic-ops=up --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb --with-zlib-dir=${STAGING_EXECPREFIXDIR}" 42EXTRA_OECONF = "--with-atomic-ops=up \
43 --with-embedded-server \
44 --sysconfdir=/etc/mysql \
45 --localstatedir=/var/mysql \
46 --disable-dependency-tracking \
47 --without-debug \
48 --with-low-memory \
49 --without-query-cache \
50 --without-plugin-maria \
51 --without-man \
52 --without-docs \
53 --with-zlib-dir=${STAGING_EXECPREFIXDIR} \
54 --with-pic \
55 "
36 56
37do_configure_append() { 57do_configure_append() {
38 sed -i /comp_err/d ${S}/sql/share/Makefile 58 sed -i /comp_err/d ${S}/sql/share/Makefile
@@ -44,14 +64,14 @@ do_configure_append() {
44 sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysqld_safe.sh 64 sed -i -e "s:/libexec:/$libexecdir2:g" ${S}/scripts/mysqld_safe.sh
45} 65}
46 66
47SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess" 67SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess"
48 68
49# We need to append this so it runs *after* binconfig's preprocess function 69# We need to append this so it runs *after* binconfig's preprocess function
50# 70#
51# We really don't care exactly what the directories were set to originally. 71# We really don't care exactly what the directories were set to originally.
52# plugindir is not fixed, but we don't create any plugins. 72# plugindir is not fixed, but we don't create any plugins.
53# 73#
54mysql5_sysroot_preprocess () { 74mariadb_sysroot_preprocess () {
55 sed -i -es,^pkgincludedir=.*,pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config 75 sed -i -es,^pkgincludedir=.*,pkgincludedir=\'${STAGING_INCDIR}/mysql\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
56 sed -i -es,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config 76 sed -i -es,^pkglibdir=.*,pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
57} 77}
@@ -66,13 +86,11 @@ do_install() {
66 install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld 86 install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld
67} 87}
68 88
69pkg_postinst_mysql5-server () { 89pkg_postinst_${PN}-server () {
70 if [ "x$D" != "x" ]; then 90 if [ "x$D" != "x" ]; then
71 exit 1 91 exit 1
72 fi 92 fi
73 93
74 grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql
75
76 #Install the database 94 #Install the database
77 test -d /usr/bin || mkdir -p /usr/bin 95 test -d /usr/bin || mkdir -p /usr/bin
78 test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname 96 test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname
@@ -83,14 +101,10 @@ pkg_postinst_mysql5-server () {
83 101
84} 102}
85 103
86pkg_postrm_mysql5-server () {
87 grep mysql /etc/passwd && deluser mysql
88}
89
90PACKAGES = "${PN}-dbg ${PN} \ 104PACKAGES = "${PN}-dbg ${PN} \
91 libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ 105 libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \
92 libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ 106 libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \
93 ${PN}-client ${PN}-server ${PN}-leftovers" 107 libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-leftovers"
94CONFFILES_${PN}-server += "${sysconfdir}/my.cnf" 108CONFFILES_${PN}-server += "${sysconfdir}/my.cnf"
95 109
96FILES_${PN} = " " 110FILES_${PN} = " "
@@ -114,6 +128,11 @@ FILES_libmysqlclient-staticdev = "\
114FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \ 128FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \
115 /usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" 129 /usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process"
116 130
131# Avoid warnings about ha_xtradb.so.0.0.0 and ha_innodb_plugin.so.0.0.0
132# which are intentionally non-PIC on 32-bit x86 (see e.g.
133# storage/xtradb/plug.in in the source)
134INSANE_SKIP_libmysqlclient_append_i586 = " textrel"
135
117FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" 136FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*"
118FILES_libmysqlclient-r-dev = "\ 137FILES_libmysqlclient-r-dev = "\
119 ${libdir}/libmysqlclient_r.so \ 138 ${libdir}/libmysqlclient_r.so \
@@ -121,6 +140,11 @@ FILES_libmysqlclient-r-dev = "\
121FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" 140FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a"
122FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*" 141FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*"
123 142
143FILES_libmysqld = "\
144 ${libdir}/libmysqld.so.*"
145FILES_libmysqld-dev = "\
146 ${libdir}/libmysqld.so"
147
124FILES_${PN}-client = "\ 148FILES_${PN}-client = "\
125 ${bindir}/myisam_ftdump \ 149 ${bindir}/myisam_ftdump \
126 ${bindir}/mysql \ 150 ${bindir}/mysql \
diff --git a/meta-oe/recipes-support/mysql/mysql5/configure-ps-cache-check.patch b/meta-oe/recipes-support/mysql/mysql5/configure-ps-cache-check.patch
deleted file mode 100644
index 3b5b3fd06..000000000
--- a/meta-oe/recipes-support/mysql/mysql5/configure-ps-cache-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Index: mysql-4.1.22/configure.in
2===================================================================
3--- mysql-4.1.22.orig/configure.in 2009-01-28 16:33:28.000000000 +0000
4+++ mysql-4.1.22/configure.in 2009-01-28 16:43:26.000000000 +0000
5@@ -471,8 +471,8 @@
6
7 # Lock for PS
8 AC_PATH_PROG(PS, ps, ps)
9-AC_MSG_CHECKING("how to check if pid exists")
10-PS=$ac_cv_path_PS
11+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC],
12+[
13 # Linux style
14 if $PS p $$ 2> /dev/null | grep $0 > /dev/null
15 then
16@@ -511,8 +511,9 @@
17 AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
18 esac
19 fi
20-AC_SUBST(FIND_PROC)
21-AC_MSG_RESULT("$FIND_PROC")
22+ac_cv_FIND_PROC="$FIND_PROC"
23+])
24+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC])
25
26 # Check if a pid is valid
27 AC_PATH_PROG(KILL, kill, kill)
diff --git a/meta-oe/recipes-support/mysql/mysql5/configure.in.patch b/meta-oe/recipes-support/mysql/mysql5/configure.in.patch
deleted file mode 100644
index 3edc5f3c2..000000000
--- a/meta-oe/recipes-support/mysql/mysql5/configure.in.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1Index: mysql-5.1.40/configure.in
2===================================================================
3--- mysql-5.1.40.orig/configure.in
4+++ mysql-5.1.40/configure.in
5@@ -226,8 +226,6 @@ else
6 AC_PATH_PROG(AS, as, as)
7 fi
8
9-# Still need ranlib for readline; local static use only so no libtool.
10-AC_PROG_RANLIB
11 # We use libtool
12 #AC_LIBTOOL_WIN32_DLL
13 AC_PROG_LIBTOOL
14@@ -255,39 +253,7 @@ AC_CHECK_PROGS(YACC, ['bison -y -p MYSQL
15 AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
16 AC_CHECK_PROG(DVIS, tex, manual.dvi)
17
18-#check the return type of sprintf
19-AC_MSG_CHECKING("return type of sprintf")
20-AC_TRY_RUN([
21- int main()
22- {
23- char* s = "hello";
24- char buf[6];
25- if((int)sprintf(buf, s) == strlen(s))
26- return 0;
27-
28- return -1;
29- }
30- ],
31- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
32- AC_MSG_RESULT("int")],
33- [AC_TRY_RUN([
34- int main()
35- {
36- char* s = "hello";
37- char buf[6];
38- if((char*)sprintf(buf,s) == buf + strlen(s))
39- return 0;
40- return -1;
41- } ],
42- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
43- AC_MSG_RESULT("ptr")],
44- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
45- AC_MSG_RESULT("garbage")]
46- )],
47- # Cross compile, assume POSIX
48- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
49- AC_MSG_RESULT("int (we assume)")]
50-)
51+MYSQL_SPRINTF_RET
52
53 AC_PATH_PROG(uname_prog, uname, no)
54
diff --git a/meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch b/meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch
deleted file mode 100644
index 58812c1f1..000000000
--- a/meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch
+++ /dev/null
@@ -1,77 +0,0 @@
1From: Date: July 20 2010 7:44pm
2Subject: bzr commit into mysql-5.1-bugteam branch (davi:3493) Bug#52514
3List-Archive: http://lists.mysql.com/commits/113968
4X-Bug: 52514
5MIME-Version: 1.0
6Content-Type: multipart/mixed; boundary="===============9147207462624717749=="
7
8--===============9147207462624717749==
9MIME-Version: 1.0
10Content-Type: text/plain; charset="us-ascii"
11Content-Transfer-Encoding: 7bit
12Content-Disposition: inline
13
14# At a local mysql-5.1-bugteam repository of davi
15
16 3493 Davi Arnaut 2010-07-20
17 Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5
18 due to GCC preprocessor change
19
20 The problem is that newer GCC versions treats missing headers
21 as fatal errors. The solution is to use a guard macro to prevent
22 the inclusion of system headers when checking the ABI with the
23 C Preprocessor.
24
25 Reference: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15638
26 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44836
27 @ Makefile.am
28 Define guard macro.
29 @ configure.in
30 Remove workaround.
31 @ include/mysql.h
32 Guard the header inclusion.
33 @ include/mysql.h.pp
34 Header is not included anymore.
35
36 modified:
37 Makefile.am
38 configure.in
39 include/mysql.h
40 include/mysql.h.pp
41=== modified file 'Makefile.am'
42Index: mysql-5.1.40/Makefile.am
43===================================================================
44--- mysql-5.1.40.orig/Makefile.am 2009-10-07 01:46:13.000000000 +0800
45+++ mysql-5.1.40/Makefile.am 2010-08-17 20:07:24.843148001 +0800
46@@ -312,7 +312,7 @@
47 do_abi_check:
48 set -ex; \
49 for file in $(abi_headers); do \
50- @CC@ -E -nostdinc -dI \
51+ @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \
52 -I$(top_srcdir)/include \
53 -I$(top_srcdir)/include/mysql \
54 -I$(top_srcdir)/sql \
55Index: mysql-5.1.40/include/mysql.h
56===================================================================
57--- mysql-5.1.40.orig/include/mysql.h 2009-10-07 01:46:50.000000000 +0800
58+++ mysql-5.1.40/include/mysql.h 2010-08-17 20:07:24.843148001 +0800
59@@ -44,7 +44,9 @@
60 #endif
61
62 #ifndef _global_h /* If not standard header */
63+#ifndef MYSQL_ABI_CHECK
64 #include <sys/types.h>
65+#endif
66 #ifdef __LCC__
67 #include <winsock2.h> /* For windows */
68 #endif
69Index: mysql-5.1.40/include/mysql.h.pp
70===================================================================
71--- mysql-5.1.40.orig/include/mysql.h.pp 2009-10-07 01:46:50.000000000 +0800
72+++ mysql-5.1.40/include/mysql.h.pp 2010-08-17 20:07:24.843148001 +0800
73@@ -1,4 +1,3 @@
74-#include <sys/types.h>
75 typedef char my_bool;
76 typedef int my_socket;
77 #include "mysql_version.h"
diff --git a/meta-oe/recipes-support/mysql/mysql5/fix_host_path.patch b/meta-oe/recipes-support/mysql/mysql5/fix_host_path.patch
deleted file mode 100644
index 4f69cd519..000000000
--- a/meta-oe/recipes-support/mysql/mysql5/fix_host_path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1--- mysql-4.1.22/configure.in.old 2008-09-18 20:11:15.000000000 -0500
2+++ mysql-4.1.22/configure.in 2008-09-18 20:12:28.000000000 -0500
3@@ -456,9 +456,9 @@ else
4 fi
5 fi
6
7-AC_SUBST(HOSTNAME)
8-AC_SUBST(PERL)
9-AC_SUBST(PERL5)
10+AC_SUBST(HOSTNAME,/bin/hostname)
11+AC_SUBST(PERL,$(bindir)/perl)
12+AC_SUBST(PERL5,$(bindir)/perl)
13
14 # for build ndb docs
15
16@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC")
17
18 # Check if a pid is valid
19 AC_PATH_PROG(KILL, kill, kill)
20+AC_SUBST(KILL,/bin/kill)
21 AC_MSG_CHECKING("for kill switches")
22-if $ac_cv_path_KILL -0 $$
23+if $KILL -0 $$
24 then
25- CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
26+ CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null"
27 elif kill -s 0 $$
28 then
29- CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
30+ CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
31 else
32 AC_MSG_WARN([kill -0 to check for pid seems to fail])
33- CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
34+ CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
35 fi
36 AC_SUBST(CHECK_PID)
37 AC_MSG_RESULT("$CHECK_PID")
diff --git a/meta-oe/recipes-support/mysql/mysql5/mysqld.sh b/meta-oe/recipes-support/mysql/mysql5/mysqld.sh
deleted file mode 100644
index 479ebdb25..000000000
--- a/meta-oe/recipes-support/mysql/mysql5/mysqld.sh
+++ /dev/null
@@ -1,24 +0,0 @@
1# MySQL init script
2
3. /etc/default/rcS
4
5case "$1" in
6 start)
7 /usr/bin/mysqld_safe &
8 ;;
9 stop)
10 if test -f /var/lib/mysql/mysqld.pid ; then
11 PID=`cat /var/lib/mysql/mysqld.pid`
12 kill $PID
13 fi
14 ;;
15 restart)
16 $0 stop
17 $0 start
18 ;;
19 *)
20 echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
21 ;;
22esac
23
24exit 0
diff --git a/meta-oe/recipes-support/mysql/mysql5/plug.in.patch b/meta-oe/recipes-support/mysql/mysql5/plug.in.patch
deleted file mode 100644
index 70c39fa7a..000000000
--- a/meta-oe/recipes-support/mysql/mysql5/plug.in.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1Index: mysql-5.1.40/storage/innodb_plugin/plug.in
2===================================================================
3--- mysql-5.1.40.orig/storage/innodb_plugin/plug.in
4+++ mysql-5.1.40/storage/innodb_plugin/plug.in
5@@ -63,35 +63,6 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
6 ;;
7 esac
8 AC_SUBST(INNODB_DYNAMIC_CFLAGS)
9- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
10- AC_TRY_RUN(
11- [
12- #include <pthread.h>
13- #include <string.h>
14-
15- int main(int argc, char** argv) {
16- pthread_t x1;
17- pthread_t x2;
18- pthread_t x3;
19-
20- memset(&x1, 0x0, sizeof(x1));
21- memset(&x2, 0x0, sizeof(x2));
22- memset(&x3, 0x0, sizeof(x3));
23-
24- __sync_bool_compare_and_swap(&x1, x2, x3);
25-
26- return(0);
27- }
28- ],
29- [
30- AC_DEFINE([HAVE_ATOMIC_PTHREAD_T], [1],
31- [pthread_t can be used by GCC atomic builtins])
32- AC_MSG_RESULT(yes)
33- ],
34- [
35- AC_MSG_RESULT(no)
36- ]
37- )
38
39 # Try using solaris atomics on SunOS if GCC atomics are not available
40 AC_CHECK_DECLS(
diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.bb b/meta-oe/recipes-support/mysql/mysql5_5.1.40.bb
deleted file mode 100644
index 9656358ce..000000000
--- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require ${PN}_${PV}.inc
2
3DEPENDS += "mysql5-native"
4
5SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad"
6SRC_URI[sha256sum] = "2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 07:42:47 +0000