Commit 1601646a authored by unknown's avatar unknown
Browse files

Merge build.mysql.com:/home/bk/mysql-4.0 

into build.mysql.com:/users/rburnett/mysql-4.0
parents fe463106 bb6fe04c

client/mysqlimport.c

+3 −5
Original line number Diff line number Diff line
@@ -246,10 +246,8 @@ static int write_to_table(char *filename, MYSQL *sock) 
  DBUG_ENTER("write_to_table");

  DBUG_PRINT("enter",("filename: %s",filename));



  local_file= sock->unix_socket == 0 || opt_local_file;



  fn_format(tablename, filename, "", "", 1 | 2); /* removes path & ext. */

  if (local_file)

  if (! opt_local_file)

    strmov(hard_path,filename);

  else

    my_load_path(hard_path, filename, NULL); /* filename includes the path */
@@ -268,7 +266,7 @@ static int write_to_table(char *filename, MYSQL *sock) 
  to_unix_path(hard_path);

  if (verbose)

  {

    if (local_file)

    if (opt_local_file)

      fprintf(stdout, "Loading data from LOCAL file: %s into %s\n",

	      hard_path, tablename);

    else
@@ -277,7 +275,7 @@ static int write_to_table(char *filename, MYSQL *sock) 
  }

  sprintf(sql_statement, "LOAD DATA %s %s INFILE '%s'",

	  opt_low_priority ? "LOW_PRIORITY" : "",

	  local_file ? "LOCAL" : "", hard_path);

	  opt_local_file ? "LOCAL" : "", hard_path);

  end= strend(sql_statement);

  if (replace)

    end= strmov(end, " REPLACE");