← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error_t.h

  • Committer: Andrew Hutchings
  • Date: 2011-02-07 17:20:59 UTC
  • mfrom: (2148 staging)
  • mto: (2148.2.3 build)
  • mto: This revision was merged to the branch mainline in revision 2149.
  • Revision ID: andrew@linuxjedi.co.uk-20110207172059-dyeahrgzrlincoe3
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/error_t.h
263
263
  ER_UNUSED1143,
264
264
  ER_UNUSED1144,
265
265
  ER_UNUSED1145,
266
 
  ER_NO_SUCH_TABLE,
 
266
  ER_TABLE_UNKNOWN,
267
267
  ER_UNUSED1147,
268
268
  ER_UNUSED1148,
269
269
  ER_SYNTAX_ERROR,
856
856
  ER_TABLE_DROP_ERROR_OCCURRED,
857
857
  ER_TABLE_PERMISSION_DENIED,
858
858
  ER_INVALID_TIMESTAMP_VALUE,
859
 
  ER_TABLE_UNKNOWN,
860
859
 
861
860
  ER_SCHEMA_CANNOT_CREATE,
862
861
  ER_PARSE_ERROR_UNKNOWN,
865
864
  ER_INVALID_DATE_VALUE,
866
865
  ER_TRANSACTIONAL_DDL_NOT_SUPPORTED,
867
866
  ER_USE_DATA_DICTIONARY,
868
 
  ER_CARTESIAN_JOIN_ATTEMPTED,
869
 
  // Leave ER_INVALID_BOOLEAN_VALUE as LAST, and force people to use tags
870
 
  // instead of numbers in error messages in test.
871
 
  ER_ERROR_LAST=   ER_CARTESIAN_JOIN_ATTEMPTED
 
867
  ER_TRANSACTION_ALREADY_STARTED,
 
868
  ER_CARTESIAN_JOIN_ATTEMPTED
872
869
};
873
870
 
874
871