Update to 5.1.23 release.

5 files changed, 36 insertions, 89 deletions

diff --git a/databases/mysql54-server/files/patch-Docs::Makefile.in b/databases/mysql54-server/files/patch-Docs::Makefile.in
index 677da903d045..51888b7712cc 100644
--- a/databases/mysql54-server/files/patch-Docs::Makefile.in
+++ b/databases/mysql54-server/files/patch-Docs::Makefile.in
@@ -1,15 +1,15 @@
---- Docs/Makefile.in.orig	Fri Jun  2 20:02:56 2006
-+++ Docs/Makefile.in	Thu Jun 15 07:18:41 2006
-@@ -370,7 +370,7 @@
- # generated files explicitly in DISTCLEANFILES.
- DISTCLEANFILES = $(TXT_FILES)
- GT = $(srcdir)/generate-text-files.pl
+--- Docs/Makefile.in.orig	2008-01-29 22:43:40.000000000 +0100
++++ Docs/Makefile.in	2008-02-14 08:21:57.000000000 +0100
+@@ -368,7 +368,7 @@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+ EXTRA_DIST = mysql.info INSTALL-BINARY @extra_docs@
 -all: all-am
 +all:
  
  .SUFFIXES:
  $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-@@ -458,7 +458,7 @@
+@@ -453,7 +453,7 @@
  install-data: install-data-am
  uninstall: uninstall-am
  
diff --git a/databases/mysql54-server/files/patch-Makefile.in b/databases/mysql54-server/files/patch-Makefile.in
index dc92a178a9e8..bea65ccf9521 100644
--- a/databases/mysql54-server/files/patch-Makefile.in
+++ b/databases/mysql54-server/files/patch-Makefile.in
@@ -1,12 +1,12 @@
---- Makefile.in.orig	Tue May  8 11:43:16 2007
-+++ Makefile.in	Thu May 17 09:28:15 2007
-@@ -396,14 +396,7 @@
+--- Makefile.in.orig	2008-01-29 22:44:32.000000000 +0100
++++ Makefile.in	2008-02-14 08:23:39.000000000 +0100
+@@ -398,14 +398,7 @@
  EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
  			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
  
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common scripts \
--			@thread_dirs@ pstack \
+-			@pstack_dir@ \
 -			@sql_union_dirs@ unittest storage plugin \
 -			@sql_server@ @man_dirs@ tests \
 -			netware @libmysqld_dirs@ \
@@ -14,5 +14,5 @@
 -			win
 +SUBDIRS =
  
- DIST_SUBDIRS = $(SUBDIRS) BUILD debian
- DISTCLEANFILES = ac_available_languages_fragment
+ DIST_SUBDIRS = . include Docs zlib \
+ 			cmd-line-utils sql-common scripts \
diff --git a/databases/mysql54-server/files/patch-client_mysql_upgrade.c b/databases/mysql54-server/files/patch-client_mysql_upgrade.c
index cc29b97ddc60..14c5130605c7 100644
--- a/databases/mysql54-server/files/patch-client_mysql_upgrade.c
+++ b/databases/mysql54-server/files/patch-client_mysql_upgrade.c
@@ -1,36 +1,13 @@
---- client/mysql_upgrade.c.orig	Tue Aug 28 11:16:33 2007
-+++ client/mysql_upgrade.c	Tue Aug 28 11:22:24 2007
-@@ -395,7 +395,6 @@
-       path[0]= 0;
-     }
-   }
--  do
-   {
-     size_t path_len;
-     DBUG_PRINT("enter", ("path: %s", path));
-@@ -411,22 +410,14 @@
-               path, "", MYF(MY_REPLACE_DIR));
+--- client/mysql_upgrade.c.orig	2008-01-29 22:42:00.000000000 +0100
++++ client/mysql_upgrade.c	2008-02-14 08:29:52.000000000 +0100
+@@ -427,10 +427,6 @@
  
