← 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-02-14 02:02:48 UTC
  • mfrom: (1273.13.64 fix_is)
  • Revision ID: brian@gaz-20100214020248-bhovaejhz9fmer3q
Merge in data_dictionary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
580
580
    if (ret != ENOENT)
581
581
      *err= ret;
582
582
 
583
 
    return *err == EEXIST;
 
583
    return *err == EEXIST || *err != ENOENT;
584
584
  }
585
585
};
586
586
 
706
706
                                                         identifier,
707
707
                                                         &src_proto);
708
708
 
 
709
  if (error_proto == ER_CORRUPT_TABLE_DEFINITION)
 
710
  {
 
711
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0),
 
712
             src_proto.InitializationErrorString().c_str());
 
713
    return ER_CORRUPT_TABLE_DEFINITION;
 
714
  }
 
715
 
709
716
  engine= plugin::StorageEngine::findByName(session,
710
717
                                            src_proto.engine().name());
711
718
 
733
740
  if (error_proto && error == 0)
734
741
    return 0;
735
742
 
 
743
  if (((error_proto != EEXIST && error_proto != ENOENT)
 
744
      && !engine && generate_warning)
 
745
      | ( error && !engine && generate_warning))
 
746
  {
 
747
    my_error(ER_GET_ERRNO, MYF(0), error_proto);
 
748
    return error_proto;
 
749
  }
 
750
 
736
751
  if (error && generate_warning)
737
752
  {
738
753
    /*