~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error.cc

  • Committer: Brian Aker
  • Date: 2010-06-24 05:34:43 UTC
  • mto: (1637.1.4 staging)
  • mto: This revision was merged to the branch mainline in revision 1638.
  • Revision ID: brian@gaz-20100624053443-ryl3s27qnut6xtub
This fixes the parser to no longer do the bad syntax around the cross join
(MySQL got it wrong, and allowed on).

Show diffs side-by-side

added added

removed removed

Lines of Context:
913
913
  add(ER_USE_SQL_BIG_RESULT, N_("Temporary table too large, rerun with SQL_BIG_RESULT."));
914
914
  add(ER_UNKNOWN_ENGINE_OPTION, N_("Unknown table engine option key/pair %s = %s."));
915
915
  add(ER_UNKNOWN_SCHEMA_OPTION, N_("Unknown schema engine option key/pair %s = %s."));
 
916
  add(ER_CARTESIAN_JOIN_ATTEMPTED, N_("Implicit cartesian join attempted."));
916
917
 
917
918
  add(EE_CANTUNLOCK, N_("Can't unlock file (Errcode: %d)"));
918
919
  add(EE_CANT_CHSIZE, N_("Can't change size of file (Errcode: %d)"));