diff options
| author | unknown <anna@hasky.mysql.fi> | 2006-06-02 22:31:51 +0300 |
|---|---|---|
| committer | unknown <anna@hasky.mysql.fi> | 2006-06-02 22:31:51 +0300 |
| commit | a9a4202c9c34e8adf96f6f71ca4e885774b86232 (patch) | |
| tree | 5559454081305d161db89d28c1ecf96622161483 /sql | |
| parent | 9b871930a9189cce16b39dc5576f3592a34959ba (diff) | |
| parent | 59a33015b461216c22fdf51585a53c9afecf9bfb (diff) | |
| download | mariadb-git-a9a4202c9c34e8adf96f6f71ca4e885774b86232.tar.gz | |
Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into hasky.mysql.fi:/home/anjuta/my/mysql-5.0-clean
sql/table.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/table.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index cfdb9bd93aa..711f250c271 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1614,6 +1614,10 @@ 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; @@ -1656,6 +1660,10 @@ 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) |