← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libdrizzle/column.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/column.cc
59
59
  column= (drizzle_column_st*)malloc(sizeof(drizzle_column_st));
60
60
  if (column == NULL)
61
61
  {
62
 
    drizzle_con_set_error(result->con, __func__, "Failed to allocate.");
 
62
    drizzle_set_error(result->con, __func__, "Failed to allocate.");
63
63
    return NULL;
64
64
  }
65
65
 
343
343
    result->column_buffer= (drizzle_column_st*)calloc(result->column_count, sizeof(drizzle_column_st));
344
344
    if (result->column_buffer == NULL)
345
345
    {
346
 
      drizzle_con_set_error(result->con, __func__, "Failed to allocate.");
 
346
      drizzle_set_error(result->con, __func__, "Failed to allocate.");
347
347
 
348
348
      return DRIZZLE_RETURN_MEMORY;
349
349
    }
475
475
 * Internal state functions.
476
476
 */
477
477
 
478
 
drizzle_return_t drizzle_state_column_read(drizzle_con_st *con)
 
478
drizzle_return_t drizzle_state_column_read(drizzle_st *con)
479
479
{
480
480
  if (con == NULL)
481
481
  {
498
498
    /* EOF packet marking end of columns. */
499
499
    con->result->column= NULL;
500
500
    con->result->warning_count= drizzle_get_byte2(con->buffer_ptr + 1);
501
 
    con->status= drizzle_con_status_t(drizzle_get_byte2(con->buffer_ptr + 3));
 
501
    con->status= drizzle_status_t(drizzle_get_byte2(con->buffer_ptr + 3));
502
502
    con->buffer_ptr+= 5;
503
503
    con->buffer_size-= 5;
504
504