← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Brian Aker
  • Date: 2010-07-09 17:59:07 UTC
  • Revision ID: brian@gaz-20100709175907-h014kkb6cztsr21d
Fix const_cast, disable the unittest for generators.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
646
646
    if (directory.fail())
647
647
    {
648
648
      errno= directory.getError();
649
 
      /* @TODO: It is possible (in the generator unittest) for us to get here
650
 
         and have  schema_identifier and directory be invalid objects.
651
 
         This manifests on OSX running the unittests but no where else
652
 
       We should figure this out and then uncomment this section */
653
 
      /* 
654
649
      if (errno == ENOENT)
655
 
        my_error(ER_BAD_DB_ERROR, MYF(ME_BELL+ME_WAITTANG), schema_identifier.getSQLPath().c_str());
 
650
        my_error(ER_BAD_DB_ERROR, MYF(ME_BELL+ME_WAITTANG), const_cast<SchemaIdentifier &>(schema_identifier).getSQLPath().c_str());
656
651
      else
657
652
        my_error(ER_CANT_READ_DIR, MYF(ME_BELL+ME_WAITTANG), directory.getPath(), errno);
658
 
      */
659
653
      return;
660
654
    }
661
655
  }