f94407f11b14776b032f422c64d0aec3 mysql-amfix.patch

Changed files:
    mysql-amfix.patch -> 1.1

diff --git a/mysql-amfix.patch b/mysql-amfix.patch
new file mode 100644 (file)
index 0000000..282a610
--- /dev/null
+++ b/mysql-amfix.patch
@@ -0,0 +1,224 @@
+--- mysql-3.23.37/libmysql_r/Makefile.am.amfix Fri May 11 13:38:18 2001
++++ mysql-3.23.37/libmysql_r/Makefile.am       Fri May 11 13:38:41 2001
+@@ -27,17 +27,6 @@
+ ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
+ include $(top_srcdir)/libmysql/Makefile.shared
+ 
+-# Don't depend on files in pthread library
+-OMIT_DEPENDENCIES =   pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
+-                      __math.h time.h __time.h unistd.h __unistd.h types.h \
+-                      xtypes.h ac-types.h posix.h string.h __string.h \
+-                      errno.h socket.h inet.h dirent.h netdb.h \
+-                      cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
+-                      prio_queue.h pthread_attr.h pthread_once.h queue.h\
+-                      sleep.h specific.h version.h pwd.h timers.h uio.h \
+-                      cdefs.h machdep.h signal.h __signal.h util.h lex.h \
+-                      wait.h
+-
+ libmysql_dir = $(top_srcdir)/libmysql
+ 
+ libmysqlclient_r_la_SOURCES = $(target_sources)
+--- mysql-3.23.37/strings/Makefile.am.amfix    Fri May 11 13:40:18 2001
++++ mysql-3.23.37/strings/Makefile.am  Fri May 11 13:40:41 2001
+@@ -38,7 +38,7 @@
+ endif
+ endif
+ 
+-libmystrings_a_SOURCES = @CHARSET_SRCS@ $(ASRCS) $(CSRCS)
++libmystrings_a_SOURCES = $(ASRCS) $(CSRCS)
+ noinst_PROGRAMS = conf_to_src
+ # Default charset definitions
+ EXTRA_DIST =          ctype-big5.c ctype-czech.c ctype-euc_kr.c \
+@@ -52,15 +52,6 @@
+                       bmove_upp-sparc.s strappend-sparc.s strend-sparc.s \
+                       strinstr-sparc.s strmake-sparc.s strmov-sparc.s \
+                       strnmov-sparc.s strstr-sparc.s strxmov-sparc.s
+-
+-OMIT_DEPENDENCIES =   pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
+-                      __math.h time.h __time.h unistd.h __unistd.h types.h \
+-                      xtypes.h ac-types.h posix.h string.h __string.h \
+-                      errno.h socket.h inet.h dirent.h netdb.h \
+-                      cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
+-                      prio_queue.h pthread_attr.h pthread_once.h queue.h\
+-                      sleep.h specific.h version.h pwd.h timers.h uio.h \
+-                      cdefs.h machdep.h signal.h __signal.h util.h
+ 
+ libmystrings_a_LIBADD=        @CHARSET_OBJS@
+ ctype.o:              ctype_extra_sources.c
+--- mysql-3.23.37/dbug/Makefile.am.amfix       Fri May 11 13:37:18 2001
++++ mysql-3.23.37/dbug/Makefile.am     Fri May 11 13:37:30 2001
+@@ -23,14 +23,6 @@
+ EXTRA_DIST =          example1.c example2.c example3.c user.r monty.doc readme.prof \
+                       main.c factorial.c
+ 
+-OMIT_DEPENDENCIES =   pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
+-                      __math.h time.h __time.h unistd.h __unistd.h types.h \
+-                      xtypes.h ac-types.h posix.h string.h __string.h \
+-                      errno.h socket.h inet.h dirent.h netdb.h \
+-                      cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
+-                      prio_queue.h pthread_attr.h pthread_once.h queue.h\
+-                      sleep.h specific.h version.h pwd.h timers.h uio.h \
+-                      cdefs.h machdep.h signal.h __signal.h util.h
+ 
+ # Must be linked with libs thta are not compiled yet
+ extra_progs: factorial dbug_analyze
+--- mysql-3.23.37/mysys/Makefile.am.amfix      Fri May 11 13:39:28 2001
++++ mysql-3.23.37/mysys/Makefile.am    Fri May 11 13:39:43 2001
+@@ -63,14 +63,6 @@
+ 
+ libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
+ 
+-OMIT_DEPENDENCIES =   pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
+-                      __math.h time.h __time.h unistd.h __unistd.h types.h \
+-                      xtypes.h ac-types.h posix.h string.h __string.h \
+-                      errno.h socket.h inet.h dirent.h netdb.h \
+-                      cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
+-                      prio_queue.h pthread_attr.h pthread_once.h queue.h\
+-                      sleep.h specific.h version.h pwd.h timers.h uio.h \
+-                      cdefs.h machdep.h signal.h __signal.h util.h
+ 
+ # I hope this always does the right thing. Otherwise this is only test programs
+ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
+--- mysql-3.23.37/extra/Makefile.am.amfix      Fri May 11 13:37:32 2001
++++ mysql-3.23.37/extra/Makefile.am    Fri May 11 13:37:41 2001
+@@ -20,14 +20,5 @@
+ bin_PROGRAMS =                replace comp_err perror resolveip my_print_defaults \
+ resolve_stack_dump
+ 
+-OMIT_DEPENDENCIES =   pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
+-                      __math.h time.h __time.h unistd.h __unistd.h types.h \
+-                      xtypes.h ac-types.h posix.h string.h __string.h \
+-                      errno.h socket.h inet.h dirent.h netdb.h \
+-                      cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
+-                      prio_queue.h pthread_attr.h pthread_once.h queue.h\
+-                      sleep.h specific.h version.h pwd.h timers.h uio.h \
+-                      cdefs.h machdep.h signal.h __signal.h
+-
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%
+--- mysql-3.23.37/regex/Makefile.am.amfix      Fri May 11 13:39:43 2001
++++ mysql-3.23.37/regex/Makefile.am    Fri May 11 13:39:51 2001
+@@ -28,15 +28,6 @@
+                       debug.ih engine.ih main.ih regcomp.ih regerror.ih \
+                       regex.3 regex.7
+ 
+-OMIT_DEPENDENCIES =   pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
+-                      __math.h time.h __time.h unistd.h __unistd.h types.h \
+-                      xtypes.h ac-types.h posix.h string.h __string.h \
+-                      errno.h socket.h inet.h dirent.h netdb.h \
+-                      cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
+-                      prio_queue.h pthread_attr.h pthread_once.h queue.h\
+-                      sleep.h specific.h version.h pwd.h timers.h uio.h \
+-                      cdefs.h machdep.h signal.h __signal.h util.h
+-
+ test: re tests
+       ./re < tests
+       ./re -el < tests
+--- mysql-3.23.37/isam/Makefile.am.amfix       Fri May 11 13:37:52 2001
++++ mysql-3.23.37/isam/Makefile.am     Fri May 11 13:38:18 2001
+@@ -36,15 +36,6 @@
+                       log.c changed.c static.c
+ isamchk_SOURCES =     isamchk.c sort.c
+ CLEANFILES =          test?.IS? isam.log
+-# Omit dependency for ../mit-pthreads/include/ things
+-OMIT_DEPENDENCIES =   pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
+-                      __math.h time.h __time.h unistd.h __unistd.h types.h \
+-                      xtypes.h ac-types.h posix.h string.h __string.h \
+-                      errno.h socket.h inet.h dirent.h netdb.h \
+-                      cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
+-                      prio_queue.h pthread_attr.h pthread_once.h queue.h\
+-                      sleep.h specific.h version.h pwd.h timers.h uio.h \
+-                      cdefs.h machdep.h signal.h __signal.h util.h wait.h
+ 
+ # Move to automake rules ?
+ prolint:;     plparse -b -u -hF1 "-width(0,0)" "-format=%f:%l:\s%t:%n\s%m" \
+--- mysql-3.23.37/merge/Makefile.am.amfix      Fri May 11 13:38:41 2001
++++ mysql-3.23.37/merge/Makefile.am    Fri May 11 13:38:50 2001
+@@ -21,14 +21,5 @@
+                       rrnd.c update.c delete.c rsame.c panic.c \
+                       close.c create.c static.c
+ 
+-OMIT_DEPENDENCIES =   pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
+-                      __math.h time.h __time.h unistd.h __unistd.h types.h \
+-                      xtypes.h ac-types.h posix.h string.h __string.h \
+-                      errno.h socket.h inet.h dirent.h netdb.h \
+-                      cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
+-                      prio_queue.h pthread_attr.h pthread_once.h queue.h\
+-                      sleep.h specific.h version.h pwd.h timers.h uio.h \
+-                      cdefs.h machdep.h signal.h __signal.h util.h
+-
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%
+--- mysql-3.23.37/myisam/Makefile.am.amfix     Fri May 11 13:38:50 2001
++++ mysql-3.23.37/myisam/Makefile.am   Fri May 11 13:39:13 2001
+@@ -48,17 +48,6 @@
+                       ft_update.c sort.c
+ CLEANFILES =          test?.MY? FT?.MY? isam.log mi_test_all
+ DEFS =                        -DMAP_TO_USE_RAID
+-# Omit dependency for ../mit-pthreads/include/sys that only exits if
+-# mit-pthreads are used
+-OMIT_DEPENDENCIES =   pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
+-                      __math.h time.h __time.h unistd.h __unistd.h types.h \
+-                      xtypes.h ac-types.h posix.h string.h __string.h \
+-                      errno.h socket.h inet.h dirent.h netdb.h \
+-                      cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
+-                      prio_queue.h pthread_attr.h pthread_once.h queue.h\
+-                      sleep.h specific.h version.h pwd.h timers.h uio.h \
+-                      cdefs.h machdep.h signal.h __signal.h util.h \
+-                      wait.h
+ 
+ # Move to automake rules ?
+ prolint:;     plparse -b -u -hF1 "-width(0,0)" "-format=%f:%l:\s%t:%n\s%m" \
+--- mysql-3.23.37/myisammrg/Makefile.am.amfix  Fri May 11 13:39:13 2001
++++ mysql-3.23.37/myisammrg/Makefile.am        Fri May 11 13:39:28 2001
+@@ -22,14 +22,5 @@
+                       myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \
+                       myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \
+                       myrg_rprev.c myrg_queue.c
+-OMIT_DEPENDENCIES =   pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
+-                      __math.h time.h __time.h unistd.h __unistd.h types.h \
+-                      xtypes.h ac-types.h posix.h string.h __string.h \
+-                      errno.h socket.h inet.h dirent.h netdb.h \
+-                      cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
+-                      prio_queue.h pthread_attr.h pthread_once.h queue.h\
+-                      sleep.h specific.h version.h pwd.h timers.h uio.h \
+-                      cdefs.h machdep.h signal.h __signal.h util.h
+-
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%
+--- mysql-3.23.37/heap/Makefile.am.amfix       Fri May 11 13:37:43 2001
++++ mysql-3.23.37/heap/Makefile.am     Fri May 11 13:37:52 2001
+@@ -29,14 +29,5 @@
+                       hp_rkey.c hp_block.c \
+                       hp_hash.c _check.c _rectest.c hp_static.c
+ 
+-OMIT_DEPENDENCIES =   pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
+-                      __math.h time.h __time.h unistd.h __unistd.h types.h \
+-                      xtypes.h ac-types.h posix.h string.h __string.h \
+-                      errno.h socket.h inet.h dirent.h netdb.h \
+-                      cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
+-                      prio_queue.h pthread_attr.h pthread_once.h queue.h\
+-                      sleep.h specific.h version.h pwd.h timers.h uio.h \
+-                      cdefs.h machdep.h signal.h __signal.h util.h
+-
+ # Don't update the files from bitkeeper
+ %::SCCS/s.%
+--- mysql-3.23.37/sql/Makefile.am.amfix        Fri May 11 13:39:51 2001
++++ mysql-3.23.37/sql/Makefile.am      Fri May 11 13:40:18 2001
+@@ -94,16 +94,6 @@
+ EXTRA_DIST =          udf_example.cc $(BUILT_SOURCES)
+ YFLAGS =              -d
+ 
+-OMIT_DEPENDENCIES =   pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\
+-                      __math.h time.h __time.h unistd.h __unistd.h types.h \
+-                      xtypes.h ac-types.h posix.h string.h __string.h \
+-                      errno.h socket.h inet.h dirent.h netdb.h \
+-                      cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \
+-                      prio_queue.h pthread_attr.h pthread_once.h queue.h\
+-                      sleep.h specific.h version.h pwd.h timers.h uio.h \
+-                      cdefs.h machdep.h signal.h __signal.h util.h lex.h \
+-                      wait.h
+-
+ link_sources:
+       rm -f mini_client_errors.c
+       @LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c