diff options
| author | unknown <monty@mysql.com> | 2006-04-19 11:17:32 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-04-19 11:17:32 +0300 |
| commit | 7b5314c0d1dad33ed45cc8a61564c882d64b0898 (patch) | |
| tree | d1d0fab1d52096a7ba2e90840c424419972038f2 | |
| parent | ac487dc4c78f2b3527a90e9bb7cde1980e6225f7 (diff) | |
| download | mariadb-git-7b5314c0d1dad33ed45cc8a61564c882d64b0898.tar.gz | |
Fix wrong auto merge
| -rw-r--r-- | mysys/my_access.c | 8 |
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__) |