summaryrefslogtreecommitdiffstats
path: root/recipes-support/mysql/mysql5
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-support/mysql/mysql5')
-rw-r--r--recipes-support/mysql/mysql5/Makefile.am.patch19
-rw-r--r--recipes-support/mysql/mysql5/configure-ps-cache-check.patch27
-rw-r--r--recipes-support/mysql/mysql5/configure.in.patch54
-rw-r--r--recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch77
-rw-r--r--recipes-support/mysql/mysql5/fix_host_path.patch37
-rw-r--r--recipes-support/mysql/mysql5/misc.m4.patch13
-rw-r--r--recipes-support/mysql/mysql5/my.cnf21
-rw-r--r--recipes-support/mysql/mysql5/mysqld.sh24
-rw-r--r--recipes-support/mysql/mysql5/plug.in.patch40
9 files changed, 0 insertions, 312 deletions
diff --git a/recipes-support/mysql/mysql5/Makefile.am.patch b/recipes-support/mysql/mysql5/Makefile.am.patch
deleted file mode 100644
index 33fd17acd4..0000000000
--- a/recipes-support/mysql/mysql5/Makefile.am.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Index: mysql-5.1.40/sql/Makefile.am
2===================================================================
3--- mysql-5.1.40.orig/sql/Makefile.am
4+++ mysql-5.1.40/sql/Makefile.am
5@@ -174,10 +174,10 @@ link_sources:
6 # This generates lex_hash.h
7 # NOTE Built sources should depend on their sources not the tool
8 # this avoid the rebuild of the built files in a source dist
9-lex_hash.h: gen_lex_hash.cc lex.h
10- $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
11- ./gen_lex_hash$(EXEEXT) > $@-t
12- $(MV) $@-t $@
13+GEN_LEX_HASH = ./gen_lex_hash$(EXEEXT)
14+
15+lex_hash.h: gen_lex_hash$(EXEEXT)
16+ $(GEN_LEX_HASH) > $@
17
18 # For testing of udf_example.so
19 udf_example_la_SOURCES= udf_example.c
diff --git a/recipes-support/mysql/mysql5/configure-ps-cache-check.patch b/recipes-support/mysql/mysql5/configure-ps-cache-check.patch
deleted file mode 100644
index 3b5b3fd063..0000000000
--- a/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/recipes-support/mysql/mysql5/configure.in.patch b/recipes-support/mysql/mysql5/configure.in.patch
deleted file mode 100644
index 3edc5f3c21..0000000000
--- a/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/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch b/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch
deleted file mode 100644
index 58812c1f1a..0000000000
--- a/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/recipes-support/mysql/mysql5/fix_host_path.patch b/recipes-support/mysql/mysql5/fix_host_path.patch
deleted file mode 100644
index 4f69cd5198..0000000000
--- a/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/recipes-support/mysql/mysql5/misc.m4.patch b/recipes-support/mysql/mysql5/misc.m4.patch
deleted file mode 100644
index 7b0acff21c..0000000000
--- a/recipes-support/mysql/mysql5/misc.m4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: mysql-5.1.40/config/ac-macros/misc.m4
2===================================================================
3--- mysql-5.1.40.orig/config/ac-macros/misc.m4
4+++ mysql-5.1.40/config/ac-macros/misc.m4
5@@ -476,7 +476,7 @@ AC_DEFUN([MYSQL_STACK_DIRECTION],
6 {
7 exit (find_stack_direction() < 0);
8 }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
9- ac_cv_c_stack_direction=)])
10+ ac_cv_c_stack_direction=0)])
11 AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
12 ])dnl
13
diff --git a/recipes-support/mysql/mysql5/my.cnf b/recipes-support/mysql/mysql5/my.cnf
deleted file mode 100644
index 7f557e4250..0000000000
--- a/recipes-support/mysql/mysql5/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
18loose-skip-innodb
19skip-networking
20bind-address = localhost
21
diff --git a/recipes-support/mysql/mysql5/mysqld.sh b/recipes-support/mysql/mysql5/mysqld.sh
deleted file mode 100644
index 479ebdb257..0000000000
--- a/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/recipes-support/mysql/mysql5/plug.in.patch b/recipes-support/mysql/mysql5/plug.in.patch
deleted file mode 100644
index 70c39fa7a3..0000000000
--- a/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(
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-10-23 00:36:28 +0000