← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-1.0/libdrizzle/column.c

  • 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-1.0/libdrizzle/column.c
518
518
 
519
519
drizzle_return_t drizzle_column_skip(drizzle_result_st *result)
520
520
{
 
521
  drizzle_return_t ret;
521
522
  if (drizzle_state_none(result->con))
522
523
  {
523
524
    result->options|= DRIZZLE_RESULT_SKIP_COLUMN;
525
526
    drizzle_state_push(result->con, drizzle_state_column_read);
526
527
    drizzle_state_push(result->con, drizzle_state_packet_read);
527
528
  }
528
 
 
529
 
  return drizzle_state_loop(result->con);
 
529
  ret= drizzle_state_loop(result->con);
 
530
  result->options&= ~DRIZZLE_RESULT_SKIP_COLUMN;
 
531
  return ret;
530
532
}
531
533
 
532
534
drizzle_column_st *drizzle_column_read(drizzle_result_st *result,
790
792
    con->buffer_size-= con->packet_size;
791
793
    con->packet_size= 0;
792
794
 
793
 
    drizzle_state_push(con, drizzle_state_packet_read);
 
795
    drizzle_state_pop(con);
794
796
  }
795
797
  else
796
798
  {