From f5b3c3b8732fb33114560a11d9b4d7796de88c5a Mon Sep 17 00:00:00 2001
From: ale <ale@FreeBSD.org>
Date: Tue, 28 Aug 2007 09:33:41 +0000
Subject: Update to 5.1.21 release.

---
 .../files/patch-client_mysql_upgrade.c             | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 databases/mysql51-server/files/patch-client_mysql_upgrade.c

(limited to 'databases/mysql51-server/files')

diff --git a/databases/mysql51-server/files/patch-client_mysql_upgrade.c b/databases/mysql51-server/files/patch-client_mysql_upgrade.c
new file mode 100644
index 000000000000..cc29b97ddc60
--- /dev/null
+++ b/databases/mysql51-server/files/patch-client_mysql_upgrade.c
@@ -0,0 +1,36 @@
+--- 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));
+ 
+     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);
+ 
-- 
cgit