← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump.cc

  • Committer: Monty Taylor
  • Date: 2008-09-15 00:46:33 UTC
  • mfrom: (383.1.55 client-split)
  • Revision ID: monty@inaugust.com-20080915004633-fmjw27fi41cxs35w
Merged from client-split.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump.cc
115
115
FILE *md_result_file= 0;
116
116
FILE *stderror_file=0;
117
117
 
118
 
static uint opt_protocol= DRIZZLE_PROTOCOL_TCP;
119
 
 
120
118
/*
121
119
  Constant for detection of default value of default_charset.
122
120
  If default_charset is equal to drizzle_universal_client_charset, then
1063
1061
  drizzle_create(&drizzle_connection);
1064
1062
  if (opt_compress)
1065
1063
    drizzle_options(&drizzle_connection,DRIZZLE_OPT_COMPRESS,NullS);
1066
 
  if (opt_protocol)
1067
 
    drizzle_options(&drizzle_connection,DRIZZLE_OPT_PROTOCOL,(char*)&opt_protocol);
1068
1064
  if (!(drizzle= drizzle_connect(&drizzle_connection,host,user,passwd,
1069
1065
                                  NULL,opt_drizzle_port, NULL,
1070
1066
                                  0)))
2256
2252
          {
2257
2253
            if (length)
2258
2254
            {
2259
 
              if (!IS_NUM_FIELD(field))
 
2255
              if (!(field->type & NUM_FLAG))
2260
2256
              {
2261
2257
                /*
2262
2258
                  "length * 2 + 2" is OK for both HEX and non-HEX modes:
2312
2308
          }
2313
2309
          if (row[i])
2314
2310
          {
2315
 
            if (!IS_NUM_FIELD(field))
 
2311
            if (!(field->type & NUM_FLAG))
2316
2312
            {
2317
2313
              if (opt_xml)
2318
2314
              {