← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error_t.h

  • Committer: Brian Aker
  • Date: 2011-02-25 08:03:36 UTC
  • mfrom: (2200.1.3 drizzle-staging)
  • Revision ID: brian@tangent.org-20110225080336-p413o4yknq1ej22u
Rollup of Olaf/Brian/Stewart

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