← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/row.c

  • Committer: Andrew Hutchings
  • Date: 2010-10-13 17:56:47 UTC
  • mto: (1848.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 1849.
  • Revision ID: andrew@linuxjedi.co.uk-20101013175647-32ja4597f9fllmd3
Port libdrizzle rev.147:
Fixed bug #571579.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/row.c
158
158
{
159
159
  drizzle_log_debug(con->drizzle, "drizzle_state_row_read");
160
160
 
 
161
  if (con->packet_size != 0 && con->buffer_size < con->packet_size)
 
162
  {
 
163
    drizzle_state_push(con, drizzle_state_read);
 
164
    return DRIZZLE_RETURN_OK;
 
165
  }
 
166
 
161
167
  if (con->packet_size == 5 && con->buffer_ptr[0] == 254)
162
168
  {
163
 
    if (con->buffer_size < 5)
164
 
    {
165
 
      drizzle_state_push(con, drizzle_state_read);
166
 
      return DRIZZLE_RETURN_OK;
167
 
    }
168
 
 
169
169
    /* Got EOF packet, no more rows. */
170
170
    con->result->row_current= 0;
171
171
    con->result->warning_count= drizzle_get_byte2(con->buffer_ptr + 1);