← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error.cc

  • Committer: Brian Aker
  • Date: 2010-12-17 22:19:09 UTC
  • mfrom: (1960.2.15 trunk-admin-tool)
  • Revision ID: brian@tangent.org-20101217221909-gsltcrjo302qjx26
Merge of Andrew

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/error.cc
467
467
  ADD_ERROR_MESSAGE(ER_UNKNOWN_ENGINE_OPTION, N_("Unknown table engine option key/pair %s = %s."));
468
468
  ADD_ERROR_MESSAGE(ER_UNKNOWN_SCHEMA_OPTION, N_("Unknown schema engine option key/pair %s = %s."));
469
469
 
 
470
  ADD_ERROR_MESSAGE(ER_ADMIN_ACCESS, N_("Admin access not allowed from this username/IP address."));
 
471
 
470
472
  // User lock/barrier error messages
471
473
  ADD_ERROR_MESSAGE(ER_USER_LOCKS_CANT_WAIT_ON_OWN_BARRIER, N_("wait() can not be called on session owning user defined barrier."));
472
474
  ADD_ERROR_MESSAGE(ER_USER_LOCKS_UNKNOWN_BARRIER, N_("Unknown user defined barrier requested."));