← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/haildb/haildb_engine.cc

merge warn_unused_result tree to see if it fixes some of teh problems we're having with errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/haildb/haildb_engine.cc
2221
2221
  err= ib_cursor_first(cursor);
2222
2222
  if (err != DB_SUCCESS && err != DB_END_OF_INDEX)
2223
2223
  {
2224
 
    previous_error= ib_err_t_to_drizzle_error(getTable()->getSession(), err);
2225
 
    err= ib_cursor_reset(cursor);
2226
 
    return previous_error;
 
2224
    int reset_err= ib_cursor_reset(cursor);
 
2225
    assert(reset_err == DB_SUCCESS);
 
2226
    return ib_err_t_to_drizzle_error(getTable()->getSession(), err);
2227
2227
  }
2228
2228
 
2229
2229
  advance_cursor= false;
2230
2230
 
2231
 
  previous_error= 0;
2232
2231
  return(0);
2233
2232
}
2234
2233
 
2324
2323
  ib_err_t err;
2325
2324
  int ret;
2326
2325
 
2327
 
  if (previous_error)
2328
 
    return previous_error;
2329
 
 
2330
2326
  if (advance_cursor)
2331
2327
  {
2332
2328
    err= ib_cursor_next(cursor);
2353
2349
  err= ib_cursor_reset(cursor);
2354
2350
  assert(err == DB_SUCCESS);
2355
2351
  in_table_scan= false;
2356
 
  previous_error= 0;
2357
2352
  return ib_err_t_to_drizzle_error(getTable()->getSession(), err);
2358
2353
}
2359
2354