diff options
| author | unknown <elliot@mysql.com> | 2006-06-26 04:48:16 +0200 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2006-06-26 04:48:16 +0200 |
| commit | eef15bdf4610a4bf6b28a3ffaa9e6047b3060653 (patch) | |
| tree | 332f66ef58f955fc87fc490524db51e1525adcf0 /sql/table.cc | |
| parent | 9d7799e7a89235d9799eb0e8acd8a52c79746107 (diff) | |
| parent | 971193167a5c433a327ac18bc0442d34ba83ca68 (diff) | |
| download | mariadb-git-eef15bdf4610a4bf6b28a3ffaa9e6047b3060653.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/data0/bk/mysql-5.0-maint
sql/sp_head.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/table.cc b/sql/table.cc index f3c9b8f8a8a..9ec9463c33c 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1593,10 +1593,6 @@ bool check_db_name(char *name) if (*name == '/' || *name == '\\' || *name == FN_LIBCHAR || *name == FN_EXTCHAR) return 1; -#ifdef FN_DEVCHAR - if (*name == FN_DEVCHAR) - return 1; -#endif name++; } return last_char_is_space || (uint) (name - start) > NAME_LEN; @@ -1639,10 +1635,6 @@ bool check_table_name(const char *name, uint length) #endif if (*name == '/' || *name == '\\' || *name == FN_EXTCHAR) return 1; -#ifdef FN_DEVCHAR - if (*name == FN_DEVCHAR) - return 1; -#endif name++; } #if defined(USE_MB) && defined(USE_MB_IDENT) |