← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleslap.cc

  • Committer: Brian Aker
  • Date: 2010-11-19 00:00:46 UTC
  • mto: (1945.2.1 quick)
  • mto: This revision was merged to the branch mainline in revision 1944.
  • Revision ID: brian@tangent.org-20101119000046-iajnd847tmo595ts
Fix style issue around table for message (though this is imperfect,...)

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleslap.cc
71
71
 
72
72
*/
73
73
 
74
 
#include <config.h>
 
74
#include "config.h"
75
75
#include "client_priv.h"
76
76
 
77
77
#include "option_string.h"
245
245
 
246
246
static long int timedif(struct timeval a, struct timeval b)
247
247
{
248
 
  int us, s;
 
248
  register int us, s;
249
249
 
250
250
  us = a.tv_usec - b.tv_usec;
251
251
  us /= 1000;
436
436
    po::options_description commandline_options("Options used only in command line");
437
437
    commandline_options.add_options()
438
438
      ("help,?","Display this help and exit")
439
 
      ("info","Gives information and exit")
 
439
      ("info,i","Gives information and exit")
440
440
      ("burnin",po::value<bool>(&opt_burnin)->default_value(false)->zero_tokens(),
441
441
       "Run full test case in infinite loop")
442
442
      ("ignore-sql-errors", po::value<bool>(&opt_ignore_sql_errors)->default_value(false)->zero_tokens(),
1698
1698
 
1699
1699
  if (opt_only_print)
1700
1700
  {
1701
 
    printf("/* CON: %" PRIu64 " */ %.*s;\n",
1702
 
           (uint64_t)drizzle_context(drizzle_con_drizzle(&con)),
 
1701
    printf("/* CON: %lu */ %.*s;\n",
 
1702
           (size_t)drizzle_context(drizzle_con_drizzle(&con)),
1703
1703
           len, query);
1704
1704
    return 0;
1705
1705
  }
1807
1807
 
1808
1808
  if (opt_only_print)
1809
1809
  {
1810
 
    printf("/* CON: %" PRIu64 " */ use %s;\n",
1811
 
           (uint64_t)drizzle_context(drizzle_con_drizzle(&con)),
 
1810
    printf("/* CON: %lu */ use %s;\n",
 
1811
           (size_t)drizzle_context(drizzle_con_drizzle(&con)),
1812
1812
           db);
1813
1813
  }
1814
1814
  else