summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-04-13 15:34:39 +0300
committermonty@hundin.mysql.fi <>2002-04-13 15:34:39 +0300
commitb5a145d87290aad611c3aa71e5e9a736d467ec5a (patch)
tree6bb12842fb04d64fa854f04ec3d07da1e1f7c48b /sql/sql_db.cc
parente5866a7a316869d06677babdd45a62dfe6026db1 (diff)
parentee737d2fc2b2a1ec64e54146c986f2535314ae4e (diff)
downloadmariadb-git-b5a145d87290aad611c3aa71e5e9a736d467ec5a.tar.gz
merge
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r--sql/sql_db.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 9f521ac5ffd..032cbf3d6a3 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -218,7 +218,8 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
DBUG_PRINT("info",("Examining: %s", file->name));
/* Check if file is a raid directory */
- if (isdigit(file->name[0]) && isdigit(file->name[1]) &&
+ if (my_isdigit(system_charset_info,file->name[0]) &&
+ my_isdigit(system_charset_info,file->name[1]) &&
!file->name[2] && !level)
{
char newpath[FN_REFLEN];
@@ -243,7 +244,8 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
continue;
}
strxmov(filePath,org_path,"/",file->name,NullS);
- if (db && !my_strcasecmp(fn_ext(file->name), reg_ext))
+ if (db && !my_strcasecmp(system_charset_info,
+ fn_ext(file->name), reg_ext))
{
/* Drop the table nicely */
*fn_ext(file->name)=0; // Remove extension