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

Function mysql_rm_tmp_tables():

Browse Source 
fixed valgrind error
fixed indentation
This commit is contained in:
gluh@mysql.com/eagle.(none)
2007-01-12 13:34:33 +04:00
parent 215d3da7d2
commit a33f2719e2
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
sql/sql_base.cc
View File

@ -6103,36 +6103,36 @@ my_bool mysql_rm_tmp_tables(void)
(file->name[1] == '.' && !file->name[2]))) (file->name[1] == '.' && !file->name[2])))
continue; continue;
if (!bcmp(file->name,tmp_file_prefix,tmp_file_prefix_length)) if (!bcmp(file->name,tmp_file_prefix,tmp_file_prefix_length))
{
char *ext= fn_ext(file->name);
uint ext_len= strlen(ext);
uint filePath_len= my_snprintf(filePath, sizeof(filePath),
"%s%c%s", tmpdir, FN_LIBCHAR,
file->name);
if (!bcmp(reg_ext, ext, ext_len))
{ {
handler *handler_file= 0; char *ext= fn_ext(file->name);
/* We should cut file extention before deleting of table */ uint ext_len= strlen(ext);
memcpy(filePathCopy, filePath, filePath_len - ext_len); uint filePath_len= my_snprintf(filePath, sizeof(filePath),
filePathCopy[filePath_len - ext_len]= 0; "%s%c%s", tmpdir, FN_LIBCHAR,
init_tmp_table_share(&share, "", 0, "", filePathCopy); file->name);
if (!open_table_def(thd, &share, 0) && if (!bcmp(reg_ext, ext, ext_len))
((handler_file= get_new_handler(&share, thd->mem_root,
share.db_type))))
{ {
handler_file->delete_table(filePathCopy); handler *handler_file= 0;
delete handler_file; /* We should cut file extention before deleting of table */
memcpy(filePathCopy, filePath, filePath_len - ext_len);
filePathCopy[filePath_len - ext_len]= 0;
init_tmp_table_share(&share, "", 0, "", filePathCopy);
if (!open_table_def(thd, &share, 0) &&
((handler_file= get_new_handler(&share, thd->mem_root,
share.db_type))))
{
handler_file->delete_table(filePathCopy);
delete handler_file;
}
free_table_share(&share);
} }
free_table_share(&share); /*
File can be already deleted by tmp_table.file->delete_table().
So we hide error messages which happnes during deleting of these
files(MYF(0)).
*/
VOID(my_delete(filePath, MYF(0)));
} }
}
/*
File can be already deleted by tmp_table.file->delete_table().
So we hide error messages which happnes during deleting of these
files(MYF(0)).
*/
VOID(my_delete(filePath, MYF(0)));
} }
my_dirend(dirp); my_dirend(dirp);
} }