← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/row.cc

  • Committer: Mark Atwood
  • Date: 2011-11-22 17:04:41 UTC
  • mfrom: (2462.1.3 drizzle-include)
  • Revision ID: me@mark.atwood.name-20111122170441-5dehm0e0ax20z19b
merge lp:~brianaker/drizzle/fedora-16-fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/row.cc
226
226
    return DRIZZLE_RETURN_OK;
227
227
  }
228
228
  else if (con->result->options & DRIZZLE_RESULT_ROW_BREAK)
229
 
  {
230
229
    con->result->options&= ~DRIZZLE_RESULT_ROW_BREAK;
231
 
  }
232
230
  else
233
231
  {
234
232
    con->result->row_count++;
237
235
  }
238
236
 
239
237
  drizzle_state_pop(con);
240
 
 
241
238
  return DRIZZLE_RETURN_OK;
242
239
}
243
240
 
261
258
  con->buffer_size+= 4;
262
259
 
263
260
  drizzle_state_pop(con);
264
 
 
265
261
  return DRIZZLE_RETURN_OK;
266
262
}