← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzleclient/drizzle.cc

  • Committer: Brian Aker
  • Date: 2009-04-01 01:25:04 UTC
  • mfrom: (968.2.27 mordred)
  • Revision ID: brian@tangent.org-20090401012504-mq9sxcmph5jc1fh6
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzleclient/drizzle.cc
294
294
 
295
295
  if (!net->vio)
296
296
  {
297
 
    drizzleclient_set_extended_error(drizzle, CR_CONN_HOST_ERROR, drizzleclient_sqlstate_get_unknown(),
298
 
                               ER(CR_CONN_HOST_ERROR), host, errno);
 
297
    drizzleclient_set_extended_error(drizzle, CR_CONN_HOST_ERROR,
 
298
                                     drizzleclient_sqlstate_get_unknown(),
 
299
                                     ER(CR_CONN_HOST_ERROR),
 
300
                                     host, port, errno);
299
301
    goto error;
300
302
  }
301
303
 
454
456
 
455
457
    if (db_len >= NAME_LEN)
456
458
      db_len= NAME_LEN - 1;
457
 
    end= memcpy(end, db, db_len);
 
459
    end= (char *)memcpy(end, db, db_len);
458
460
    end[db_len]= 0;
459
461
    end+= (db_len + 1);
460
462