diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-07-05 14:41:04 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-07-05 14:41:04 +0300 |
| commit | 5a496caeb579e4f0253388356863f36a7727f0ae (patch) | |
| tree | d3241952f092c35a2f105cec61abaf2c6004983c /mysys | |
| parent | fb3e11d0ab9317a73619d1e5c01669a7c6e034f9 (diff) | |
| parent | 048577429f3adcb27100ace3dd6fd4579bcd9e53 (diff) | |
| download | mariadb-git-5a496caeb579e4f0253388356863f36a7727f0ae.tar.gz | |
merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_access.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_access.c b/mysys/my_access.c index 210946d50a8..43917da7f98 100644 --- a/mysys/my_access.c +++ b/mysys/my_access.c @@ -148,7 +148,8 @@ static char reserved_map[256]= int check_if_legal_tablename(const char *name) { DBUG_ENTER("check_if_legal_tablename"); - DBUG_RETURN((reserved_map[(uchar) name[0]] & 1) && + DBUG_RETURN(name[0] != 0 && name[1] != 0 && + (reserved_map[(uchar) name[0]] & 1) && (reserved_map[(uchar) name[1]] & 2) && (reserved_map[(uchar) name[2]] & 4) && str_list_find(&reserved_names[1], name)); |