bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mysql: update to version 5.1.53

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@24053 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke
2010-11-21 14:09:24 +00:00
parent b3ce8fa3a2
commit 1e0adcb336
4 changed files with 7609 additions and 3308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

213
libs/mysql/patches/501-disable-pthread-and-tests.patch
View File

@ -1,112 +1,117 @@
--- mysql.old/sql/Makefile.am 2005-12-21 12:39:32.000000000 -0700
+++ mysql.dev/sql/Makefile.am 2010-08-07 15:13:34.399776279 -0600
@@ -148,8 +148,8 @@
@echo "If it fails, re-run configure with --with-low-memory"
$(CXXCOMPILE) $(LM_CFLAGS) -c $<
-lex_hash.h: gen_lex_hash$(EXEEXT)
- ./gen_lex_hash$(EXEEXT) > $@
+#lex_hash.h: gen_lex_hash$(EXEEXT)
+# ./gen_lex_hash$(EXEEXT) > $@
# For testing of udf_example.so; Works on platforms with gcc
# (This is not part of our build process but only provided as an example)
--- mysql.old/sql/Makefile.in 2005-12-21 12:41:41.000000000 -0700
+++ mysql.dev/sql/Makefile.in 2010-08-07 15:15:39.747273400 -0600
@@ -1253,8 +1253,8 @@
@echo "If it fails, re-run configure with --with-low-memory"
$(CXXCOMPILE) $(LM_CFLAGS) -c $<
-lex_hash.h: gen_lex_hash$(EXEEXT)
- ./gen_lex_hash$(EXEEXT) > $@
+#lex_hash.h: gen_lex_hash$(EXEEXT)
+# ./gen_lex_hash$(EXEEXT) > $@
# For testing of udf_example.so; Works on platforms with gcc
# (This is not part of our build process but only provided as an example)
--- mysql.old/extra/Makefile.am 2005-12-21 12:39:55.000000000 -0700
+++ mysql.dev/extra/Makefile.am 2010-08-07 16:44:45.649771408 -0600
@@ -29,14 +29,14 @@
DIST_SUBDIRS= yassl
# This will build mysqld_error.h and sql_state.h
-$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
- $(top_builddir)/extra/comp_err$(EXEEXT) \
- --charset=$(top_srcdir)/sql/share/charsets \
- --out-dir=$(top_builddir)/sql/share/ \
- --header_file=$(top_builddir)/include/mysqld_error.h \
- --name_file=$(top_builddir)/include/mysqld_ername.h \
- --state_file=$(top_builddir)/include/sql_state.h \
- --in_file=$(top_srcdir)/sql/share/errmsg.txt
+#$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
+# $(top_builddir)/extra/comp_err$(EXEEXT) \
+# --charset=$(top_srcdir)/sql/share/charsets \
+# --out-dir=$(top_builddir)/sql/share/ \
+# --header_file=$(top_builddir)/include/mysqld_error.h \
+# --name_file=$(top_builddir)/include/mysqld_ername.h \
+# --state_file=$(top_builddir)/include/sql_state.h \
+# --in_file=$(top_srcdir)/sql/share/errmsg.txt
$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
--- mysql.old/extra/Makefile.in 2005-12-21 12:41:16.000000000 -0700
+++ mysql.dev/extra/Makefile.in 2010-08-07 16:44:29.537273634 -0600
@@ -870,14 +870,14 @@
# This will build mysqld_error.h and sql_state.h
-$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
- $(top_builddir)/extra/comp_err$(EXEEXT) \
- --charset=$(top_srcdir)/sql/share/charsets \
- --out-dir=$(top_builddir)/sql/share/ \
- --header_file=$(top_builddir)/include/mysqld_error.h \
- --name_file=$(top_builddir)/include/mysqld_ername.h \
- --state_file=$(top_builddir)/include/sql_state.h \
- --in_file=$(top_srcdir)/sql/share/errmsg.txt
+#$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
+# $(top_builddir)/extra/comp_err$(EXEEXT) \
+# --charset=$(top_srcdir)/sql/share/charsets \
+# --out-dir=$(top_builddir)/sql/share/ \
+# --header_file=$(top_builddir)/include/mysqld_error.h \
+# --name_file=$(top_builddir)/include/mysqld_ername.h \
+# --state_file=$(top_builddir)/include/sql_state.h \
+# --in_file=$(top_srcdir)/sql/share/errmsg.txt
$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
--- mysql.old/sql/Makefile.am 2010-08-07 16:53:38.047275454 -0600
+++ mysql.dev/sql/Makefile.am 2010-08-07 17:20:05.947271939 -0600
@@ -40,7 +40,7 @@
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ @NDB_SCI_LIBS@
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
- @bdb_libs@ @innodb_libs@ @pstack_libs@ \
+ @bdb_libs@ @innodb_libs@ \
@innodb_system_libs@ \
@ndbcluster_libs@ @ndbcluster_system_libs@ \
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -41,7 +41,6 @@ mysqld_DEPENDENCIES= @mysql_plugin_libs@
LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
mysqld_LDADD = libndb.la \
@MYSQLD_EXTRA_LDFLAGS@ \
- @pstack_libs@ \
@mysql_plugin_libs@ \
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
--- mysql.old/sql/Makefile.in 2010-08-07 16:53:38.047275454 -0600
+++ mysql.dev/sql/Makefile.in 2010-08-07 17:20:23.197362907 -0600
@@ -483,8 +483,6 @@
openssl_libs = @openssl_libs@
$(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
@@ -174,10 +173,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 $@
+#lex_hash.h: gen_lex_hash.cc lex.h
+# $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+# ./gen_lex_hash$(EXEEXT) > $@-t
+# $(MV) $@-t $@
# For testing of udf_example.so
udf_example_la_SOURCES= udf_example.c
--- a/sql/Makefile.in
+++ b/sql/Makefile.in
@@ -486,8 +486,6 @@ plugin_partition_static_target = @plugin
prefix = @prefix@
program_transform_name = @program_transform_name@
-pstack_dirs = @pstack_dirs@
psdir = @psdir@
-pstack_dir = @pstack_dir@
-pstack_libs = @pstack_libs@
readline_basedir = @readline_basedir@
readline_dir = @readline_dir@
readline_h_ln_cmd = @readline_h_ln_cmd@
@@ -533,7 +531,7 @@
$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ @NDB_SCI_LIBS@
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
- @bdb_libs@ @innodb_libs@ @pstack_libs@ \
+ @bdb_libs@ @innodb_libs@ \
@innodb_system_libs@ \
@ndbcluster_libs@ @ndbcluster_system_libs@ \
@@ -541,7 +539,6 @@ mysqld_DEPENDENCIES = @mysql_plugin_libs
LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
mysqld_LDADD = libndb.la \
@MYSQLD_EXTRA_LDFLAGS@ \
- @pstack_libs@ \
@mysql_plugin_libs@ \
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
$(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
@@ -1308,10 +1305,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 $@
+#lex_hash.h: gen_lex_hash.cc lex.h
+# $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+# ./gen_lex_hash$(EXEEXT) > $@-t
+# $(MV) $@-t $@
# We might have some stuff not built in this build, but that we want to install
install-exec-hook:
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -29,16 +29,16 @@ DIST_SUBDIRS = yassl
# This will build mysqld_error.h, mysqld_ername.h and sql_state.h
# NOTE Built files should depend on their sources to avoid
# the built files being rebuilt in source dist
-$(top_builddir)/include/mysqld_error.h: comp_err.c \
- $(top_srcdir)/sql/share/errmsg.txt
- $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
- $(top_builddir)/extra/comp_err$(EXEEXT) \
- --charset=$(top_srcdir)/sql/share/charsets \
- --out-dir=$(top_builddir)/sql/share/ \
- --header_file=$(top_builddir)/include/mysqld_error.h \
- --name_file=$(top_builddir)/include/mysqld_ername.h \
- --state_file=$(top_builddir)/include/sql_state.h \
- --in_file=$(top_srcdir)/sql/share/errmsg.txt
+#$(top_builddir)/include/mysqld_error.h: comp_err.c \
+# $(top_srcdir)/sql/share/errmsg.txt
+# $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
+# $(top_builddir)/extra/comp_err$(EXEEXT) \
+# --charset=$(top_srcdir)/sql/share/charsets \
+# --out-dir=$(top_builddir)/sql/share/ \
+# --header_file=$(top_builddir)/include/mysqld_error.h \
+# --name_file=$(top_builddir)/include/mysqld_ername.h \
+# --state_file=$(top_builddir)/include/sql_state.h \
+# --in_file=$(top_srcdir)/sql/share/errmsg.txt
$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
--- a/extra/Makefile.in
+++ b/extra/Makefile.in
@@ -938,16 +938,16 @@ uninstall-am: uninstall-binPROGRAMS unin
# This will build mysqld_error.h, mysqld_ername.h and sql_state.h
# NOTE Built files should depend on their sources to avoid
# the built files being rebuilt in source dist
-$(top_builddir)/include/mysqld_error.h: comp_err.c \
- $(top_srcdir)/sql/share/errmsg.txt
- $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
- $(top_builddir)/extra/comp_err$(EXEEXT) \
- --charset=$(top_srcdir)/sql/share/charsets \
- --out-dir=$(top_builddir)/sql/share/ \
- --header_file=$(top_builddir)/include/mysqld_error.h \
- --name_file=$(top_builddir)/include/mysqld_ername.h \
- --state_file=$(top_builddir)/include/sql_state.h \
- --in_file=$(top_srcdir)/sql/share/errmsg.txt
+#$(top_builddir)/include/mysqld_error.h: comp_err.c \
+# $(top_srcdir)/sql/share/errmsg.txt
+# $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
+# $(top_builddir)/extra/comp_err$(EXEEXT) \
+# --charset=$(top_srcdir)/sql/share/charsets \
+# --out-dir=$(top_builddir)/sql/share/ \
+# --header_file=$(top_builddir)/include/mysqld_error.h \
+# --name_file=$(top_builddir)/include/mysqld_ername.h \
+# --state_file=$(top_builddir)/include/sql_state.h \
+# --in_file=$(top_srcdir)/sql/share/errmsg.txt
$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h