database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Georgi Kodinov
2012-07-05 14:41:04 +03:00
parent 58e78da60f 42644a0746
commit 8b75496856
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysys/my_access.c
View File

@ -148,7 +148,8 @@ static char reserved_map[256]=
int check_if_legal_tablename(const char *name) int check_if_legal_tablename(const char *name)
{ {
DBUG_ENTER("check_if_legal_tablename"); 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[1]] & 2) &&
(reserved_map[(uchar) name[2]] & 4) && (reserved_map[(uchar) name[2]] & 4) &&
str_list_find(&reserved_names[1], name)); str_list_find(&reserved_names[1], name));

4
strings/ctype-utf8.c
View File

@ -4421,6 +4421,10 @@ my_wc_mb_filename(CHARSET_INFO *cs __attribute__((unused)),
{ {
int code; int code;
char hex[]= "0123456789abcdef"; char hex[]= "0123456789abcdef";
if (s >= e)
return MY_CS_TOOSMALL;
if (wc < 128 && filename_safe_char[wc]) if (wc < 128 && filename_safe_char[wc])
{ {
*s= (uchar) wc; *s= (uchar) wc;