← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2009-03-05 07:55:26 UTC
  • mfrom: (910.1.5 drizzle)
  • Revision ID: brian@tangent.org-20090305075526-ua34bjproq6oxujx
Merge of Brian (test extensions, dead code killing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
2608
2608
cache_keys_spec:
2609
2609
          {
2610
2610
            Lex->select_lex.alloc_index_hints(YYSession);
2611
 
            Select->set_index_hint_type(INDEX_HINT_USE, 
2612
 
                                        global_system_variables.old_mode ? 
2613
 
                                        INDEX_HINT_MASK_JOIN : 
2614
 
                                        INDEX_HINT_MASK_ALL);
 
2611
            Select->set_index_hint_type(INDEX_HINT_USE, INDEX_HINT_MASK_ALL);
2615
2612
          }
2616
2613
          cache_key_list_or_empty
2617
2614
        ;
4041
4038
index_hint_clause:
4042
4039
          /* empty */
4043
4040
          {
4044
 
            $$= global_system_variables.old_mode ? 
4045
 
                  INDEX_HINT_MASK_JOIN : INDEX_HINT_MASK_ALL; 
 
4041
            $$= INDEX_HINT_MASK_ALL; 
4046
4042
          }
4047
4043
        | FOR_SYM JOIN_SYM      { $$= INDEX_HINT_MASK_JOIN;  }
4048
4044
        | FOR_SYM ORDER_SYM BY  { $$= INDEX_HINT_MASK_ORDER; }