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

Fix check_table_file_presence:

Browse Source 
On Windows, do not attempt access() for special device names like
CON, PRN etc. access() would return 0, this does not mean that fiile
with this name exists.
This commit is contained in:
Vladislav Vaintroub 2011-05-12 15:31:11 +02:00
parent 520927a7df
commit 1c95254523
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_table.cc
View File

@ -3645,9 +3645,19 @@ bool check_table_file_presence(char *old_path,
Except case when it is the same table. Except case when it is the same table.
*/ */
char tbl50[FN_REFLEN]; char tbl50[FN_REFLEN];
#ifdef _WIN32
if (check_if_legal_tablename(table_name) != 0)
{
/*
Check for reserved device names for which access() returns 0
(CON, AUX etc).
*/
return FALSE;
}
#endif
strxmov(tbl50, mysql_data_home, "/", db, "/", table_name, NullS); strxmov(tbl50, mysql_data_home, "/", db, "/", table_name, NullS);
if (!access(fn_format(tbl50, tbl50, "", reg_ext, fn_format(tbl50, tbl50, "", reg_ext, MY_UNPACK_FILENAME);
MY_UNPACK_FILENAME), F_OK) && if (!access(tbl50, F_OK) &&
(old_path == NULL || (old_path == NULL ||
strcmp(old_path, tbl50) != 0)) strcmp(old_path, tbl50) != 0))
{ {