← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/conn.cc

  • Committer: Mark Atwood
  • Date: 2011-11-07 22:27:02 UTC
  • mfrom: (2449.1.4 drizzle-build)
  • Revision ID: me@mark.atwood.name-20111107222702-crj09kujv9awkylo
merge lp:~brianaker/drizzle/libdrizzle-update

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/conn.cc
478
478
{
479
479
  drizzle_result_st *old_result;
480
480
 
 
481
  drizzle_return_t unused;
 
482
  if (ret_ptr == NULL)
 
483
  {
 
484
    ret_ptr= &unused;
 
485
  }
 
486
 
481
487
  if (!(con->options & DRIZZLE_CON_READY))
482
488
  {
483
489
    if (con->options & DRIZZLE_CON_RAW_PACKET)
490
496
 
491
497
    *ret_ptr= drizzle_con_connect(con);
492
498
    if (*ret_ptr != DRIZZLE_RETURN_OK)
 
499
    {
493
500
      return result;
 
501
    }
494
502
  }
495
503
 
496
504
  if (drizzle_state_none(con))
497
505
  {
498
506
    if (con->options & (DRIZZLE_CON_RAW_PACKET | DRIZZLE_CON_NO_RESULT_READ))
 
507
    {
499
508
      con->result= NULL;
 
509
    }
500
510
    else
501
511
    {
502
512
      for (old_result= con->result_list; old_result != NULL; old_result= old_result->next)