← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-1.0/libdrizzle/result.c

  • Committer: Olaf van der Spek
  • Date: 2011-07-04 19:11:47 UTC
  • mto: This revision was merged to the branch mainline in revision 2367.
  • Revision ID: olafvdspek@gmail.com-20110704191147-s99ojek811zi1fzj
Remove unused Name_resolution_context::error_reporter

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-1.0/libdrizzle/result.c
106
106
  for (column= result->column_list; column != NULL; column= result->column_list)
107
107
    drizzle_column_free(column);
108
108
 
109
 
  if (result->column_buffer != NULL)
110
 
    free(result->column_buffer);
 
109
  free(result->column_buffer);
111
110
 
112
111
  if (result->options & DRIZZLE_RESULT_BUFFER_ROW)
113
112
  {
118
117
    free(result->field_sizes_list);
119
118
  }
120
119
 
121
 
  if (result->con->result_list == result)
122
 
    result->con->result_list= result->next;
 
120
  if (result->con)
 
121
  {
 
122
    result->con->result_count--;
 
123
    if (result->con->result_list == result)
 
124
      result->con->result_list= result->next;
 
125
  }
123
126
  if (result->prev)
124
127
    result->prev->next= result->next;
125
128
  if (result->next)
126
129
    result->next->prev= result->prev;
127
 
  result->con->result_count--;
128
130
 
129
131
  if (result->options & DRIZZLE_RESULT_ALLOCATED)
130
132
    free(result);
476
478
  {
477
479
    snprintf(con->drizzle->last_error, DRIZZLE_MAX_ERROR_SIZE, "%.*s",
478
480
             (int32_t)con->packet_size, con->buffer_ptr);
 
481
    con->drizzle->last_error[DRIZZLE_MAX_ERROR_SIZE-1]= 0;
479
482
    snprintf(con->result->info, DRIZZLE_MAX_INFO_SIZE, "%.*s",
480
483
             (int32_t)con->packet_size, con->buffer_ptr);
 
484
    con->result->info[DRIZZLE_MAX_INFO_SIZE-1]= 0;
481
485
    con->buffer_ptr+= con->packet_size;
482
486
    con->buffer_size-= con->packet_size;
483
487
    con->packet_size= 0;