summaryrefslogtreecommitdiff
path: root/mysys/my_access.c
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2006-04-19 11:09:33 +0300
committerunknown <monty@mysql.com>2006-04-19 11:09:33 +0300
commit030945969f9ec72dfc3e004948f321b4c83869ac (patch)
tree27332c4273248c15fcf3f2623dedd75ea17285e0 /mysys/my_access.c
parentb965209489f838cf46c7ee9b964cbda93433014e (diff)
parentc44eff55ba984d13a338fd78adc179b818a07cf7 (diff)
downloadmariadb-git-030945969f9ec72dfc3e004948f321b4c83869ac.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/my/mysql-5.1 mysys/my_access.c: Auto merged
Diffstat (limited to 'mysys/my_access.c')
-rw-r--r--mysys/my_access.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/mysys/my_access.c b/mysys/my_access.c
index d2ade6c889b..7d63d9eff5e 100644
--- a/mysys/my_access.c
+++ b/mysys/my_access.c
@@ -155,6 +155,14 @@ 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__)
@@ -198,4 +206,5 @@ int check_if_legal_filename(const char *path)
}
DBUG_RETURN(0);
}
-#endif
+
+#endif /* defined(MSDOS) || defined(__WIN__) || defined(__EMX__) */