← Back to branch summary

~drizzle-trunk/libdrizzle/jenkins-Libdrizzle-27

« back to all changes in this revision

Viewing changes to libdrizzle/row.cc

  • Committer: Andrew Hutchings
  • Date: 2012-12-21 13:28:25 UTC
  • mfrom: (43.2.16 5.0)
  • Revision ID: andrew@linuxjedi.co.uk-20121221132825-77cko8ln7jj9kpb6
Merge 5.0 branch to 5.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/row.cc
63
63
 
64
64
  if ((result->column_current != result->column_count) && (!(result->options & DRIZZLE_RESULT_BUFFER_COLUMN)))
65
65
  {
66
 
    drizzle_set_error(result->con->drizzle, "drizzle_row_read", "cannot retrieve rows until all columns are retrieved");
 
66
    drizzle_con_set_error(result->con, "drizzle_row_read", "cannot retrieve rows until all columns are retrieved");
67
67
    *ret_ptr= DRIZZLE_RETURN_NOT_READY;
68
68
    return 0;
69
69
  }
108
108
    result->row= (drizzle_row_t)realloc(NULL, (sizeof(drizzle_field_t) + sizeof(size_t)) * result->column_count);
109
109
    if (result->row == NULL)
110
110
    {
111
 
      drizzle_set_error(result->con->drizzle, __func__, "Failed to allocate.");
 
111
      drizzle_con_set_error(result->con, __func__, "Failed to allocate.");
112
112
      *ret_ptr= DRIZZLE_RETURN_MEMORY;
113
113
      return NULL;
114
114
    }
249
249
    return DRIZZLE_RETURN_INVALID_ARGUMENT;
250
250
  }
251
251
 
252
 
  drizzle_log_debug(con->drizzle, "drizzle_state_row_read");
 
252
  drizzle_log_debug(con, "drizzle_state_row_read");
253
253
 
254
254
  if (con->packet_size != 0 && con->buffer_size < con->packet_size && 
255
255
    con->buffer_size < 5)
275
275
  }
276
276
  else if (con->result->options & DRIZZLE_RESULT_ROW_BREAK)
277
277
  {
278
 
    con->result->options&= ~DRIZZLE_RESULT_ROW_BREAK;
 
278
    con->result->options = (drizzle_result_options_t)((int)con->result->options & (int)~DRIZZLE_RESULT_ROW_BREAK);
279
279
  }
280
280
  else
281
281
  {