MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-15 14:56:43 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

mysql5: import from OE

Browse Source 
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi 2011-01-03 11:44:38 +01:00
parent 156f6d3dc2
commit ef3de09a6b
17 changed files with 940 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

319
recipes-support/mysql/files/autofoo.patch Normal file
View File

@ -0,0 +1,319 @@
diff -aurp mysql-4.1.22.old/acinclude.m4 mysql-4.1.22/acinclude.m4
--- mysql-4.1.22.old/acinclude.m4 2008-09-18 13:00:13.000000000 -0500
+++ mysql-4.1.22/acinclude.m4 2008-09-18 12:58:41.000000000 -0500
@@ -1,5 +1,88 @@
# Local macros for automake & autoconf
+AH_TEMPLATE([SPRINTF_RETURNS_INT], [sprintf returns an int])
+AH_TEMPLATE([SPRINTF_RETURNS_PTR], [sprintf returns a char *])
+AH_TEMPLATE([SPRINTF_RETURNS_GARBAGE], [sprintf returns something unknown to us])
+
+AC_DEFUN([MYSQL_SPRINTF_RET], [
+ AC_CACHE_CHECK([return type of sprintf],
+ [mysql_cv_func_sprintf_ret], [
+ old_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror"
+ AC_COMPILE_IFELSE([
+#include <stdio.h>
+int sprintf(char *str, const char *format, ...);
+ ], [mysql_cv_func_sprintf_ret=int],
+ AC_COMPILE_IFELSE([
+#include <stdio.h>
+char * sprintf(char *str, const char *format, ...);
+ ], [mysql_cv_func_sprintf_ret=ptr],
+ [mysql_cv_func_sprintf_ret=unknown])
+ )
+ CFLAGS="$old_CFLAGS"
+ ])
+ if test x"$mysql_cv_func_sprintf_ret" = "xint"; then
+ AC_DEFINE([SPRINTF_RETURNS_INT], [1])
+ elif test x"$mysql_cv_func_sprintf_ret" = "xptr"; then
+ AC_DEFINE([SPRINTF_RETURNS_PTR], [1])
+ else
+ AC_DEFINE([SPRINTF_RETURNS_GARBAGE], [1])
+ fi
+])
+
+# _MYSQL_FUNC_ATOMIC_ADD
+# ----------------------
+# Check for Linux specific atomic_add function
+AC_DEFUN([_MYSQL_FUNC_ATOMIC_ADD],
+[AC_CACHE_CHECK([for atomic_add], [mysql_cv_func_atomic_add],
+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <asm/atomic.h>]],
+ [
+int main()
+{
+ atomic_t v;
+
+ atomic_set(&v, 23);
+ atomic_add(5, &v);
+ return atomic_read(&v) == 28 ? 0 : -1;
+}
+ ])],
+ [mysql_cv_func_atomic_add=yes],
+ [mysql_cv_func_atomic_add=no])])
+ if test x"$mysql_func_atomic_add" = "xyes"; then
+ AC_DEFINE([HAVE_ATOMIC_ADD], [1])
+ fi[]dnl
+])# _MYSQL_FUNC_ATOMIC_ADD
+
+# _MYSQL_FUNC_ATOMIC_SUB
+# ----------------------
+# Check for Linux specific atomic_sub function
+AC_DEFUN([_MYSQL_FUNC_ATOMIC_SUB],
+[AC_CACHE_CHECK([for atomic_sub], [mysql_cv_func_atomic_sub],
+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <asm/atomic.h>]],
+ [
+int main()
+{
+ atomic_t v;
+
+ atomic_set(&v, 23);
+ atomic_sub(5, &v);
+ return atomic_read(&v) == 18 ? 0 : -1;
+}
+ ])],
+ [mysql_cv_func_atomic_sub=yes],
+ [mysql_cv_func_atomic_sub=no])])
+ if test x"$mysql_func_atomic_sub" = "xyes"; then
+ AC_DEFINE([HAVE_ATOMIC_SUB], [1])
+ fi[]dnl
+])# _MYSQL_FUNC_ATOMIC_SUB
+
+# MYSQL_FUNCS_ATOMIC
+# ------------------
+# Check for Linux specific atomic add and sub functions
+AC_DEFUN([MYSQL_FUNCS_ATOMIC], [
+ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_ADD])dnl
+ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_SUB])dnl
+])# MYSQL_FUNCS_ATOMIC
AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY], [
AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared,
@@ -344,7 +427,7 @@ dnl ------------------------------------
AC_DEFUN([MYSQL_CHECK_ULONG],
[AC_MSG_CHECKING(for type ulong)
AC_CACHE_VAL(ac_cv_ulong,
-[AC_TRY_RUN([#include <stdio.h>
+[AC_TRY_LINK([#include <stdio.h>
#include <sys/types.h>
main()
{
@@ -362,7 +445,7 @@ fi
AC_DEFUN([MYSQL_CHECK_UCHAR],
[AC_MSG_CHECKING(for type uchar)
AC_CACHE_VAL(ac_cv_uchar,
-[AC_TRY_RUN([#include <stdio.h>
+[AC_TRY_LINK([#include <stdio.h>
#include <sys/types.h>
main()
{
@@ -380,7 +463,7 @@ fi
AC_DEFUN([MYSQL_CHECK_UINT],
[AC_MSG_CHECKING(for type uint)
AC_CACHE_VAL(ac_cv_uint,
-[AC_TRY_RUN([#include <stdio.h>
+[AC_TRY_LINK([#include <stdio.h>
#include <sys/types.h>
main()
{
@@ -399,7 +482,7 @@ fi
AC_DEFUN([MYSQL_CHECK_IN_ADDR_T],
[AC_MSG_CHECKING(for type in_addr_t)
AC_CACHE_VAL(ac_cv_in_addr_t,
-[AC_TRY_RUN([#include <stdio.h>
+[AC_TRY_LINK([#include <stdio.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -460,7 +543,7 @@ fi
AC_DEFUN([MYSQL_CHECK_FP_EXCEPT],
[AC_MSG_CHECKING(for type fp_except)
AC_CACHE_VAL(ac_cv_fp_except,
-[AC_TRY_RUN([#include <stdio.h>
+[AC_TRY_LINK([#include <stdio.h>
#include <sys/types.h>
#include <ieeefp.h>
main()
diff -aurp mysql-4.1.22.old/configure.in mysql-4.1.22/configure.in
--- mysql-4.1.22.old/configure.in 2008-09-18 13:00:14.000000000 -0500
+++ mysql-4.1.22/configure.in 2008-09-18 12:54:00.000000000 -0500
@@ -236,8 +236,6 @@ then
else
AC_PATH_PROG(AS, as, as)
fi
-# Still need ranlib for readline; local static use only so no libtool.
-AC_PROG_RANLIB
# We use libtool
#AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
@@ -258,44 +256,7 @@ AC_PROG_YACC
AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
AC_CHECK_PROG(DVIS, tex, manual.dvi)
-AC_MSG_CHECKING("return type of sprintf")
-
-#check the return type of sprintf
-case $SYSTEM_TYPE in
- *netware*)
- AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int")
- ;;
- *)
-AC_TRY_RUN([
- int main()
- {
- char* s = "hello";
- char buf[6];
- if((int)sprintf(buf, s) == strlen(s))
- return 0;
-
- return -1;
- }
- ],
- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
- AC_MSG_RESULT("int")],
- [AC_TRY_RUN([
- int main()
- {
- char* s = "hello";
- char buf[6];
- if((char*)sprintf(buf,s) == buf + strlen(s))
- return 0;
- return -1;
- } ],
- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
- AC_MSG_RESULT("ptr")],
- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
- AC_MSG_RESULT("garbage")])
- ])
- ;;
-esac
-
+MYSQL_SPRINTF_RET
# option, cache_name, variable,
# code to execute if yes, code to exectute if fail
@@ -878,47 +839,7 @@ struct request_info *req;
AC_SUBST(WRAPLIBS)
if test "$TARGET_LINUX" = "true"; then
- AC_MSG_CHECKING([for atomic operations])
-
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-
- atom_ops=
- AC_TRY_RUN([
-#include <asm/atomic.h>
-int main()
-{
- atomic_t v;
-
- atomic_set(&v, 23);
- atomic_add(5, &v);
- return atomic_read(&v) == 28 ? 0 : -1;
-}
- ],
- [AC_DEFINE([HAVE_ATOMIC_ADD], [1],
- [atomic_add() from <asm/atomic.h> (Linux only)])
- atom_ops="${atom_ops}atomic_add "],
- )
- AC_TRY_RUN([
-#include <asm/atomic.h>
-int main()
-{
- atomic_t v;
-
- atomic_set(&v, 23);
- atomic_sub(5, &v);
- return atomic_read(&v) == 18 ? 0 : -1;
-}
- ],
- [AC_DEFINE([HAVE_ATOMIC_SUB], [1],
- [atomic_sub() from <asm/atomic.h> (Linux only)])
- atom_ops="${atom_ops}atomic_sub "],
- )
-
- if test -z "$atom_ops"; then atom_ops="no"; fi
- AC_MSG_RESULT($atom_ops)
-
- AC_LANG_RESTORE
+ MYSQL_FUNC_ATOMIC
AC_ARG_WITH(pstack,
[ --with-pstack Use the pstack backtrace library],
@@ -971,13 +892,13 @@ fi
# Later in this script LIBS will be augmented with a threads library.
NON_THREADED_LIBS="$LIBS"
-AC_MSG_CHECKING([for int8])
+AC_CACHE_CHECK([for int8], [mysql_cv_type_int8], [
case $SYSTEM_TYPE in
*netware)
AC_MSG_RESULT([no])
;;
*)
-AC_TRY_RUN([
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -988,22 +909,21 @@ AC_TRY_RUN([
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-#endif
-
+#endif]], [
int main()
{
int8 i;
return 0;
-}
-],
-[AC_DEFINE([HAVE_INT_8_16_32], [1],
- [whether int8, int16 and int32 types exist])
-AC_MSG_RESULT([yes])],
-[AC_MSG_RESULT([no])]
-)
+}])], [mysql_cv_type_int8=yes], [mysql_cv_type_int8=no])
;;
esac
+if test x"$mysql_cv_type_int8" = "xyes"; then
+ AC_DEFINE([HAVE_INT_8_16_32], [1],
+ [whether int8, int16 and int32 types exist])
+fi
+])
+
#
# Some system specific hacks
#
@@ -1814,7 +1734,7 @@ then
AC_MSG_ERROR("MySQL needs a long long type.")
fi
# off_t is not a builtin type
-MYSQL_CHECK_SIZEOF(off_t, 4)
+AC_CHECK_SIZEOF(off_t, 4)
if test "$ac_cv_sizeof_off_t" -eq 0
then
AC_MSG_ERROR("MySQL needs a off_t type.")
diff -aurp mysql-4.1.22.old/innobase/configure.in mysql-4.1.22/innobase/configure.in
--- mysql-4.1.22.old/innobase/configure.in 2008-09-18 13:00:14.000000000 -0500
+++ mysql-4.1.22/innobase/configure.in 2008-09-18 12:55:39.000000000 -0500
@@ -3,6 +3,7 @@ AC_INIT
AC_CANONICAL_SYSTEM
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(ib_config.h)
+AC_CONFIG_AUX_DIR([..])
AM_INIT_AUTOMAKE(ib, 0.90)
# This is need before AC_PROG_CC
@@ -32,7 +33,6 @@ CFLAGS="$CFLAGS "
CXXFLAGS="$CXXFLAGS "
AC_PROG_CC
-AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_CHECK_HEADERS(aio.h sched.h)

27
recipes-support/mysql/files/configure-ps-cache-check.patch Normal file
View File

@ -0,0 +1,27 @@
Index: mysql-4.1.22/configure.in
===================================================================
--- mysql-4.1.22.orig/configure.in 2009-01-28 16:33:28.000000000 +0000
+++ mysql-4.1.22/configure.in 2009-01-28 16:43:26.000000000 +0000
@@ -471,8 +471,8 @@
# Lock for PS
AC_PATH_PROG(PS, ps, ps)
-AC_MSG_CHECKING("how to check if pid exists")
-PS=$ac_cv_path_PS
+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC],
+[
# Linux style
if $PS p $$ 2> /dev/null | grep $0 > /dev/null
then
@@ -511,8 +511,9 @@
AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
esac
fi
-AC_SUBST(FIND_PROC)
-AC_MSG_RESULT("$FIND_PROC")
+ac_cv_FIND_PROC="$FIND_PROC"
+])
+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC])
# Check if a pid is valid
AC_PATH_PROG(KILL, kill, kill)

37
recipes-support/mysql/files/fix_host_path.patch Normal file
View File

@ -0,0 +1,37 @@
--- mysql-4.1.22/configure.in.old 2008-09-18 20:11:15.000000000 -0500
+++ mysql-4.1.22/configure.in 2008-09-18 20:12:28.000000000 -0500
@@ -456,9 +456,9 @@ else
fi
fi
-AC_SUBST(HOSTNAME)
-AC_SUBST(PERL)
-AC_SUBST(PERL5)
+AC_SUBST(HOSTNAME,/bin/hostname)
+AC_SUBST(PERL,$(bindir)/perl)
+AC_SUBST(PERL5,$(bindir)/perl)
# for build ndb docs
@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC")
# Check if a pid is valid
AC_PATH_PROG(KILL, kill, kill)
+AC_SUBST(KILL,/bin/kill)
AC_MSG_CHECKING("for kill switches")
-if $ac_cv_path_KILL -0 $$
+if $KILL -0 $$
then
- CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
+ CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null"
elif kill -s 0 $$
then
- CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
+ CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
else
AC_MSG_WARN([kill -0 to check for pid seems to fail])
- CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
+ CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
fi
AC_SUBST(CHECK_PID)
AC_MSG_RESULT("$CHECK_PID")

21
recipes-support/mysql/files/my.cnf Normal file
View File

@ -0,0 +1,21 @@
[client]
#password = password
port = 3306
socket = /tmp/mysql.sock
[mysqld_safe]
err-log = /var/log/mysql.err
[mysqld]
user = mysql
port = 3306
socket = /tmp/mysql.sock
pid-file = /var/lib/mysql/mysqld.pid
log-error = /var/log/mysqld.err
basedir = /usr
datadir = /var/mysql
skip-locking
skip-innodb
skip-networking
bind-address = localhost

24
recipes-support/mysql/files/mysqld.sh Normal file
View File

@ -0,0 +1,24 @@
# MySQL init script
. /etc/default/rcS
case "$1" in
start)
/usr/bin/mysqld_safe &
;;
stop)
if test -f /var/lib/mysql/mysqld.pid ; then
PID=`cat /var/lib/mysql/mysqld.pid`
kill $PID
fi
;;
restart)
$0 stop
$0 start
;;
*)
echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
;;
esac
exit 0

24
recipes-support/mysql/mysql5-native_5.1.40.bb Normal file
View File

@ -0,0 +1,24 @@
require mysql5_${PV}.inc
inherit native
PR ="r2"
SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \
file://fix-abi-check-gcc45.patch"
RDEPENDS_${PN} = ""
PACKAGES = ""
DEPENDS = "ncurses-native"
EXTRA_OEMAKE = ""
EXTRA_OECONF = " --with-embedded-server "
do_install() {
install -d ${D}${bindir}
install -m 0755 sql/gen_lex_hash ${D}${bindir}/
}
NATIVE_INSTALL_WORKS = "1"
PSTAGING_DISABLED = "1"
SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad"
SRC_URI[sha256sum] = "2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432"

19
recipes-support/mysql/mysql5/Makefile.am.patch Normal file
View File

@ -0,0 +1,19 @@
Index: mysql-5.1.40/sql/Makefile.am
===================================================================
--- mysql-5.1.40.orig/sql/Makefile.am
+++ mysql-5.1.40/sql/Makefile.am
@@ -174,10 +174,10 @@ link_sources:
# This generates lex_hash.h
# NOTE Built sources should depend on their sources not the tool
# this avoid the rebuild of the built files in a source dist
-lex_hash.h: gen_lex_hash.cc lex.h
- $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
- ./gen_lex_hash$(EXEEXT) > $@-t
- $(MV) $@-t $@
+GEN_LEX_HASH = ./gen_lex_hash$(EXEEXT)
+
+lex_hash.h: gen_lex_hash$(EXEEXT)
+ $(GEN_LEX_HASH) > $@
# For testing of udf_example.so
udf_example_la_SOURCES= udf_example.c

27
recipes-support/mysql/mysql5/configure-ps-cache-check.patch Normal file
View File

@ -0,0 +1,27 @@
Index: mysql-4.1.22/configure.in
===================================================================
--- mysql-4.1.22.orig/configure.in 2009-01-28 16:33:28.000000000 +0000
+++ mysql-4.1.22/configure.in 2009-01-28 16:43:26.000000000 +0000
@@ -471,8 +471,8 @@
# Lock for PS
AC_PATH_PROG(PS, ps, ps)
-AC_MSG_CHECKING("how to check if pid exists")
-PS=$ac_cv_path_PS
+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC],
+[
# Linux style
if $PS p $$ 2> /dev/null | grep $0 > /dev/null
then
@@ -511,8 +511,9 @@
AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
esac
fi
-AC_SUBST(FIND_PROC)
-AC_MSG_RESULT("$FIND_PROC")
+ac_cv_FIND_PROC="$FIND_PROC"
+])
+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC])
# Check if a pid is valid
AC_PATH_PROG(KILL, kill, kill)

54
recipes-support/mysql/mysql5/configure.in.patch Normal file
View File

@ -0,0 +1,54 @@
Index: mysql-5.1.40/configure.in
===================================================================
--- mysql-5.1.40.orig/configure.in
+++ mysql-5.1.40/configure.in
@@ -226,8 +226,6 @@ else
AC_PATH_PROG(AS, as, as)
fi
-# Still need ranlib for readline; local static use only so no libtool.
-AC_PROG_RANLIB
# We use libtool
#AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
@@ -255,39 +253,7 @@ AC_CHECK_PROGS(YACC, ['bison -y -p MYSQL
AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
AC_CHECK_PROG(DVIS, tex, manual.dvi)
-#check the return type of sprintf
-AC_MSG_CHECKING("return type of sprintf")
-AC_TRY_RUN([
- int main()
- {
- char* s = "hello";
- char buf[6];
- if((int)sprintf(buf, s) == strlen(s))
- return 0;
-
- return -1;
- }
- ],
- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
- AC_MSG_RESULT("int")],
- [AC_TRY_RUN([
- int main()
- {
- char* s = "hello";
- char buf[6];
- if((char*)sprintf(buf,s) == buf + strlen(s))
- return 0;
- return -1;
- } ],
- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
- AC_MSG_RESULT("ptr")],
- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
- AC_MSG_RESULT("garbage")]
- )],
- # Cross compile, assume POSIX
- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
- AC_MSG_RESULT("int (we assume)")]
-)
+MYSQL_SPRINTF_RET
AC_PATH_PROG(uname_prog, uname, no)

77
recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch Normal file
View File

@ -0,0 +1,77 @@
From: Date: July 20 2010 7:44pm
Subject: bzr commit into mysql-5.1-bugteam branch (davi:3493) Bug#52514
List-Archive: http://lists.mysql.com/commits/113968
X-Bug: 52514
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9147207462624717749=="
--===============9147207462624717749==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
# At a local mysql-5.1-bugteam repository of davi
3493 Davi Arnaut 2010-07-20
Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5
due to GCC preprocessor change
The problem is that newer GCC versions treats missing headers
as fatal errors. The solution is to use a guard macro to prevent
the inclusion of system headers when checking the ABI with the
C Preprocessor.
Reference: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15638
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44836
@ Makefile.am
Define guard macro.
@ configure.in
Remove workaround.
@ include/mysql.h
Guard the header inclusion.
@ include/mysql.h.pp
Header is not included anymore.
modified:
Makefile.am
configure.in
include/mysql.h
include/mysql.h.pp
=== modified file 'Makefile.am'
Index: mysql-5.1.40/Makefile.am
===================================================================
--- mysql-5.1.40.orig/Makefile.am 2009-10-07 01:46:13.000000000 +0800
+++ mysql-5.1.40/Makefile.am 2010-08-17 20:07:24.843148001 +0800
@@ -312,7 +312,7 @@
do_abi_check:
set -ex; \
for file in $(abi_headers); do \
- @CC@ -E -nostdinc -dI \
+ @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \
-I$(top_srcdir)/include \
-I$(top_srcdir)/include/mysql \
-I$(top_srcdir)/sql \
Index: mysql-5.1.40/include/mysql.h
===================================================================
--- mysql-5.1.40.orig/include/mysql.h 2009-10-07 01:46:50.000000000 +0800
+++ mysql-5.1.40/include/mysql.h 2010-08-17 20:07:24.843148001 +0800
@@ -44,7 +44,9 @@
#endif
#ifndef _global_h /* If not standard header */
+#ifndef MYSQL_ABI_CHECK
#include <sys/types.h>
+#endif
#ifdef __LCC__
#include <winsock2.h> /* For windows */
#endif
Index: mysql-5.1.40/include/mysql.h.pp
===================================================================
--- mysql-5.1.40.orig/include/mysql.h.pp 2009-10-07 01:46:50.000000000 +0800
+++ mysql-5.1.40/include/mysql.h.pp 2010-08-17 20:07:24.843148001 +0800
@@ -1,4 +1,3 @@
-#include <sys/types.h>
typedef char my_bool;
typedef int my_socket;
#include "mysql_version.h"

37
recipes-support/mysql/mysql5/fix_host_path.patch Normal file
View File

@ -0,0 +1,37 @@
--- mysql-4.1.22/configure.in.old 2008-09-18 20:11:15.000000000 -0500
+++ mysql-4.1.22/configure.in 2008-09-18 20:12:28.000000000 -0500
@@ -456,9 +456,9 @@ else
fi
fi
-AC_SUBST(HOSTNAME)
-AC_SUBST(PERL)
-AC_SUBST(PERL5)
+AC_SUBST(HOSTNAME,/bin/hostname)
+AC_SUBST(PERL,$(bindir)/perl)
+AC_SUBST(PERL5,$(bindir)/perl)
# for build ndb docs
@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC")
# Check if a pid is valid
AC_PATH_PROG(KILL, kill, kill)
+AC_SUBST(KILL,/bin/kill)
AC_MSG_CHECKING("for kill switches")
-if $ac_cv_path_KILL -0 $$
+if $KILL -0 $$
then
- CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
+ CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null"
elif kill -s 0 $$
then
- CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
+ CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
else
AC_MSG_WARN([kill -0 to check for pid seems to fail])
- CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
+ CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
fi
AC_SUBST(CHECK_PID)
AC_MSG_RESULT("$CHECK_PID")

13
recipes-support/mysql/mysql5/misc.m4.patch Normal file
View File

@ -0,0 +1,13 @@
Index: mysql-5.1.40/config/ac-macros/misc.m4
===================================================================
--- mysql-5.1.40.orig/config/ac-macros/misc.m4
+++ mysql-5.1.40/config/ac-macros/misc.m4
@@ -476,7 +476,7 @@ AC_DEFUN([MYSQL_STACK_DIRECTION],
{
exit (find_stack_direction() < 0);
}], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
- ac_cv_c_stack_direction=)])
+ ac_cv_c_stack_direction=0)])
AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
])dnl

21
recipes-support/mysql/mysql5/my.cnf Normal file
View File

@ -0,0 +1,21 @@
[client]
#password = password
port = 3306
socket = /tmp/mysql.sock
[mysqld_safe]
err-log = /var/log/mysql.err
[mysqld]
user = mysql
port = 3306
socket = /tmp/mysql.sock
pid-file = /var/lib/mysql/mysqld.pid
log-error = /var/log/mysqld.err
basedir = /usr
datadir = /var/mysql
skip-locking
loose-skip-innodb
skip-networking
bind-address = localhost

24
recipes-support/mysql/mysql5/mysqld.sh Normal file
View File

@ -0,0 +1,24 @@
# MySQL init script
. /etc/default/rcS
case "$1" in
start)
/usr/bin/mysqld_safe &
;;
stop)
if test -f /var/lib/mysql/mysqld.pid ; then
PID=`cat /var/lib/mysql/mysqld.pid`
kill $PID
fi
;;
restart)
$0 stop
$0 start
;;
*)
echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
;;
esac
exit 0

40
recipes-support/mysql/mysql5/plug.in.patch Normal file
View File

@ -0,0 +1,40 @@
Index: mysql-5.1.40/storage/innodb_plugin/plug.in
===================================================================
--- mysql-5.1.40.orig/storage/innodb_plugin/plug.in
+++ mysql-5.1.40/storage/innodb_plugin/plug.in
@@ -63,35 +63,6 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [
;;
esac
AC_SUBST(INNODB_DYNAMIC_CFLAGS)
- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
- AC_TRY_RUN(
- [
- #include <pthread.h>
- #include <string.h>
-
- int main(int argc, char** argv) {
- pthread_t x1;
- pthread_t x2;
- pthread_t x3;
-
- memset(&x1, 0x0, sizeof(x1));
- memset(&x2, 0x0, sizeof(x2));
- memset(&x3, 0x0, sizeof(x3));
-
- __sync_bool_compare_and_swap(&x1, x2, x3);
-
- return(0);
- }
- ],
- [
- AC_DEFINE([HAVE_ATOMIC_PTHREAD_T], [1],
- [pthread_t can be used by GCC atomic builtins])
- AC_MSG_RESULT(yes)
- ],
- [
- AC_MSG_RESULT(no)
- ]
- )
# Try using solaris atomics on SunOS if GCC atomics are not available
AC_CHECK_DECLS(

6
recipes-support/mysql/mysql5_5.1.40.bb Normal file
View File

@ -0,0 +1,6 @@
require ${PN}_${PV}.inc
DEPENDS += mysql5-native
SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad"
SRC_URI[sha256sum] = "2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432"

170
recipes-support/mysql/mysql5_5.1.40.inc Normal file
View File

@ -0,0 +1,170 @@
DESCRIPTION = "The MySQL Open Source Database System"
HOMEPAGE = "http://www.mysql.com/"
SECTION = "libs"
LICENSE = "GPL"
DEPENDS = "ncurses"
PR = "r5"
SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \
file://configure.in.patch \
file://plug.in.patch \
file://misc.m4.patch \
file://Makefile.am.patch \
file://fix_host_path.patch \
file://configure-ps-cache-check.patch \
file://fix-abi-check-gcc45.patch \
file://my.cnf \
file://mysqld.sh"
S = "${WORKDIR}/mysql-${PV}"
BINCONFIG_GLOB = "mysql_config"
inherit autotools binconfig update-rc.d
INITSCRIPT_PACKAGES = "${PN}-server"
INITSCRIPT_NAME = "mysqld"
INITSCRIPT_PARAMS = "start 45 S . stop 45 0 6 1 ."
export ac_cv_path_PS=/bin/ps
export ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null"
PARALLEL_MAKE = " "
EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'"
EXTRA_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 "
do_configure_append() {
sed -i /comp_err/d ${S}/sql/share/Makefile
}
SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess"
# We need to append this so it runs *after* binconfig's preprocess function
mysql5_sysroot_preprocess () {
sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/mysql_config
sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/mysql_config
}
do_install() {
oe_runmake 'DESTDIR=${D}' install
mv -f ${D}${libdir}/mysql/* ${D}${libdir}
rmdir ${D}${libdir}/mysql
install -d ${D}/etc/init.d
install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/
install -m 0755 ${WORKDIR}/mysqld.sh ${D}/etc/init.d/mysqld
}
pkg_postinst_mysql5-server () {
if [ "x$D" != "x" ]; then
exit 1
fi
grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql
#Install the database
test -d /usr/bin || mkdir -p /usr/bin
test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname
mkdir /var/lib/mysql
chown mysql.nogroup /var/lib/mysql
mysql_install_db
}
pkg_postrm_mysql5-server () {
grep mysql /etc/passwd && deluser mysql
}
PACKAGES = "${PN}-dbg ${PN} \
libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-dbg \
libmysqlclient libmysqlclient-dev libmysqlclient-dbg \
${PN}-client ${PN}-server ${PN}-leftovers"
CONFFILES_${PN}-server += "${sysconfdir}/my.cnf"
FILES_${PN} = " "
RDEPENDS_${PN} = "${PN}-client ${PN}-server"
ALLOW_EMPTY_${PN} = "1"
FILES_libmysqlclient = "${libdir}/libmysqlclient.so.*"
FILES_libmysqlclient-dev = " \
${includedir}/mysql/ \
${libdir}/lib* \
${libdir}/plugin/* \
${sysconfdir}/aclocal \
${bindir}/mysql_config"
FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \
/usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process"
FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*"
FILES_libmysqlclient-r-dev = "${libdir}/libmysqlclient_r.*"
FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*"
FILES_${PN}-client = "\
${bindir}/myisam_ftdump \
${bindir}/mysql \
${bindir}/mysql_client_test \
${bindir}/mysql_client_test_embedded \
${bindir}/mysql_find_rows \
${bindir}/mysql_fix_extensions \
${bindir}/mysql_waitpid \
${bindir}/mysqlaccess \
${bindir}/mysqladmin \
${bindir}/mysqlbug \
${bindir}/mysqlcheck \
${bindir}/mysqldump \
${bindir}/mysqldumpslow \
${bindir}/mysqlimport \
${bindir}/mysqlshow \
${bindir}/mysqlslap \
${bindir}/mysqltest_embedded \
${libexecdir}/mysqlmanager"
FILES_${PN}-server = "\
${bindir}/comp_err \
${bindir}/isamchk \
${bindir}/isamlog \
${bindir}/msql2mysql \
${bindir}/my_print_defaults \
${bindir}/myisamchk \
${bindir}/myisamlog \
${bindir}/myisampack \
${bindir}/mysql_convert_table_format \
${bindir}/mysql_fix_privilege_tables \
${bindir}/mysql_install_db \
${bindir}/mysql_secure_installation \
${bindir}/mysql_setpermission \
${bindir}/mysql_tzinfo_to_sql \
${bindir}/mysql_upgrade \
${bindir}/mysql_zap \
${bindir}/mysqlbinlog \
${bindir}/mysqld_multi \
${bindir}/mysqld_safe \
${bindir}/mysqlhotcopy \
${bindir}/mysqltest \
${bindir}/ndb_delete_all \
${bindir}/ndb_desc \
${bindir}/ndb_drop_index \
${bindir}/ndb_drop_table \
${bindir}/ndb_mgm \
${bindir}/ndb_restore \
${bindir}/ndb_select_all \
${bindir}/ndb_select_count \
${bindir}/ndb_show_tables \
${bindir}/ndb_waiter \
${bindir}/pack_isam \
${bindir}/perror \
${bindir}/replace \
${bindir}/resolve_stack_dump \
${bindir}/resolveip \
${libexecdir}/mysqld \
${sbindir}/mysqld \
${sbindir}/ndb_cpcd \
${sbindir}/ndbd \
${sbindir}/ndb_mgmd \
${datadir}/mysql/ \
${localstatedir}/mysql/ \
${sysconfdir}/init.d \
${sysconfdir}/my.cnf"
DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}"
FILES_${PN}-leftovers = "/"