← 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-09 21:18:30 UTC
  • mfrom: (1273.2.42)
  • Revision ID: brian@gaz-20100209211830-7vf91n0yasi0r28y
Merge Stewart.

Show diffs side-by-side

added added

removed removed

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