← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error.cc

  • Committer: Lee Bieber
  • Date: 2011-02-01 00:45:23 UTC
  • mfrom: (2131.2.4 build)
  • Revision ID: kalebral@gmail.com-20110201004523-4li8i1mvawn0ebz4
Merge Patrick - 710942: dbqp not recovering from certain tests with non-started servers
Merge Patrick - 709861: dbqp not running on mac osx
Merge Andrew - 702582: SHOW INNODB STATUS should error
Merge Monty - Remove a leftover warning from a previous attempt at fixing the OSX issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/error.cc
580
580
  ADD_ERROR_MESSAGE(ER_CATALOG_NO_LOCK, N_("Could not gain lock on '%s'."));
581
581
  ADD_ERROR_MESSAGE(ER_CORRUPT_CATALOG_DEFINITION, N_("Corrupt or invalid catalog definition for '%s' : '%s'."));
582
582
  ADD_ERROR_MESSAGE(ER_WRONG_NAME_FOR_CATALOG, N_("Invalid catalog name."));
583
 
 
 
583
  ADD_ERROR_MESSAGE(ER_USE_DATA_DICTIONARY, N_("Engine status is now stored in the data_dictionary tables, please use these instead."));
584
584
 
585
585
}
586
586