MySQL Data Dumper

Merge lp:~catap/mydumper/make-gcc-3.4.6-happy into lp:mydumper/0.5

  1. make-gcc-3.4.6-happy
  2. Merge into 0.5
Proposed by Kirill A. Korinskiy
Status: Merged
Approved by: Andrew Hutchings
Approved revision: 95
Merged at revision: 95
Proposed branch: lp:~catap/mydumper/make-gcc-3.4.6-happy
Merge into: lp:mydumper/0.5
Diff against target: 92 lines (+12/-12)
1 file modified
mydumper.c (+12/-12)
To merge this branch: bzr merge lp:~catap/mydumper/make-gcc-3.4.6-happy
Reviewer Review Type Date Requested Status
MySQL Data Dumper Team Pending
Review via email: mp+62288@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mydumper.c'
2--- mydumper.c 2011-05-23 09:17:21 +0000
3+++ mydumper.c 2011-05-25 12:22:03 +0000
4@@ -45,7 +45,7 @@
5 static GMutex * init_mutex = NULL;
6
7 /* Program options */
8-gchar *directory= NULL;
9+gchar *output_directory= NULL;
10 guint statement_size= 1000000;
11 guint rows_per_file= 0;
12 int longquery= 60;
13@@ -79,7 +79,7 @@
14 {
15 { "database", 'B', 0, G_OPTION_ARG_STRING, &db, "Database to dump", NULL },
16 { "tables-list", 'T', 0, G_OPTION_ARG_STRING, &tables_list, "Comma delimited table list to dump (does not exclude regex option)", NULL },
17- { "outputdir", 'o', 0, G_OPTION_ARG_FILENAME, &directory, "Directory to output files to, default ./" DIRECTORY"-*/", NULL },
18+ { "outputdir", 'o', 0, G_OPTION_ARG_FILENAME, &output_directory, "Directory to output files to, default ./" DIRECTORY"-*/", NULL },
19 { "statement-size", 's', 0, G_OPTION_ARG_INT, &statement_size, "Attempted size of INSERT statement in bytes, default 1000000", NULL},
20 { "rows", 'r', 0, G_OPTION_ARG_INT, &rows_per_file, "Try to split tables into chunks of this many rows", NULL},
21 { "compress", 'c', 0, G_OPTION_ARG_NONE, &compress_output, "Compress output files", NULL},
22@@ -382,20 +382,20 @@
23 time_t t;
24 time(&t);localtime_r(&t,&tval);
25
26- if (!directory)
27- directory = g_strdup_printf("%s-%04d%02d%02d-%02d%02d%02d",DIRECTORY,
28+ if (!output_directory)
29+ output_directory = g_strdup_printf("%s-%04d%02d%02d-%02d%02d%02d",DIRECTORY,
30 tval.tm_year+1900, tval.tm_mon+1, tval.tm_mday,
31 tval.tm_hour, tval.tm_min, tval.tm_sec);
32
33- create_backup_dir(directory);
34+ create_backup_dir(output_directory);
35
36 if (need_binlogs) {
37- binlog_directory = g_strdup_printf("%s/%s", directory, (binlog_directory ? binlog_directory : BINLOG_DIRECTORY));
38+ binlog_directory = g_strdup_printf("%s/%s", output_directory, (binlog_directory ? binlog_directory : BINLOG_DIRECTORY));
39 create_backup_dir(binlog_directory);
40 }
41
42 char *p;
43- FILE* mdfile=g_fopen(p=g_strdup_printf("%s/.metadata",directory),"w");
44+ FILE* mdfile=g_fopen(p=g_strdup_printf("%s/.metadata",output_directory),"w");
45 g_free(p);
46 if(!mdfile) {
47 g_critical("Couldn't write metadata file (%d)",errno);
48@@ -607,7 +607,7 @@
49 mysql_close(conn);
50 mysql_thread_end();
51 mysql_library_end();
52- g_free(directory);
53+ g_free(output_directory);
54 g_free(td);
55 g_free(threads);
56 g_strfreev(ignore);
57@@ -710,7 +710,7 @@
58 !showed_nulls?field:"",
59 !showed_nulls?" IS NULL OR ":"",
60 field, (unsigned long long)cutoff,
61- field, (unsigned long long)cutoff+estimated_step));
62+ field, (unsigned long long)(cutoff+estimated_step)));
63 cutoff+=estimated_step;
64 showed_nulls=1;
65 }
66@@ -1001,7 +1001,7 @@
67 sj->table=g_strdup(table);
68 j->conf=conf;
69 j->type=JOB_SCHEMA;
70- sj->filename = g_strdup_printf("%s/%s.%s-schema.sql%s", directory, database, table, (compress_output?".gz":""));
71+ sj->filename = g_strdup_printf("%s/%s.%s-schema.sql%s", output_directory, database, table, (compress_output?".gz":""));
72 g_async_queue_push(conf->queue,j);
73 return;
74 }
75@@ -1023,7 +1023,7 @@
76 tj->table=g_strdup(table);
77 j->conf=conf;
78 j->type= is_innodb ? JOB_DUMP : JOB_DUMP_NON_INNODB;
79- tj->filename=g_strdup_printf("%s/%s.%s.%05d.sql%s", directory, database, table, nchunk,(compress_output?".gz":""));
80+ tj->filename=g_strdup_printf("%s/%s.%s.%05d.sql%s", output_directory, database, table, nchunk,(compress_output?".gz":""));
81 tj->where=(char *)chunks->data;
82 g_async_queue_push(conf->queue,j);
83 nchunk++;
84@@ -1037,7 +1037,7 @@
85 tj->table=g_strdup(table);
86 j->conf=conf;
87 j->type= is_innodb ? JOB_DUMP : JOB_DUMP_NON_INNODB;
88- tj->filename = g_strdup_printf("%s/%s.%s.sql%s", directory, database, table,(compress_output?".gz":""));
89+ tj->filename = g_strdup_printf("%s/%s.%s.sql%s", output_directory, database, table,(compress_output?".gz":""));
90 g_async_queue_push(conf->queue,j);
91 return;
92 }

Subscribers

People subscribed via source and target branches