← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzleimport.cc

  • Committer: Mark Atwood
  • Date: 2012-01-04 16:59:32 UTC
  • mfrom: (2478.2.3 real-key-use-catalog)
  • Revision ID: me@mark.atwood.name-20120104165932-cm0xqs4by0u3p4cy
merge lp:~stewart/drizzle/key-use-catalog

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleimport.cc
201
201
  drizzle_return_t ret;
202
202
 
203
203
  if (verbose)
 
204
  {
204
205
    fprintf(stdout, "Connecting to %s, using protocol %s...\n", ! host.empty() ? host.c_str() : "localhost", opt_protocol.c_str());
205
 
  if (!(drizzle= drizzle_create(NULL)))
 
206
  }
 
207
 
 
208
  if ((drizzle= drizzle_create()) == NULL)
 
209
  {
206
210
    return 0;
207
 
  if (!(con= drizzle_con_add_tcp(drizzle,NULL,(char *)host.c_str(),opt_drizzle_port,(char *)user.c_str(),(char *)passwd.c_str(),
208
 
                                 (char *)database.c_str(), use_drizzle_protocol ? DRIZZLE_CON_EXPERIMENTAL : DRIZZLE_CON_MYSQL)))
 
211
  }
 
212
 
 
213
  if (!(con= drizzle_con_add_tcp(drizzle,
 
214
                                 host.c_str(), opt_drizzle_port,
 
215
                                 user.c_str(), passwd.c_str(),
 
216
                                 database.c_str(),
 
217
                                 use_drizzle_protocol ? DRIZZLE_CON_EXPERIMENTAL : DRIZZLE_CON_MYSQL)))
209
218
  {
210
219
    return 0;
211
220
  }