← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libdrizzle/result.cc

  • Committer: Andrew Hutchings
  • Date: 2012-12-22 08:55:58 UTC
  • mfrom: (43.2.18 5.0)
  • Revision ID: andrew@linuxjedi.co.uk-20121222085558-b3aj47q2ah3cfccg
Merge 5.0 into 5.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/result.cc
47
47
 * Common definitions
48
48
 */
49
49
 
50
 
drizzle_result_st *drizzle_result_create(drizzle_con_st *con)
 
50
drizzle_result_st *drizzle_result_create(drizzle_st *con)
51
51
{
52
52
  drizzle_result_st *result;
53
53
  if (con == NULL)
58
58
  result= (drizzle_result_st*)malloc(sizeof(drizzle_result_st));
59
59
  if (result == NULL)
60
60
  {
61
 
    drizzle_con_set_error(con, __func__, "Failed to allocate.");
 
61
    drizzle_set_error(con, __func__, "Failed to allocate.");
62
62
    return NULL;
63
63
  }
64
64
 
155
155
  free(result);
156
156
}
157
157
 
158
 
void drizzle_result_free_all(drizzle_con_st *con)
 
158
void drizzle_result_free_all(drizzle_st *con)
159
159
{
160
160
  if (con == NULL)
161
161
  {
168
168
  }
169
169
}
170
170
 
171
 
drizzle_con_st *drizzle_result_drizzle_con(drizzle_result_st *result)
 
171
drizzle_st *drizzle_result_drizzle_con(drizzle_result_st *result)
172
172
{
173
173
  if (result == NULL)
174
174
  {
272
272
 * Client definitions
273
273
 */
274
274
 
275
 
drizzle_result_st *drizzle_result_read(drizzle_con_st *con,
 
275
drizzle_result_st *drizzle_result_read(drizzle_st *con,
276
276
                                       drizzle_return_t *ret_ptr)
277
277
{
278
278
  drizzle_return_t unused;
344
344
      if (row_list == NULL)
345
345
      {
346
346
        drizzle_row_free(result, row);
347
 
        drizzle_con_set_error(result->con, __func__, "Failed to realloc row_list.");
 
347
        drizzle_set_error(result->con, __func__, "Failed to realloc row_list.");
348
348
        return DRIZZLE_RETURN_MEMORY;
349
349
      }
350
350
 
354
354
      if (field_sizes_list == NULL)
355
355
      {
356
356
        drizzle_row_free(result, row);
357
 
        drizzle_con_set_error(result->con, "drizzle_result_buffer", "Failed to realloc field list.");
 
357
        drizzle_set_error(result->con, "drizzle_result_buffer", "Failed to realloc field list.");
358
358
        return DRIZZLE_RETURN_MEMORY;
359
359
      }
360
360
 
385
385
 * Internal state functions.
386
386
 */
387
387
 
388
 
drizzle_return_t drizzle_state_result_read(drizzle_con_st *con)
 
388
drizzle_return_t drizzle_state_result_read(drizzle_st *con)
389
389
{
390
390
  drizzle_return_t ret;
391
391
 
409
409
    /* We can ignore the returns since we've buffered the entire packet. */
410
410
    con->result->affected_rows= drizzle_unpack_length(con, &ret);
411
411
    con->result->insert_id= drizzle_unpack_length(con, &ret);
412
 
    con->status= (drizzle_con_status_t)drizzle_get_byte2(con->buffer_ptr);
 
412
    con->status= (drizzle_status_t)drizzle_get_byte2(con->buffer_ptr);
413
413
    con->result->warning_count= drizzle_get_byte2(con->buffer_ptr +2);
414
414
    con->buffer_ptr+= 4;
415
415
    con->buffer_size-= 5;
427
427
  {
428
428
    con->result->options= DRIZZLE_RESULT_EOF_PACKET;
429
429
    con->result->warning_count= drizzle_get_byte2(con->buffer_ptr + 1);
430
 
    con->status= (drizzle_con_status_t)drizzle_get_byte2(con->buffer_ptr + 3);
 
430
    con->status= (drizzle_status_t)drizzle_get_byte2(con->buffer_ptr + 3);
431
431
    con->buffer_ptr+= 5;
432
432
    con->buffer_size-= 5;
433
433
    con->packet_size-= 5;