1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Reverted the fix for bug #25830 because of omissions and non-complete test

case.
This commit is contained in:
Georgi Kodinov
2009-01-05 12:37:56 +02:00
parent 4c788d93b1
commit e56284128f
4 changed files with 4 additions and 35 deletions

View File

@@ -287,17 +287,11 @@ find_files(THD *thd, List<char> *files, const char *db,
#ifndef NO_EMBEDDED_ACCESS_CHECKS
uint col_access=thd->col_access;
#endif
uint wild_length= 0;
TABLE_LIST table_list;
DBUG_ENTER("find_files");
if (wild)
{
if (!wild[0])
wild= 0;
else
wild_length= strlen(wild);
}
if (wild && !wild[0])
wild=0;
bzero((char*) &table_list,sizeof(table_list));
@@ -346,11 +340,8 @@ find_files(THD *thd, List<char> *files, const char *db,
{
if (lower_case_table_names)
{
if (my_wildcmp(files_charset_info,
file->name, file->name + strlen(file->name),
wild, wild + wild_length,
wild_prefix, wild_one, wild_many))
continue;
if (wild_case_compare(files_charset_info, file->name, wild))
continue;
}
else if (wild_compare(file->name,wild,0))
continue;