cleanup: reusable build_path_for_table() function

Author: vuvova

client/mysqldump.c

@@ -1837,6 +1837,17 @@ static char *cover_definer_clause(const char *stmt_str,
   return query_str;
 }
 
+
+static const char* build_path_for_table(char *to, const char *dir,
+                                        const char *table, const char *ext)
+{
+  char tmp_path[FN_REFLEN];
+  convert_dirname(tmp_path, path, NULL);
+  my_load_path(tmp_path, tmp_path, NULL);
+  return fn_format(to, table, tmp_path, ext, MYF(MY_UNPACK_FILENAME));
+}
+
+
 /*
   Open a new .sql file to dump the table or view into
 
@@ -1851,12 +1862,9 @@ static char *cover_definer_clause(const char *stmt_str,
 */
 static FILE* open_sql_file_for_table(const char* table, int flags)
 {
-  FILE* res;
-  char filename[FN_REFLEN], tmp_path[FN_REFLEN];
-  convert_dirname(tmp_path,path,NullS);
-  res= my_fopen(fn_format(filename, table, tmp_path, ".sql", 4),
-                flags, MYF(MY_WME));
-  return res;
+  char filename[FN_REFLEN];
+  return my_fopen(build_path_for_table(filename, path, table, ".sql"),
+                  flags, MYF(MY_WME));
 }
 
 
@@ -4043,15 +4051,9 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
 
   if (path)
   {
-    char filename[FN_REFLEN], tmp_path[FN_REFLEN];
+    char filename[FN_REFLEN];
 
-    /*
-      Convert the path to native os format
-      and resolve to the full filepath.
-    */
-    convert_dirname(tmp_path,path,NullS);    
-    my_load_path(tmp_path, tmp_path, NULL);
-    fn_format(filename, table, tmp_path, ".txt", MYF(MY_UNPACK_FILENAME));
+    build_path_for_table(filename, path, table, ".txt");
 
     /* Must delete the file that 'INTO OUTFILE' will write to */
     my_delete(filename, MYF(0));
@@ -4060,7 +4062,6 @@ static void dump_table(const char *table, const char *db, const uchar *hash_key,
     to_unix_path(filename);
 
     /* now build the query string */
-
     dynstr_append_checked(&query_string, "SELECT /*!40001 SQL_NO_CACHE */ ");
     dynstr_append_checked(&query_string, select_field_names.str);
     dynstr_append_checked(&query_string, " INTO OUTFILE '");

client/mysqlimport.c

@@ -339,7 +339,7 @@ static int write_to_table(char *filename, MYSQL *mysql)
   DBUG_ENTER("write_to_table");
   DBUG_PRINT("enter",("filename: %s",filename));
 
-  fn_format(tablename, filename, "", "", 1 | 2); /* removes path & ext. */
+  fn_format(tablename, filename, "", "", MYF(MY_REPLACE_DIR | MY_REPLACE_EXT));
   if (!opt_local_file)
     strmov(hard_path,filename);
   else