Merge pull request #740 from mydumper/737-rows-does-not-take-effect-i…

…n-csv-format Fixing csv --rows issues and refactoring
mydumper · Jul 6, 2022 · d5346af · d5346af
2 parents e85b3a9 + 9cfa675
commit d5346af
Show file tree

Hide file tree

Showing 6 changed files with 300 additions and 266 deletions.
diff --git a/mydumper_testing_db.sql b/mydumper_testing_db.sql
@@ -1,3 +1,5 @@
+SET GLOBAL local_infile=ON;
+
 DROP DATABASE IF EXISTS myd_test;
 CREATE DATABASE myd_test;
 -- Tables and views

diff --git a/src/connection.c b/src/connection.c
@@ -69,7 +69,7 @@ void configure_connection(MYSQL *conn, const char *name) {
     mysql_options(conn, MYSQL_READ_DEFAULT_FILE, defaults_file);
   }
   mysql_options(conn, MYSQL_READ_DEFAULT_GROUP, name);
-
+  mysql_options(conn, MYSQL_OPT_LOCAL_INFILE, NULL);
   if (compress_protocol)
     mysql_options(conn, MYSQL_OPT_COMPRESS, NULL);
 

diff --git a/src/mydumper_jobs.c b/src/mydumper_jobs.c
@@ -1167,7 +1167,7 @@ struct table_job * new_table_job(struct db_table *dbt, char *partition, char *wh
   tj->where=where;
   tj->order_by=order_by;
   tj->nchunk=nchunk;
-  tj->filename = build_data_filename(dbt->database->filename, dbt->table_filename, tj->nchunk, 0);
+//  tj->filename = build_data_filename(dbt->database->filename, dbt->table_filename, tj->nchunk, 0);
   tj->dbt=dbt;
   return tj;
 }

diff --git a/src/mydumper_start_dump.h b/src/mydumper_start_dump.h
@@ -69,7 +69,7 @@ struct table_job {
   char *table;
   char *partition;
   guint nchunk;
-  char *filename;
+//  char *filename;
   char *where;
   char *order_by;
   struct db_table *dbt;