diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2007-08-28 09:33:41 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2007-08-28 09:33:41 +0000 |
| commit | 493779bf8b0e3b5fb6a5335eba44f016489f6e96 (patch) | |
| tree | 6441e75f2006ef1d80c8a2fb9b9ba0ba18a0e86c /databases/mysql60-server/files | |
| parent | e72ecdc34d5a60671b9b22dd97e49ae814ea5b11 (diff) | |
| download | ports-493779bf8b0e3b5fb6a5335eba44f016489f6e96.tar.gz ports-493779bf8b0e3b5fb6a5335eba44f016489f6e96.zip | |
Notes
Diffstat (limited to 'databases/mysql60-server/files')
| -rw-r--r-- | databases/mysql60-server/files/patch-client_mysql_upgrade.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/databases/mysql60-server/files/patch-client_mysql_upgrade.c b/databases/mysql60-server/files/patch-client_mysql_upgrade.c new file mode 100644 index 000000000000..cc29b97ddc60 --- /dev/null +++ b/databases/mysql60-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); + |