Fix wrong auto merge

8901455d · monty@mysql.com · 77b6bc42 · 8901455d
Commit 8901455d authored Apr 19, 2006 by monty@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

mysys/my_access.c mysys/my_access.c +0 -8

No files found.
--- 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__)