← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Monty Taylor
  • Date: 2008-12-12 19:08:32 UTC
  • mfrom: (672.1.2 thelinuxjedi)
  • mto: This revision was merged to the branch mainline in revision 676.
  • Revision ID: monty@inaugust.com-20081212190832-tjxg7wr040ls00mi
Merged from LinuxJedi.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
158
158
  default_charset_used= 0, opt_secure_auth= 0,
159
159
  default_pager_set= 0, opt_sigint_ignore= 0,
160
160
  auto_vertical_output= 0,
161
 
  show_warnings= 0, executing_query= 0, interrupted_query= 0,
162
 
  show_progress= 0;
 
161
  show_warnings= 0, executing_query= 0, interrupted_query= 0;
 
162
static uint32_t  show_progress_size= 0;
163
163
static bool debug_info_flag, debug_check_flag;
164
164
static bool column_types_flag;
165
165
static bool preserve_comments= 0;
1441
1441
  {"show-warnings", OPT_SHOW_WARNINGS, N_("Show warnings after every statement."),
1442
1442
   (char**) &show_warnings, (char**) &show_warnings, 0, GET_BOOL, NO_ARG,
1443
1443
   0, 0, 0, 0, 0, 0},
1444
 
  {"show-progress", OPT_SHOW_PROGRESS, N_("Show progress during an import."),
1445
 
   (char**) &show_progress, (char**) &show_progress, 0, GET_BOOL, NO_ARG,
 
1444
  {"show-progress-size", OPT_SHOW_PROGRESS_SIZE, N_("Number of lines before each import progress report."),
 
1445
   (char**) &show_progress_size, (char**) &show_progress_size, 0, GET_ULONG, REQUIRED_ARG,
1446
1446
   0, 0, 0, 0, 0, 0},
1447
1447
  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
1448
1448
};
1697
1697
          (unsigned char) line[2] == 0xBF)
1698
1698
        line+= 3;
1699
1699
      line_number++;
1700
 
      if (show_progress)
 
1700
      if (show_progress_size > 0)
1701
1701
      {
1702
 
        if ((line_number % 1000) == 0)
 
1702
        if ((line_number % show_progress_size) == 0)
1703
1703
          fprintf(stderr, _("Processing line: %"PRIu32"\n"), line_number);
1704
1704
      }
1705
1705
      if (!glob_buffer->empty())