← 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: 2011-11-22 17:04:41 UTC
  • mfrom: (2462.1.3 drizzle-include)
  • Revision ID: me@mark.atwood.name-20111122170441-5dehm0e0ax20z19b
merge lp:~brianaker/drizzle/fedora-16-fixes

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
 
  {
205
204
    fprintf(stdout, "Connecting to %s, using protocol %s...\n", ! host.empty() ? host.c_str() : "localhost", opt_protocol.c_str());
206
 
  }
207
 
 
208
 
  if ((drizzle= drizzle_create()) == NULL)
209
 
  {
 
205
  if (!(drizzle= drizzle_create(NULL)))
210
206
    return 0;
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)))
 
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)))
218
209
  {
219
210
    return 0;
220
211
  }