← 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-11-19 18:18:29 UTC
  • mfrom: (1939.1.3 quick)
  • Revision ID: brian@tangent.org-20101119181829-1k5oqsz3n2pwgt9t
Rollup merge for barrier patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/error.cc
479
479
  add(ER_UNKNOWN_ENGINE_OPTION, N_("Unknown table engine option key/pair %s = %s."));
480
480
  add(ER_UNKNOWN_SCHEMA_OPTION, N_("Unknown schema engine option key/pair %s = %s."));
481
481
 
 
482
  // User lock/barrier error messages
 
483
  add(ER_USER_LOCKS_CANT_WAIT_ON_OWN_BARRIER, N_("wait() can not be called on session owning barrier."));
 
484
  add(ER_USER_LOCKS_UNKNOWN_BARRIER, N_("Unknown barrier requested."));
 
485
  add(ER_USER_LOCKS_NOT_OWNER_OF_BARRIER, N_("Session does not own barrier."));
 
486
 
482
487
  add(EE_CANTUNLOCK, N_("Can't unlock file (Errcode: %d)"));
483
488
  add(EE_CANT_CHSIZE, N_("Can't change size of file (Errcode: %d)"));
484
489
  add(EE_CANT_OPEN_STREAM, N_("Can't open stream from handle (Errcode: %d)"));