← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error.cc

  • Committer: Monty Taylor
  • Date: 2010-02-11 01:35:55 UTC
  • mfrom: (1289 staging)
  • mto: This revision was merged to the branch mainline in revision 1293.
  • Revision ID: mordred@inaugust.com-20100211013555-f9okqsgi91mwm4xu
Merged up with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/error.cc
19
19
 */
20
20
 
21
21
/*
22
 
 *   Errors a drizzled can give you
23
 
 *   */
 
22
 * Errors a drizzled can give you
 
23
 */
24
24
 
25
25
#include "config.h"
26
26
#include "drizzled/internal/my_sys.h"
28
28
#include "drizzled/error.h"
29
29
#include "drizzled/gettext.h"
30
30
 
 
31
namespace drizzled
 
32
{
 
33
 
31
34
static const char *drizzled_error_messages[]=
32
35
{
33
36
/* Unused: was ER_HASHCHK which hasn't been used since before MySQL 3.20.32a  */
1415
1418
/* ER_INVALID_ENUM_VALUE */
1416
1419
N_("Received an invalid enum value '%s'."),
1417
1420
/* ER_NO_PRIMARY_KEY_ON_REPLICATED_TABLE */
1418
 
N_("Tables which are replicated require a primary key.")
 
1421
N_("Tables which are replicated require a primary key."),
 
1422
/* ER_CORRUPT_TABLE_DEFINITION */
 
1423
N_("Corrupt or invalid table definition: %s")
1419
1424
};
1420
1425
 
1421
1426
const char * error_message(unsigned int code)
1761
1766
  }
1762
1767
  my_errmsgs_list= &my_errmsgs_globerrs;
1763
1768
}
 
1769
 
 
1770
} /* namespace drizzled */