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
=== modified file 'mydumper.c'
--- mydumper.c 2011-05-23 09:17:21 +0000
+++ mydumper.c 2011-05-25 12:22:03 +0000
@@ -45,7 +45,7 @@
45static GMutex * init_mutex = NULL;45static GMutex * init_mutex = NULL;
4646
47/* Program options */47/* Program options */
48gchar *directory= NULL;48gchar *output_directory= NULL;
49guint statement_size= 1000000;49guint statement_size= 1000000;
50guint rows_per_file= 0;50guint rows_per_file= 0;
51int longquery= 60; 51int longquery= 60;
@@ -79,7 +79,7 @@
79{79{
80 { "database", 'B', 0, G_OPTION_ARG_STRING, &db, "Database to dump", NULL },80 { "database", 'B', 0, G_OPTION_ARG_STRING, &db, "Database to dump", NULL },
81 { "tables-list", 'T', 0, G_OPTION_ARG_STRING, &tables_list, "Comma delimited table list to dump (does not exclude regex option)", NULL },81 { "tables-list", 'T', 0, G_OPTION_ARG_STRING, &tables_list, "Comma delimited table list to dump (does not exclude regex option)", NULL },
82 { "outputdir", 'o', 0, G_OPTION_ARG_FILENAME, &directory, "Directory to output files to, default ./" DIRECTORY"-*/", NULL },82 { "outputdir", 'o', 0, G_OPTION_ARG_FILENAME, &output_directory, "Directory to output files to, default ./" DIRECTORY"-*/", NULL },
83 { "statement-size", 's', 0, G_OPTION_ARG_INT, &statement_size, "Attempted size of INSERT statement in bytes, default 1000000", NULL},83 { "statement-size", 's', 0, G_OPTION_ARG_INT, &statement_size, "Attempted size of INSERT statement in bytes, default 1000000", NULL},
84 { "rows", 'r', 0, G_OPTION_ARG_INT, &rows_per_file, "Try to split tables into chunks of this many rows", NULL},84 { "rows", 'r', 0, G_OPTION_ARG_INT, &rows_per_file, "Try to split tables into chunks of this many rows", NULL},
85 { "compress", 'c', 0, G_OPTION_ARG_NONE, &compress_output, "Compress output files", NULL},85 { "compress", 'c', 0, G_OPTION_ARG_NONE, &compress_output, "Compress output files", NULL},
@@ -382,20 +382,20 @@
382 time_t t;382 time_t t;
383 time(&t);localtime_r(&t,&tval);383 time(&t);localtime_r(&t,&tval);
384384
385 if (!directory)385 if (!output_directory)
386 directory = g_strdup_printf("%s-%04d%02d%02d-%02d%02d%02d",DIRECTORY,386 output_directory = g_strdup_printf("%s-%04d%02d%02d-%02d%02d%02d",DIRECTORY,
387 tval.tm_year+1900, tval.tm_mon+1, tval.tm_mday, 387 tval.tm_year+1900, tval.tm_mon+1, tval.tm_mday,
388 tval.tm_hour, tval.tm_min, tval.tm_sec);388 tval.tm_hour, tval.tm_min, tval.tm_sec);
389 389
390 create_backup_dir(directory);390 create_backup_dir(output_directory);
391 391
392 if (need_binlogs) {392 if (need_binlogs) {
393 binlog_directory = g_strdup_printf("%s/%s", directory, (binlog_directory ? binlog_directory : BINLOG_DIRECTORY));393 binlog_directory = g_strdup_printf("%s/%s", output_directory, (binlog_directory ? binlog_directory : BINLOG_DIRECTORY));
394 create_backup_dir(binlog_directory);394 create_backup_dir(binlog_directory);
395 }395 }
396396
397 char *p;397 char *p;
398 FILE* mdfile=g_fopen(p=g_strdup_printf("%s/.metadata",directory),"w");398 FILE* mdfile=g_fopen(p=g_strdup_printf("%s/.metadata",output_directory),"w");
399 g_free(p);399 g_free(p);
400 if(!mdfile) {400 if(!mdfile) {
401 g_critical("Couldn't write metadata file (%d)",errno);401 g_critical("Couldn't write metadata file (%d)",errno);
@@ -607,7 +607,7 @@
607 mysql_close(conn);607 mysql_close(conn);
608 mysql_thread_end();608 mysql_thread_end();
609 mysql_library_end();609 mysql_library_end();
610 g_free(directory);610 g_free(output_directory);
611 g_free(td);611 g_free(td);
612 g_free(threads);612 g_free(threads);
613 g_strfreev(ignore);613 g_strfreev(ignore);
@@ -710,7 +710,7 @@
710 !showed_nulls?field:"",710 !showed_nulls?field:"",
711 !showed_nulls?" IS NULL OR ":"",711 !showed_nulls?" IS NULL OR ":"",
712 field, (unsigned long long)cutoff, 712 field, (unsigned long long)cutoff,
713 field, (unsigned long long)cutoff+estimated_step));713 field, (unsigned long long)(cutoff+estimated_step)));
714 cutoff+=estimated_step;714 cutoff+=estimated_step;
715 showed_nulls=1;715 showed_nulls=1;
716 }716 }
@@ -1001,7 +1001,7 @@
1001 sj->table=g_strdup(table);1001 sj->table=g_strdup(table);
1002 j->conf=conf;1002 j->conf=conf;
1003 j->type=JOB_SCHEMA;1003 j->type=JOB_SCHEMA;
1004 sj->filename = g_strdup_printf("%s/%s.%s-schema.sql%s", directory, database, table, (compress_output?".gz":""));1004 sj->filename = g_strdup_printf("%s/%s.%s-schema.sql%s", output_directory, database, table, (compress_output?".gz":""));
1005 g_async_queue_push(conf->queue,j);1005 g_async_queue_push(conf->queue,j);
1006 return;1006 return;
1007}1007}
@@ -1023,7 +1023,7 @@
1023 tj->table=g_strdup(table);1023 tj->table=g_strdup(table);
1024 j->conf=conf;1024 j->conf=conf;
1025 j->type= is_innodb ? JOB_DUMP : JOB_DUMP_NON_INNODB;1025 j->type= is_innodb ? JOB_DUMP : JOB_DUMP_NON_INNODB;
1026 tj->filename=g_strdup_printf("%s/%s.%s.%05d.sql%s", directory, database, table, nchunk,(compress_output?".gz":""));1026 tj->filename=g_strdup_printf("%s/%s.%s.%05d.sql%s", output_directory, database, table, nchunk,(compress_output?".gz":""));
1027 tj->where=(char *)chunks->data;1027 tj->where=(char *)chunks->data;
1028 g_async_queue_push(conf->queue,j);1028 g_async_queue_push(conf->queue,j);
1029 nchunk++;1029 nchunk++;
@@ -1037,7 +1037,7 @@
1037 tj->table=g_strdup(table);1037 tj->table=g_strdup(table);
1038 j->conf=conf;1038 j->conf=conf;
1039 j->type= is_innodb ? JOB_DUMP : JOB_DUMP_NON_INNODB;1039 j->type= is_innodb ? JOB_DUMP : JOB_DUMP_NON_INNODB;
1040 tj->filename = g_strdup_printf("%s/%s.%s.sql%s", directory, database, table,(compress_output?".gz":""));1040 tj->filename = g_strdup_printf("%s/%s.%s.sql%s", output_directory, database, table,(compress_output?".gz":""));
1041 g_async_queue_push(conf->queue,j);1041 g_async_queue_push(conf->queue,j);
1042 return;1042 return;
1043 }1043 }

Subscribers

People subscribed via source and target branches