summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-05-05 17:05:24 +0300
committermonty@mysql.com <>2004-05-05 17:05:24 +0300
commitd21d49a32a1689d2c486a449574e120d7a2f60c4 (patch)
tree3238bd16530e02dbfef96513749a73b7294880f8 /sql/sql_base.cc
parent104fdf607d312bb13f24063d28d993243bf24ca2 (diff)
parente51887b05082622a1882217b7f8ec8ae7f6b4598 (diff)
downloadmariadb-git-d21d49a32a1689d2c486a449574e120d7a2f60c4.tar.gz
Merge with 4.0.19
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 75c7a779180..3a18b7eaabc 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2607,9 +2607,15 @@ static void mysql_rm_tmp_tables(void)
/* Remove all SQLxxx tables from directory */
- for (idx=2 ; idx < (uint) dirp->number_off_files ; idx++)
+ for (idx=0 ; idx < (uint) dirp->number_off_files ; idx++)
{
file=dirp->dir_entry+idx;
+
+ /* skiping . and .. */
+ if (file->name[0] == '.' && (!file->name[1] ||
+ (file->name[1] == '.' && !file->name[2])))
+ continue;
+
if (!bcmp(file->name,tmp_file_prefix,tmp_file_prefix_length))
{
sprintf(filePath,"%s%s",tmpdir,file->name);