diff options
| author | unknown <serg@serg.mylan> | 2004-05-29 17:52:20 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-05-29 17:52:20 +0200 |
| commit | f1ffa139230da35d789350c5e4502b001b839468 (patch) | |
| tree | 08f61e355ca9587836739a2797394f16ca88fc87 /sql/sql_show.cc | |
| parent | a4d82ab8fe2678fd0586fad16bae3e345bb7ef3d (diff) | |
| download | mariadb-git-f1ffa139230da35d789350c5e4502b001b839468.tar.gz | |
backport wild_compare fix from 4.1 - bug#3924
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index a4ef735c715..26163ed9bef 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -78,7 +78,7 @@ mysqld_show_dbs(THD *thd,const char *wild) { if (thd->master_access & (DB_ACLS | SHOW_DB_ACL) || acl_get(thd->host, thd->ip, (char*) &thd->remote.sin_addr, - thd->priv_user, file_name) || + thd->priv_user, file_name, 0) || (grant_option && !check_grant_db(thd, file_name))) { thd->packet.length(0); @@ -214,7 +214,7 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path, #endif { if (file->name[0] == '.' || !MY_S_ISDIR(file->mystat->st_mode) || - (wild && wild_compare(file->name,wild))) + (wild && wild_compare(file->name,wild, 0))) continue; } } @@ -232,7 +232,7 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path, if (wild_case_compare(file->name,wild)) continue; } - else if (wild_compare(file->name,wild)) + else if (wild_compare(file->name,wild, 0)) continue; } } |