Don't delete non existing .TMD and .OLD files for Aria internal tempo…

…rary tables (Simple speedup)
MariaDB · Nov 10, 2015 · 3f24cf2 · 3f24cf2
1 parent 65151e0
commit 3f24cf2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
@@ -2655,7 +2655,7 @@ void ha_maria::drop_table(const char *name)
 {
   DBUG_ASSERT(file->s->temporary);
   (void) ha_close();
-  (void) maria_delete_table_files(name, 0);
+  (void) maria_delete_table_files(name, 1, 0);
 }
 
 

diff --git a/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c
@@ -78,11 +78,11 @@ int maria_delete_table(const char *name)
       DBUG_RETURN(1);
   }
 
-  DBUG_RETURN(maria_delete_table_files(name, sync_dir));
+  DBUG_RETURN(maria_delete_table_files(name, 0, sync_dir));
 }
 
 
-int maria_delete_table_files(const char *name, myf sync_dir)
+int maria_delete_table_files(const char *name, my_bool temporary, myf sync_dir)
 {
   char from[FN_REFLEN];
   DBUG_ENTER("maria_delete_table_files");
@@ -97,9 +97,12 @@ int maria_delete_table_files(const char *name, myf sync_dir)
     DBUG_RETURN(my_errno);
 
   // optional files from maria_pack:
-  fn_format(from,name,"",".TMD",MY_UNPACK_FILENAME|MY_APPEND_EXT);
-  mysql_file_delete_with_symlink(key_file_dfile, from, MYF(0));
-  fn_format(from,name,"",".OLD",MY_UNPACK_FILENAME|MY_APPEND_EXT);
-  mysql_file_delete_with_symlink(key_file_dfile, from, MYF(0));
+  if (!temporary)
+  {
+    fn_format(from,name,"",".TMD",MY_UNPACK_FILENAME|MY_APPEND_EXT);
+    mysql_file_delete_with_symlink(key_file_dfile, from, MYF(0));
+    fn_format(from,name,"",".OLD",MY_UNPACK_FILENAME|MY_APPEND_EXT);
+    mysql_file_delete_with_symlink(key_file_dfile, from, MYF(0));
+  }
   DBUG_RETURN(0);
 }
diff --git a/storage/maria/maria_def.h b/storage/maria/maria_def.h
@@ -1351,7 +1351,8 @@ void _ma_remap_file(MARIA_HA *info, my_off_t size);
 
 MARIA_RECORD_POS _ma_write_init_default(MARIA_HA *info, const uchar *record);
 my_bool _ma_write_abort_default(MARIA_HA *info);
-int maria_delete_table_files(const char *name, myf sync_dir);
+int maria_delete_table_files(const char *name, my_bool temporary,
+                             myf sync_dir);
 
 /*
   This cannot be in my_base.h as it clashes with HA_SPATIAL.