[package] add mysql-server (#7384)
[openwrt/svn-archive/archive.git] / libs / mysql / patches / 501-disable-pthread-and-tests.patch
1 --- mysql.old/sql/Makefile.am 2005-12-21 12:39:32.000000000 -0700
2 +++ mysql.dev/sql/Makefile.am 2010-08-07 15:13:34.399776279 -0600
3 @@ -148,8 +148,8 @@
4 @echo "If it fails, re-run configure with --with-low-memory"
5 $(CXXCOMPILE) $(LM_CFLAGS) -c $<
6
7 -lex_hash.h: gen_lex_hash$(EXEEXT)
8 - ./gen_lex_hash$(EXEEXT) > $@
9 +#lex_hash.h: gen_lex_hash$(EXEEXT)
10 +# ./gen_lex_hash$(EXEEXT) > $@
11
12 # For testing of udf_example.so; Works on platforms with gcc
13 # (This is not part of our build process but only provided as an example)
14
15 --- mysql.old/sql/Makefile.in 2005-12-21 12:41:41.000000000 -0700
16 +++ mysql.dev/sql/Makefile.in 2010-08-07 15:15:39.747273400 -0600
17 @@ -1253,8 +1253,8 @@
18 @echo "If it fails, re-run configure with --with-low-memory"
19 $(CXXCOMPILE) $(LM_CFLAGS) -c $<
20
21 -lex_hash.h: gen_lex_hash$(EXEEXT)
22 - ./gen_lex_hash$(EXEEXT) > $@
23 +#lex_hash.h: gen_lex_hash$(EXEEXT)
24 +# ./gen_lex_hash$(EXEEXT) > $@
25
26 # For testing of udf_example.so; Works on platforms with gcc
27 # (This is not part of our build process but only provided as an example)
28
29
30 --- mysql.old/extra/Makefile.am 2005-12-21 12:39:55.000000000 -0700
31 +++ mysql.dev/extra/Makefile.am 2010-08-07 16:44:45.649771408 -0600
32 @@ -29,14 +29,14 @@
33 DIST_SUBDIRS= yassl
34
35 # This will build mysqld_error.h and sql_state.h
36 -$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
37 - $(top_builddir)/extra/comp_err$(EXEEXT) \
38 - --charset=$(top_srcdir)/sql/share/charsets \
39 - --out-dir=$(top_builddir)/sql/share/ \
40 - --header_file=$(top_builddir)/include/mysqld_error.h \
41 - --name_file=$(top_builddir)/include/mysqld_ername.h \
42 - --state_file=$(top_builddir)/include/sql_state.h \
43 - --in_file=$(top_srcdir)/sql/share/errmsg.txt
44 +#$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
45 +# $(top_builddir)/extra/comp_err$(EXEEXT) \
46 +# --charset=$(top_srcdir)/sql/share/charsets \
47 +# --out-dir=$(top_builddir)/sql/share/ \
48 +# --header_file=$(top_builddir)/include/mysqld_error.h \
49 +# --name_file=$(top_builddir)/include/mysqld_ername.h \
50 +# --state_file=$(top_builddir)/include/sql_state.h \
51 +# --in_file=$(top_srcdir)/sql/share/errmsg.txt
52 $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
53 $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
54
55 --- mysql.old/extra/Makefile.in 2005-12-21 12:41:16.000000000 -0700
56 +++ mysql.dev/extra/Makefile.in 2010-08-07 16:44:29.537273634 -0600
57 @@ -870,14 +870,14 @@
58
59
60 # This will build mysqld_error.h and sql_state.h
61 -$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
62 - $(top_builddir)/extra/comp_err$(EXEEXT) \
63 - --charset=$(top_srcdir)/sql/share/charsets \
64 - --out-dir=$(top_builddir)/sql/share/ \
65 - --header_file=$(top_builddir)/include/mysqld_error.h \
66 - --name_file=$(top_builddir)/include/mysqld_ername.h \
67 - --state_file=$(top_builddir)/include/sql_state.h \
68 - --in_file=$(top_srcdir)/sql/share/errmsg.txt
69 +#$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
70 +# $(top_builddir)/extra/comp_err$(EXEEXT) \
71 +# --charset=$(top_srcdir)/sql/share/charsets \
72 +# --out-dir=$(top_builddir)/sql/share/ \
73 +# --header_file=$(top_builddir)/include/mysqld_error.h \
74 +# --name_file=$(top_builddir)/include/mysqld_ername.h \
75 +# --state_file=$(top_builddir)/include/sql_state.h \
76 +# --in_file=$(top_srcdir)/sql/share/errmsg.txt
77 $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
78 $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
79
80 --- mysql.old/sql/Makefile.am 2010-08-07 16:53:38.047275454 -0600
81 +++ mysql.dev/sql/Makefile.am 2010-08-07 17:20:05.947271939 -0600
82 @@ -40,7 +40,7 @@
83 $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ @NDB_SCI_LIBS@
84
85 mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
86 - @bdb_libs@ @innodb_libs@ @pstack_libs@ \
87 + @bdb_libs@ @innodb_libs@ \
88 @innodb_system_libs@ \
89 @ndbcluster_libs@ @ndbcluster_system_libs@ \
90 $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
91
92 --- mysql.old/sql/Makefile.in 2010-08-07 16:53:38.047275454 -0600
93 +++ mysql.dev/sql/Makefile.in 2010-08-07 17:20:23.197362907 -0600
94 @@ -483,8 +483,6 @@
95 openssl_libs = @openssl_libs@
96 prefix = @prefix@
97 program_transform_name = @program_transform_name@
98 -pstack_dirs = @pstack_dirs@
99 -pstack_libs = @pstack_libs@
100 readline_basedir = @readline_basedir@
101 readline_dir = @readline_dir@
102 readline_h_ln_cmd = @readline_h_ln_cmd@
103 @@ -533,7 +531,7 @@
104 $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ @NDB_SCI_LIBS@
105
106 mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
107 - @bdb_libs@ @innodb_libs@ @pstack_libs@ \
108 + @bdb_libs@ @innodb_libs@ \
109 @innodb_system_libs@ \
110 @ndbcluster_libs@ @ndbcluster_system_libs@ \
111 $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
112