← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/cursor.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:
drizzled/cursor.cc
95
95
 
96
96
  if (new_handler && !new_handler->ha_open(identifier,
97
97
                                           table,
98
 
                                           table->getMutableShare()->getNormalizedPath(),
99
98
                                           table->getDBStat(),
100
99
                                           HA_OPEN_IGNORE_IF_LOCKED))
101
100
    return new_handler;
229
228
  Don't wait for locks if not HA_OPEN_WAIT_IF_LOCKED is set
230
229
*/
231
230
int Cursor::ha_open(const TableIdentifier &identifier,
232
 
                    Table *table_arg, const char *name, int mode,
 
231
                    Table *table_arg,
 
232
                    int mode,
233
233
                    int test_if_locked)
234
234
{
235
235
  int error;
237
237
  table= table_arg;
238
238
  assert(table->getShare() == table_share);
239
239
 
240
 
  assert(identifier.getPath().compare(name) == 0);
241
240
  if ((error= doOpen(identifier, mode, test_if_locked)))
242
241
  {
243
242
    if ((error == EACCES || error == EROFS) && mode == O_RDWR &&