summaryrefslogtreecommitdiff
path: root/mysys/my_access.c
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-08-31 18:32:15 -0700
committerunknown <jimw@mysql.com>2005-08-31 18:32:15 -0700
commitb33e9493a1e21b240e935788cd07696f237e8e94 (patch)
treea60bbdc85012c14e9a336099e853fddfb6062bad /mysys/my_access.c
parente6ac9175d13091b8bd7661b5e8ae8d3add81fbb0 (diff)
downloadmariadb-git-b33e9493a1e21b240e935788cd07696f237e8e94.tar.gz
Fix handling of filenames that start the same as reserved filenames
on Windows. (Bug #12325) mysql-test/r/lowercase_table.result: Update results mysql-test/t/lowercase_table.test: Move test to new windows.test, since it is Windows-specific mysys/my_access.c: Check that we've matched the whole forbidden name. mysql-test/include/windows.inc: New BitKeeper file ``mysql-test/include/windows.inc'' mysql-test/r/windows.result: New BitKeeper file ``mysql-test/r/windows.result'' mysql-test/t/windows.test: New BitKeeper file ``mysql-test/t/windows.test''
Diffstat (limited to 'mysys/my_access.c')
-rw-r--r--mysys/my_access.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_access.c b/mysys/my_access.c
index 8fc83a020cf..237312b5c9b 100644
--- a/mysys/my_access.c
+++ b/mysys/my_access.c
@@ -105,7 +105,7 @@ int check_if_legal_filename(const char *path)
{
if (*reserved != my_toupper(&my_charset_latin1, *name))
break;
- if (++name == end)
+ if (++name == end && !reserved[1])
DBUG_RETURN(1); /* Found wrong path */
} while (*++reserved);
}