diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 21:21:00 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 21:21:00 +0100 |
| commit | e9c502b3995c2e8dd0b5c3fb878e371a548989ba (patch) | |
| tree | 4fbea385576c49a27b12bc53a22afa9b05b6c70e /client/mysql_upgrade.c | |
| parent | 16918343a8883c353514b869e3ee6b228e458bdf (diff) | |
| parent | 4ab2a0164a537e9e7a5a41b07f75a907ba6a1913 (diff) | |
| download | mariadb-git-e9c502b3995c2e8dd0b5c3fb878e371a548989ba.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into mysql.com:/home/kent/bk/mysql-5.0
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index e2b5931c2eb..520d87b5ed7 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -373,22 +373,24 @@ static int comp_names(struct fileinfo *a, struct fileinfo *b) } -static int -find_file(const char *name, const char *root, uint flags, char *result, size_t len, ...) +static int find_file(const char *name, const char *root, + uint flags, char *result, size_t len, ...) { - int ret; + int ret= 1; va_list va; - FILEINFO key= { (char*)name, NULL }; const char *subdir; char *cp; - + FILEINFO key; + + /* Init key with name of the file to look for */ + key.name= (char*)name; + DBUG_ASSERT(root != NULL); cp= strmake(result, root, len); if (cp[-1] != FN_LIBCHAR) *cp++= FN_LIBCHAR; - ret= 1; va_start(va, len); subdir= (!(flags & MY_SEARCH_SELF)) ? va_arg(va, char *) : ""; while (subdir) |