1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1

Browse Source
This commit is contained in:
unknown 2005-06-22 20:59:33 +02:00
commit 31d0786687
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mysys/my_access.c
View File

@ -93,18 +93,20 @@ int check_if_legal_filename(const char *path)
path+= dirname_length(path); /* To start of filename */ path+= dirname_length(path); /* To start of filename */
if (!(end= strchr(path, FN_EXTCHAR))) if (!(end= strchr(path, FN_EXTCHAR)))
end= strend(path); end= strend(path);
if (path == end || (uint) (path - end) > MAX_RESERVED_NAME_LENGTH) if (path == end || (uint) (end - path) > MAX_RESERVED_NAME_LENGTH)
DBUG_RETURN(0); /* Simplify inner loop */ DBUG_RETURN(0); /* Simplify inner loop */
for (reserved_name= reserved_names; *reserved_name; reserved_name++) for (reserved_name= reserved_names; *reserved_name; reserved_name++)
{ {
const char *name= path; const char *name= path;
while (name != end) const char *current_reserved_name= *reserved_name;
while (name != end && *current_reserved_name)
{ {
if (my_toupper(&my_charset_latin1, *path) != if (*current_reserved_name != my_toupper(&my_charset_latin1, *name))
my_toupper(&my_charset_latin1, *name))
break; break;
if (name++ == end) current_reserved_name++;
if (++name == end)
DBUG_RETURN(1); /* Found wrong path */ DBUG_RETURN(1); /* Found wrong path */
} }
} }

2
sql/item.h
View File

@ -336,7 +336,7 @@ public:
virtual bool set_flags_processor(byte *args) virtual bool set_flags_processor(byte *args)
{ {
this->item_flags|= *((uint8*)args); this->item_flags|= *((uint8*)args);
return true; return false;
} }
}; };