← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error.cc

Merge in Catalogs to current trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/error.cc
527
527
  ADD_ERROR_MESSAGE(EE_DIR, find(ER_CANT_READ_DIR));
528
528
  ADD_ERROR_MESSAGE(EE_STAT, find(ER_CANT_GET_STAT));
529
529
  ADD_ERROR_MESSAGE(EE_DISK_FULL, find(ER_DISK_FULL));
 
530
  
 
531
  // Catalog related errors
 
532
  ADD_ERROR_MESSAGE(ER_WRONG_NAME_FOR_CATALOG, N_("Invalid catalog name"));
 
533
  ADD_ERROR_MESSAGE(ER_CORRUPT_CATALOG_DEFINITION, N_("Corrupt or invalid catalog definition for %s : %s"));
 
534
  ADD_ERROR_MESSAGE(ER_CATALOG_DOES_NOT_EXIST, N_("Catalog does not exist: %s"));
 
535
  ADD_ERROR_MESSAGE(ER_CATALOG_NO_LOCK, N_("Could not gain lock on %s"));
 
536
  ADD_ERROR_MESSAGE(ER_CATALOG_NO_DROP_LOCAL, N_("You can not drop the local catalog"));
 
537
 
530
538
 
531
539
}
532
540