← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.h

  • Committer: Nathan Williams
  • Date: 2009-06-26 19:37:44 UTC
  • mfrom: (1076 staging)
  • mto: This revision was merged to the branch mainline in revision 1082.
  • Revision ID: nathanlws@gmail.com-20090626193744-i9zek83am2craqz6
Merged trunk, resolved conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.h
892
892
  HA_CHECK_OPT check_opt;                       // check/repair options
893
893
  HA_CREATE_INFO create_info;
894
894
  drizzled::message::Table *create_table_proto;
 
895
  StorageEngine *show_engine;
895
896
  KEY_CREATE_INFO key_create_info;
896
897
  uint32_t type;
897
898
  /*