diff options
Diffstat (limited to 'databases/mysql51-server/files')
4 files changed, 30 insertions, 48 deletions
diff --git a/databases/mysql51-server/files/patch-Docs::Makefile.in b/databases/mysql51-server/files/patch-Docs::Makefile.in index 7424656ab673..3a4f448240cf 100644 --- a/databases/mysql51-server/files/patch-Docs::Makefile.in +++ b/databases/mysql51-server/files/patch-Docs::Makefile.in @@ -1,29 +1,11 @@ ---- Docs/Makefile.in.orig Tue Mar 22 20:27:11 2005 -+++ Docs/Makefile.in Wed Apr 6 13:00:28 2005 -@@ -359,7 +359,7 @@ - - SUBDIRS = Images - GT = $(srcdir)/Support/generate-text-files.pl --all: $(BUILT_SOURCES) -+all: - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: -@@ -669,7 +669,7 @@ - for dir in "$(DESTDIR)$(infodir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done --install: $(BUILT_SOURCES) -+install: - $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -793,7 +793,7 @@ - tags tags-recursive uninstall uninstall-am uninstall-info-am +--- Docs/Makefile.in.orig Fri Jun 3 14:54:01 2005 ++++ Docs/Makefile.in Fri Jun 3 14:55:32 2005 +@@ -494,7 +494,7 @@ + uninstall-info-am --all: $(targets) txt_files +-all: txt_files +all: - txt_files: ../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ + txt_files: ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \ INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt diff --git a/databases/mysql51-server/files/patch-Makefile.in b/databases/mysql51-server/files/patch-Makefile.in index 56adfc29a52f..6790f0a052f5 100644 --- a/databases/mysql51-server/files/patch-Makefile.in +++ b/databases/mysql51-server/files/patch-Makefile.in @@ -1,15 +1,15 @@ ---- Makefile.in.orig Tue Mar 22 20:27:12 2005 -+++ Makefile.in Wed Apr 6 13:07:04 2005 -@@ -358,12 +358,7 @@ +--- Makefile.in.orig Thu May 26 15:27:53 2005 ++++ Makefile.in Fri Jun 3 15:05:48 2005 +@@ -355,12 +355,7 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT --SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ +-SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ - @readline_topdir@ sql-common \ - @thread_dirs@ pstack \ - @sql_union_dirs@ scripts man tests \ - netware @libmysqld_dirs@ \ -- @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ +- @bench_dirs@ support-files @tools_dirs@ +SUBDIRS = DIST_SUBDIRS = . include @docs_dirs@ zlib \ diff --git a/databases/mysql51-server/files/patch-mysys_default.c b/databases/mysql51-server/files/patch-mysys_default.c index af61098b1855..7c1dbe23aa9a 100644 --- a/databases/mysql51-server/files/patch-mysys_default.c +++ b/databases/mysql51-server/files/patch-mysys_default.c @@ -1,8 +1,17 @@ ---- mysys/default.c.orig Mon Apr 11 11:17:07 2005 -+++ mysys/default.c Mon Apr 11 11:27:25 2005 -@@ -703,9 +703,8 @@ - *ptr++= "sys:/etc/"; - #else +--- mysys/default.c.orig Thu May 26 15:26:56 2005 ++++ mysys/default.c Fri Jun 3 17:16:59 2005 +@@ -517,7 +517,7 @@ + { + MY_STAT stat_info; + if (!my_stat(name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore world-writable regular files. + This is mainly done to protect us to not read a file created by +@@ -867,9 +867,8 @@ + *ptr++= env; + #endif *ptr++= "/etc/"; + *ptr++= "%%PREFIX%%/etc/"; #endif diff --git a/databases/mysql51-server/files/patch-scripts::Makefile.in b/databases/mysql51-server/files/patch-scripts::Makefile.in index 405818e00304..84475df09f4a 100644 --- a/databases/mysql51-server/files/patch-scripts::Makefile.in +++ b/databases/mysql51-server/files/patch-scripts::Makefile.in @@ -1,8 +1,8 @@ ---- scripts/Makefile.in.orig Tue Mar 22 20:27:34 2005 -+++ scripts/Makefile.in Wed Apr 6 13:16:58 2005 -@@ -336,26 +336,7 @@ - tools_dirs = @tools_dirs@ +--- scripts/Makefile.in.orig Thu May 26 15:28:18 2005 ++++ scripts/Makefile.in Fri Jun 3 15:09:08 2005 +@@ -333,26 +333,7 @@ uname_prog = @uname_prog@ + yassl_dir = @yassl_dir@ zlib_dir = @zlib_dir@ -bin_SCRIPTS = @server_scripts@ \ - msql2mysql \ @@ -28,7 +28,7 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \ make_sharedlib_distribution.sh \ -@@ -386,7 +367,7 @@ +@@ -382,7 +363,7 @@ mysqlaccess.conf \ mysqlbug @@ -37,12 +37,3 @@ # mysqlbug should be distributed built so that people can report build # failures with it. -@@ -677,8 +658,6 @@ - - all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution - --fill_help_tables.sql: fill_help_tables ../Docs/manual.texi -- ./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: |