summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-08-31 19:12:16 -0700
committerunknown <jimw@mysql.com>2005-08-31 19:12:16 -0700
commitd1c80dd648ecfdea14af7332395facec2d0552a4 (patch)
treed1f472d71ff75d1aa210d6a6e3c0a0ade588ac60 /mysys
parentbdddd8c089c05ac8e74ab4996c601175d52a5dc8 (diff)
parent1b6fdf86f93c63b10841d16da5fd403302c259da (diff)
downloadmariadb-git-d1c80dd648ecfdea14af7332395facec2d0552a4.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean configure.in: Auto merged include/my_global.h: Auto merged myisam/mi_extra.c: Auto merged mysql-test/r/lowercase_table.result: Auto merged mysql-test/t/lowercase_table.test: Auto merged mysys/my_access.c: Auto merged BitKeeper/deleted/.del-extra.c~706f29d72beb2565: Auto merged sql/examples/ha_tina.cc: Resolve conflict
Diffstat (limited to 'mysys')
-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 256749ed447..99e7a28914d 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);
}