← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error_t.h

  • Committer: Olaf van der Spek
  • Date: 2011-02-28 14:09:50 UTC
  • mfrom: (2207 bootstrap)
  • mto: (2209.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 2210.
  • Revision ID: olafvdspek@gmail.com-20110228140950-2nu0hyzhuww3wssx
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/error_t.h
865
865
  ER_TRANSACTIONAL_DDL_NOT_SUPPORTED,
866
866
  ER_USE_DATA_DICTIONARY,
867
867
  ER_TRANSACTION_ALREADY_STARTED,
868
 
  ER_CARTESIAN_JOIN_ATTEMPTED
 
868
  ER_CARTESIAN_JOIN_ATTEMPTED,
 
869
  ER_NO_LOCK_HELD
869
870
};
870
871
 
871
872