← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-180

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Continuous Integration
  • Date: 2013-03-07 03:15:07 UTC
  • mfrom: (2630.1.7 create-tmp-table)
  • Revision ID: ci@drizzle.org-20130307031507-bqgrashrp5m3fw8x
Merge lp:~stewart/drizzle/misc-cleanups Build: jenkins-Drizzle-Builder-175

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
148
148
  drizzled::sys_var_with_base variable;
149
149
  drizzled::sql_var_t var_type;
150
150
  drizzled::Key::Keytype key_type;
151
 
  drizzled::ha_key_alg key_alg;
 
151
  drizzled::message::Table::Index::IndexType key_alg;
152
152
  drizzled::ha_rkey_function ha_rkey_mode;
153
153
  drizzled::enum_tx_isolation tx_isolation;
154
154
  drizzled::Cast_target cast_type;
1780
1780
        ;
1781
1781
 
1782
1782
btree_or_rtree:
1783
 
          BTREE_SYM { $$= HA_KEY_ALG_BTREE; }
1784
 
        | HASH_SYM  { $$= HA_KEY_ALG_HASH; }
 
1783
          BTREE_SYM { $$= drizzled::message::Table::Index::BTREE; }
 
1784
        | HASH_SYM  { $$= drizzled::message::Table::Index::HASH; }
1785
1785
        ;
1786
1786
 
1787
1787
key_list: