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

   1 --- a/sql/Makefile.am
   2 +++ b/sql/Makefile.am
   3 @@ -41,7 +41,6 @@ mysqld_DEPENDENCIES=  @mysql_plugin_libs@
   4  LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
   5  mysqld_LDADD =         libndb.la \
   6                         @MYSQLD_EXTRA_LDFLAGS@ \
   7 -                       @pstack_libs@ \
   8                         @mysql_plugin_libs@ \
   9                         $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
  10                         $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
  11 @@ -174,10 +173,10 @@ link_sources:
  12  # This generates lex_hash.h
  13  # NOTE Built sources should depend on their sources not the tool
  14  # this avoid the rebuild of the built files in a source dist
  15 -lex_hash.h:    gen_lex_hash.cc lex.h
  16 -               $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
  17 -               ./gen_lex_hash$(EXEEXT) > $@-t
  18 -               $(MV) $@-t $@
  19 +#lex_hash.h:   gen_lex_hash.cc lex.h
  20 +#              $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
  21 +#              ./gen_lex_hash$(EXEEXT) > $@-t
  22 +#              $(MV) $@-t $@
  23
  24  # For testing of udf_example.so
  25  udf_example_la_SOURCES= udf_example.c
  26 --- a/sql/Makefile.in
  27 +++ b/sql/Makefile.in
  28 @@ -486,8 +486,6 @@ plugin_partition_static_target = @plugin
  29  prefix = @prefix@
  30  program_transform_name = @program_transform_name@
  31  psdir = @psdir@
  32 -pstack_dir = @pstack_dir@
  33 -pstack_libs = @pstack_libs@
  34  readline_basedir = @readline_basedir@
  35  readline_dir = @readline_dir@
  36  readline_h_ln_cmd = @readline_h_ln_cmd@
  37 @@ -541,7 +539,6 @@ mysqld_DEPENDENCIES = @mysql_plugin_libs
  38  LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
  39  mysqld_LDADD = libndb.la \
  40                         @MYSQLD_EXTRA_LDFLAGS@ \
  41 -                       @pstack_libs@ \
  42                         @mysql_plugin_libs@ \
  43                         $(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
  44                         $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
  45 @@ -1308,10 +1305,10 @@ link_sources:
  46  # This generates lex_hash.h
  47  # NOTE Built sources should depend on their sources not the tool
  48  # this avoid the rebuild of the built files in a source dist
  49 -lex_hash.h:    gen_lex_hash.cc lex.h
  50 -               $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
  51 -               ./gen_lex_hash$(EXEEXT) > $@-t
  52 -               $(MV) $@-t $@
  53 +#lex_hash.h:   gen_lex_hash.cc lex.h
  54 +#              $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
  55 +#              ./gen_lex_hash$(EXEEXT) > $@-t
  56 +#              $(MV) $@-t $@
  57
  58  # We might have some stuff not built in this build, but that we want to install
  59  install-exec-hook:
  60 --- a/extra/Makefile.am
  61 +++ b/extra/Makefile.am
  62 @@ -29,16 +29,16 @@ DIST_SUBDIRS =              yassl
  63  # This will build mysqld_error.h, mysqld_ername.h and sql_state.h
  64  # NOTE Built files should depend on their sources to avoid
  65  # the built files being rebuilt in source dist
  66 -$(top_builddir)/include/mysqld_error.h: comp_err.c \
  67 -                       $(top_srcdir)/sql/share/errmsg.txt
  68 -       $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
  69 -       $(top_builddir)/extra/comp_err$(EXEEXT) \
  70 -       --charset=$(top_srcdir)/sql/share/charsets \
  71 -       --out-dir=$(top_builddir)/sql/share/ \
  72 -       --header_file=$(top_builddir)/include/mysqld_error.h \
  73 -       --name_file=$(top_builddir)/include/mysqld_ername.h \
  74 -       --state_file=$(top_builddir)/include/sql_state.h \
  75 -       --in_file=$(top_srcdir)/sql/share/errmsg.txt
  76 +#$(top_builddir)/include/mysqld_error.h: comp_err.c \
  77 +#                      $(top_srcdir)/sql/share/errmsg.txt
  78 +#      $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
  79 +#      $(top_builddir)/extra/comp_err$(EXEEXT) \
  80 +#      --charset=$(top_srcdir)/sql/share/charsets \
  81 +#      --out-dir=$(top_builddir)/sql/share/ \
  82 +#      --header_file=$(top_builddir)/include/mysqld_error.h \
  83 +#      --name_file=$(top_builddir)/include/mysqld_ername.h \
  84 +#      --state_file=$(top_builddir)/include/sql_state.h \
  85 +#      --in_file=$(top_srcdir)/sql/share/errmsg.txt
  86  $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
  87  $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
  88
  89 --- a/extra/Makefile.in
  90 +++ b/extra/Makefile.in
  91 @@ -938,16 +938,16 @@ uninstall-am: uninstall-binPROGRAMS unin
  92  # This will build mysqld_error.h, mysqld_ername.h and sql_state.h
  93  # NOTE Built files should depend on their sources to avoid
  94  # the built files being rebuilt in source dist
  95 -$(top_builddir)/include/mysqld_error.h: comp_err.c \
  96 -                       $(top_srcdir)/sql/share/errmsg.txt
  97 -       $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
  98 -       $(top_builddir)/extra/comp_err$(EXEEXT) \
  99 -       --charset=$(top_srcdir)/sql/share/charsets \
 100 -       --out-dir=$(top_builddir)/sql/share/ \
 101 -       --header_file=$(top_builddir)/include/mysqld_error.h \
 102 -       --name_file=$(top_builddir)/include/mysqld_ername.h \
 103 -       --state_file=$(top_builddir)/include/sql_state.h \
 104 -       --in_file=$(top_srcdir)/sql/share/errmsg.txt
 105 +#$(top_builddir)/include/mysqld_error.h: comp_err.c \
 106 +#                      $(top_srcdir)/sql/share/errmsg.txt
 107 +#      $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
 108 +#      $(top_builddir)/extra/comp_err$(EXEEXT) \
 109 +#      --charset=$(top_srcdir)/sql/share/charsets \
 110 +#      --out-dir=$(top_builddir)/sql/share/ \
 111 +#      --header_file=$(top_builddir)/include/mysqld_error.h \
 112 +#      --name_file=$(top_builddir)/include/mysqld_ername.h \
 113 +#      --state_file=$(top_builddir)/include/sql_state.h \
 114 +#      --in_file=$(top_srcdir)/sql/share/errmsg.txt
 115  $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
 116  $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
 117