← 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-30 07:06:47 UTC
  • mfrom: (2463.1.6 drizzle-include)
  • Revision ID: me@mark.atwood.name-20111130070647-ixp7oalp70hkbt6l
merge lp:~brianaker/drizzle/libdrizzle-2.0-not-install

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
  {
229
230
    con->result->options&= ~DRIZZLE_RESULT_ROW_BREAK;
 
231
  }
230
232
  else
231
233
  {
232
234
    con->result->row_count++;
235
237
  }
236
238
 
237
239
  drizzle_state_pop(con);
 
240
 
238
241
  return DRIZZLE_RETURN_OK;
239
242
}
240
243
 
258
261
  con->buffer_size+= 4;
259
262
 
260
263
  drizzle_state_pop(con);
 
264
 
261
265
  return DRIZZLE_RETURN_OK;
262
266
}