-     verbose("Looking for '%s' in: %s", tool_name, tool_path);
--
--    /* Make sure the tool exists */
--    if (my_access(tool_path, F_OK) != 0)
--      die("Can't find '%s'", tool_path);
--
--    /*
--      Make sure it can be executed, otherwise try again
--      in higher level directory
--    */
-   }
--  while(run_tool(tool_path,
-+  if(run_tool(tool_path,
-                  &ds_tmp, /* Get output from command, discard*/
-                  "--help",
-                  "2>&1",
-                  IF_WIN("> NUL", "> /dev/null"),
--                 NULL));
-+                 NULL))
-+      die("Can't run '%s'", tool_path);
- 
-   dynstr_free(&ds_tmp);
+   verbose("Looking for '%s' in: %s", tool_name, tool_path);
  
+-  /* Make sure the tool exists */
+-  if (my_access(tool_path, F_OK) != 0)
+-    die("Can't find '%s'", tool_path);
+-
+   /*
+     Make sure it can be executed
+   */
diff --git a/databases/mysql54-server/files/patch-include_my_global.h b/databases/mysql54-server/files/patch-include_my_global.h
deleted file mode 100644
index be6bf96f1841..000000000000
--- a/databases/mysql54-server/files/patch-include_my_global.h
+++ /dev/null
@@ -1,27 +0,0 @@
---- include/my_global.h.orig	Mon Jul  2 08:06:55 2007
-+++ include/my_global.h	Mon Jul  2 08:07:53 2007
-@@ -561,12 +561,6 @@
- #define PURIFY_OR_LINT_INIT(var)
- #endif
- 
--/* Define some useful general macros */
--#if !defined(max)
--#define max(a, b)	((a) > (b) ? (a) : (b))
--#define min(a, b)	((a) < (b) ? (a) : (b))
--#endif
--
- #if !defined(HAVE_UINT)
- #undef HAVE_UINT
- #define HAVE_UINT
-@@ -1508,5 +1502,11 @@
- 
- /* Length of decimal number represented by INT64. */
- #define MY_INT64_NUM_DECIMAL_DIGITS 21
-+
-+/* Define some useful general macros */
-+#if !defined(max)
-+#define max(a, b)	((a) > (b) ? (a) : (b))
-+#define min(a, b)	((a) < (b) ? (a) : (b))
-+#endif
- 
- #endif /* my_global_h */
diff --git a/databases/mysql54-server/files/patch-mysys_default.c b/databases/mysql54-server/files/patch-mysys_default.c
index 02f3fa45eb91..66605f0694f9 100644
--- a/databases/mysql54-server/files/patch-mysys_default.c
+++ b/databases/mysql54-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig	Tue Jan 30 09:34:13 2007
-+++ mysys/default.c	Sat Feb  3 17:12:31 2007
-@@ -608,7 +608,7 @@
+--- mysys/default.c.orig	2008-01-29 22:41:43.000000000 +0100
++++ mysys/default.c	2008-02-14 11:03:21.000000000 +0100
+@@ -623,7 +623,7 @@
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,15 +9,12 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -1013,9 +1013,9 @@
- #else
-   *ptr++= "/etc/";
-   *ptr++= "/etc/mysql/";
-+  *ptr++= "%%PREFIX%%/etc/";
-+  *ptr++= "%%PREFIX%%/etc/mysql/";
- #endif
--  if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
--    *ptr++= env;
-   *ptr++= "";			/* Place for defaults_extra_file */
- #if !defined(__WIN__) && !defined(__NETWARE__)
-   *ptr++= "~/";;
+@@ -1102,6 +1102,8 @@
+   bzero((char *) default_directories, sizeof(default_directories));
+   ADD_DIRECTORY("/etc/");
+   ADD_DIRECTORY("/etc/mysql/");
++  ADD_DIRECTORY("%%PREFIX%%/etc/");
++  ADD_DIRECTORY("%%PREFIX%%/etc/mysql/");
+ #ifdef DEFAULT_SYSCONFDIR
+   if (DEFAULT_SYSCONFDIR != "")
+     ADD_DIRECTORY(DEFAULT_SYSCONFDIR);