← 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-07-21 00:16:27 UTC
  • mfrom: (2367.1.2 trunk-bug-810388)
  • Revision ID: me@mark.atwood.name-20110721001627-qf0xf29ugz7g7s7r
merge lp:~linuxjedi/drizzle/trunk-bug-810388

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/libdrizzle/column.cc
511
511
 
512
512
drizzle_return_t drizzle_column_skip(drizzle_result_st *result)
513
513
{
 
514
  drizzle_return_t ret;
514
515
  if (drizzle_state_none(result->con))
515
516
  {
516
517
    result->options|= DRIZZLE_RESULT_SKIP_COLUMN;
518
519
    drizzle_state_push(result->con, drizzle_state_column_read);
519
520
    drizzle_state_push(result->con, drizzle_state_packet_read);
520
521
  }
521
 
 
522
 
  return drizzle_state_loop(result->con);
 
522
  ret= drizzle_state_loop(result->con);
 
523
  result->options&= ~DRIZZLE_RESULT_SKIP_COLUMN;
 
524
  return ret;
523
525
}
524
526
 
525
527
drizzle_column_st *drizzle_column_read(drizzle_result_st *result,
778
780
    con->buffer_size-= con->packet_size;
779
781
    con->packet_size= 0;
780
782
 
781
 
    drizzle_state_push(con, drizzle_state_packet_read);
 
783
    drizzle_state_pop(con);
782
784
  }
783
785
  else
784
786
  {