← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/conn.c

  • Committer: Lee Bieber
  • Date: 2011-03-04 23:51:48 UTC
  • mfrom: (2219.1.2 build)
  • Revision ID: kalebral@gmail.com-20110304235148-g7sawtycktp1vz74
Merge Shrews - 729372: Semicolon causing slave plugin to stop replicating
Merge Andrew - 728990: libdrizzle: Re-using a result struct without freeing causes infinite loop

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/conn.c
485
485
                                             size_t total,
486
486
                                             drizzle_return_t *ret_ptr)
487
487
{
 
488
  drizzle_result_st *old_result;
 
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
 
488
500
  if (!(con->options & DRIZZLE_CON_READY))
489
501
  {
490
502
    if (con->options & DRIZZLE_CON_RAW_PACKET)