← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Mark Atwood
  • Date: 2011-07-13 22:28:29 UTC
  • mfrom: (2318.7.25 refactor1)
  • Revision ID: me@mark.atwood.name-20110713222829-sswp061b5ts7tc1k
merge lp:~olafvdspek/drizzle/refactor1

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
719
719
  {
720
720
    String str;
721
721
    get_error_message(error, &str);
722
 
    my_error(ER_ROW_IS_REFERENCED_2, MYF(0), str.c_ptr_safe());
 
722
    my_error(ER_ROW_IS_REFERENCED_2, MYF(0), str.c_str());
723
723
    return;
724
724
  }
725
725
  case HA_ERR_NO_REFERENCED_ROW:
726
726
  {
727
727
    String str;
728
728
    get_error_message(error, &str);
729
 
    my_error(ER_NO_REFERENCED_ROW_2, MYF(0), str.c_ptr_safe());
 
729
    my_error(ER_NO_REFERENCED_ROW_2, MYF(0), str.c_str());
730
730
    return;
731
731
  }
732
732
  case HA_ERR_TABLE_DEF_CHANGED:
763
763
    textno= ER_WARN_DATA_OUT_OF_RANGE;
764
764
    break;
765
765
  case HA_ERR_LOCK_OR_ACTIVE_TRANSACTION:
766
 
    my_message(ER_LOCK_OR_ACTIVE_TRANSACTION,
767
 
               ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
 
766
    my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
768
767
    return;
769
768
  default:
770
769
    {
775
774
      bool temporary= false;
776
775
      String str;
777
776
      temporary= get_error_message(error, &str);
778
 
      if (!str.is_empty())
 
777
      if (!str.empty())
779
778
      {
780
779
        const char* engine_name= getName().c_str();
781
780
        if (temporary)
782
 
          my_error(ER_GET_TEMPORARY_ERRMSG, MYF(0), error, str.ptr(),
783
 
                   engine_name);
 
781
          my_error(ER_GET_TEMPORARY_ERRMSG, MYF(0), error, str.ptr(), engine_name);
784
782
        else
785
783
          my_error(ER_GET_ERRMSG, MYF(0), error, str.ptr(), engine_name);
786
784
      }