summaryrefslogtreecommitdiff
path: root/mysys/my_access.c
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2006-04-19 11:17:32 +0300
committerunknown <monty@mysql.com>2006-04-19 11:17:32 +0300
commit2ae7db326d68eee1e1e256df17fa988a68a8e7a1 (patch)
treed1d0fab1d52096a7ba2e90840c424419972038f2 /mysys/my_access.c
parent030945969f9ec72dfc3e004948f321b4c83869ac (diff)
downloadmariadb-git-2ae7db326d68eee1e1e256df17fa988a68a8e7a1.tar.gz
Fix wrong auto merge
Diffstat (limited to 'mysys/my_access.c')
-rw-r--r--mysys/my_access.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/mysys/my_access.c b/mysys/my_access.c
index 7d63d9eff5e..871de8de0b8 100644
--- a/mysys/my_access.c
+++ b/mysys/my_access.c
@@ -155,14 +155,6 @@ int check_if_legal_tablename(const char *name)
str_list_find(&reserved_names[1], name));
}
-#else
-
-int check_if_legal_tablename(const char *name)
-{
- return 0;
-}
-
-#endif /* defined(MSDOS) || defined(__WIN__) */
#if defined(MSDOS) || defined(__WIN__) || defined(__EMX__)