~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error.cc

  • Committer: Henrik Ingo
  • Date: 2011-09-08 11:37:58 UTC
  • mto: This revision was merged to the branch mainline in revision 2439.
  • Revision ID: henrik.ingo@avoinelama.fi-20110908113758-o8upiz5ox6x5m354
Use my_error() to return v8 errors to the client instead of stdout/log.
Added new error type ER_SCRIPT to error_t.h.

Show diffs side-by-side

added added

removed removed

Lines of Context:
636
636
  ADD_ERROR_MESSAGE(ER_USE_DATA_DICTIONARY, N_("Engine status is now stored in the data_dictionary tables, please use these instead."));
637
637
  ADD_ERROR_MESSAGE(ER_TRANSACTION_ALREADY_STARTED, N_("There is already a transaction in progress"));
638
638
  ADD_ERROR_MESSAGE(ER_NO_LOCK_HELD, N_("No lock is held by this connection."));
 
639
  
 
640
  // Errors in scripts, such as JavaScript
 
641
  ADD_ERROR_MESSAGE(ER_SCRIPT, N_("Error executing script: %s"));
639
642
}
640
643
 
641
644
} /* namespace drizzled */