← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.cc

  • Committer: lbieber
  • Date: 2010-09-11 00:47:34 UTC
  • mfrom: (1756.1.2 build)
  • Revision ID: lbieber@orisndriz03-20100911004734-m5kvdu6q2nq0u43w
Merge Brian - cppcheck fixes and also modifies unique lookup such that we let the OS handle paging for unique checking (instead of trying to mimic it through using a self built IO_CACHE).
Merge Andrew - fix test result for embedded_innodb 

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/ha_heap.cc
246
246
                             table->getShare()->getTableName(),
247
247
                             table->getShare()->getPath());
248
248
 
249
 
  if (new_handler && !new_handler->ha_open(identifier, table, file->getShare()->name.c_str(), table->db_stat,
 
249
  if (new_handler && !new_handler->ha_open(identifier, table, table->db_stat,
250
250
                                           HA_OPEN_IGNORE_IF_LOCKED))
251
251
    return new_handler;
252
252
  return NULL;