1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Manual-merge from 5.5-bugfixing.

This commit is contained in:
Ramil Kalimullin
2010-11-18 15:01:50 +03:00
386 changed files with 5695 additions and 22684 deletions

View File

@ -482,12 +482,6 @@ find_files(THD *thd, List<LEX_STRING> *files, const char *db,
else if (wild_compare(uname, wild, 0))
continue;
}
if (!(file_name=
thd->make_lex_string(file_name, uname, file_name_len, TRUE)))
{
my_dirend(dirp);
DBUG_RETURN(FIND_FILES_OOM);
}
}
else
{