← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/libdrizzle/column.cc

  • Committer: Mark Atwood
  • Date: 2011-09-14 22:55:58 UTC
  • mfrom: (2411.1.1 trunk)
  • Revision ID: me@mark.atwood.name-20110914225558-hvlb05wkq3kp89mr
merge lp:~linuxjedi/drizzle/trunk-bug-528410

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/libdrizzle/column.cc
524
524
  return ret;
525
525
}
526
526
 
 
527
drizzle_return_t drizzle_column_skip_all(drizzle_result_st *result)
 
528
{
 
529
  drizzle_return_t ret;
 
530
  uint16_t it;
 
531
 
 
532
  for (it= 1; it <= result->column_count; it++)
 
533
  {
 
534
    ret= drizzle_column_skip(result);
 
535
    if (ret != DRIZZLE_RETURN_OK)
 
536
      return ret;
 
537
  }
 
538
 
 
539
  return DRIZZLE_RETURN_OK;
 
540
}
 
541
 
527
542
drizzle_column_st *drizzle_column_read(drizzle_result_st *result,
528
543
                                       drizzle_column_st *column,
529
544
                                       drizzle_return_t *ret_ptr)
779
794
    con->buffer_ptr+= con->packet_size;
780
795
    con->buffer_size-= con->packet_size;
781
796
    con->packet_size= 0;
 
797
    con->result->column_count++;
782
798
 
783
799
    drizzle_state_pop(con);
784
800
  }