Commit 436805f1 authored by unknown's avatar unknown

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged
parents aa3a93d6 0100c53f
No related merge requests found
......@@ -378,7 +378,7 @@ find_file(const char *name, const char *root, uint flags, char *result, size_t l
{
int ret;
va_list va;
FILEINFO key= { name };
FILEINFO key= { (char*)name, NULL };
const char *subdir;
char *cp;
......@@ -395,7 +395,6 @@ find_file(const char *name, const char *root, uint flags, char *result, size_t l
{
MY_DIR *dir;
FILEINFO *match;
uint i;
char *cp1;
cp1= strnmov(cp + 1, subdir, len - (cp - result) - 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment