~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/row.c

  • Committer: lbieber at stabletransit
  • Date: 2010-10-14 15:43:11 UTC
  • mfrom: (1848.1.4 build)
  • Revision ID: lbieber@drizzle-build-n02.wc1.dfw1.stabletransit.com-20101014154311-ojsrl9uz80yvizey
Merge Travis - changing struct to C++ classes
Merge Andrew - fix bug #571579: libdrizzle unexpected hang up when using in extremely slow networking environment
Merge Andrew - fix bug #643772: Large rows cannot be read if packet_size exceeds max buffer size
Merge Andrew - fix bug #660082: libdrizzle missing rev.147
Merge Andrew - fix bug 653234: drizzledump (and other clients?) should print Password: prompt on stderr
Merge Andrew - fix bug #653438: "Enter password" prompt should not print stars, or erase them on enter
Merge Andrew - fix bug 659824: Drizzle client UTF8 processing endless loop

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
    con->buffer_size < 5)
 
163
  {
 
164
    drizzle_state_push(con, drizzle_state_read);
 
165
    return DRIZZLE_RETURN_OK;
 
166
  }
 
167
 
161
168
  if (con->packet_size == 5 && con->buffer_ptr[0] == 254)
162
169
  {
163
 
    if (con->buffer_size < 5)
164
 
    {
165
 
      drizzle_state_push(con, drizzle_state_read);
166
 
      return DRIZZLE_RETURN_OK;
167
 
    }
168
 
 
169
170
    /* Got EOF packet, no more rows. */
170
171
    con->result->row_current= 0;
171
172
    con->result->warning_count= drizzle_get_byte2(con->buffer_ptr + 1);