database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

merged 5.0-bugteam -> 5.1-bugteam

Browse Source
This commit is contained in:
Georgi Kodinov
2009-01-05 20:47:28 +02:00
parent f97ef7a40e 374f49b262
commit 6ff7a3264f
4 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_show.cc
View File

@@ -468,17 +468,11 @@ find_files(THD *thd, List<LEX_STRING> *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));
@@ -543,11 +537,8 @@ find_files(THD *thd, List<LEX_STRING> *files, const char *db,
{
if (lower_case_table_names)
{
if (my_wildcmp(files_charset_info,
uname, uname + file_name_len,
wild, wild + wild_length,
wild_prefix, wild_one, wild_many))
continue;
if (wild_case_compare(files_charset_info, uname, wild))
continue;
}
else if (wild_compare(uname, wild, 0))
continue;