bk commit into 5.0 tree (dfischer:1.2319)

[df]

Below is the list of changes that have just been committed into a local
5.0 repository of mysqldev. When mysqldev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-11 16:43:52+01:00, dfischer@stripped +1 -0
  mysql_upgrade.c:
    netware build fix

  client/mysql_upgrade.c@stripped, 2007-01-11 16:43:35+01:00, dfischer@stripped +4
-3
    netware build fix

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dfischer
# Host:	suse9-x86.mysql.com
# Root:	/data0/mydev/mysql-5.0.30sp1-build

--- 1.10/client/mysql_upgrade.c	2007-01-11 16:44:01 +01:00
+++ 1.11/client/mysql_upgrade.c	2007-01-11 16:44:01 +01:00
@@ -376,19 +376,20 @@
 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 };
+  FILEINFO key;
   const char *subdir;
   char *cp;
   
+  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)