← 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: Henrik Ingo
  • Date: 2011-09-23 06:14:37 UTC
  • mfrom: (2425 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2439.
  • Revision ID: henrik.ingo@avoinelama.fi-20110923061437-ct1wedkb9s47uy2t
Merge newest trunk.

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;
 
525
}
 
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;
523
540
}
524
541
 
525
542
drizzle_column_st *drizzle_column_read(drizzle_result_st *result,
777
794
    con->buffer_ptr+= con->packet_size;
778
795
    con->buffer_size-= con->packet_size;
779
796
    con->packet_size= 0;
 
797
    con->result->column_count++;
780
798
 
781
 
    drizzle_state_push(con, drizzle_state_packet_read);
 
799
    drizzle_state_pop(con);
782
800
  }
783
801
  else
784
802
  {