← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error.cc

  • Committer: Mark Atwood
  • Date: 2011-10-14 16:03:01 UTC
  • mfrom: (2370.2.18 drizzle-js)
  • Revision ID: me@mark.atwood.name-20111014160301-f1oljkg7yiv6906v
merge lp:~hingo/drizzle/drizzle-js_eval

Show diffs side-by-side

added added

removed removed

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