← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/conn.c

  • Committer: Monty Taylor
  • Date: 2011-03-07 21:37:51 UTC
  • mfrom: (2221.2.4 build)
  • Revision ID: mordred@inaugust.com-20110307213751-uhic4rghe4dmdi8d
Merge Monty - Pandora-build updates. Allow building of only libdrizzle.
Merge Andrew - libdrizzle result reuse problem.
Merge David - Slave plugin bugfixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/conn.c
487
487
{
488
488
  drizzle_result_st *old_result;
489
489
 
490
 
  for (old_result= con->result_list; old_result != NULL; old_result= old_result->next)
491
 
  {
492
 
    if (result == old_result)
493
 
    {
494
 
      drizzle_set_error(con->drizzle, "drizzle_command_write", "result struct already in use");
495
 
      *ret_ptr= DRIZZLE_RETURN_INTERNAL_ERROR;
496
 
      return result;    
497
 
    }
498
 
  }
499
 
 
500
490
  if (!(con->options & DRIZZLE_CON_READY))
501
491
  {
502
492
    if (con->options & DRIZZLE_CON_RAW_PACKET)
518
508
      con->result= NULL;
519
509
    else
520
510
    {
 
511
      for (old_result= con->result_list; old_result != NULL; old_result= old_result->next)
 
512
      {
 
513
        if (result == old_result)
 
514
        {
 
515
          drizzle_set_error(con->drizzle, "drizzle_command_write", "result struct already in use");
 
516
          *ret_ptr= DRIZZLE_RETURN_INTERNAL_ERROR;
 
517
          return result;
 
518
        }
 
519
      }
 
520
 
521
521
      con->result= drizzle_result_create(con, result);
522
522
      if (con->result == NULL)
523
523
      {