← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/opt_range.cc

  • Committer: Brian Aker
  • Date: 2009-12-01 02:39:03 UTC
  • mfrom: (1234.1.4 push)
  • Revision ID: brian@gaz-20091201023903-1id5z7xnup695jaq
Merge of Brian + Jay test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/opt_range.cc
776
776
{
777
777
public:
778
778
  KEY_PART *key[MAX_KEY]; /* First key parts of keys used in the query */
779
 
  int64_t baseflag;
780
779
  uint32_t max_key_part;
781
780
  /* Number of ranges in the last checked tree->key */
782
781
  uint32_t range_count;
2301
2300
 
2302
2301
    /* set up parameter that is passed to all functions */
2303
2302
    param.session= session;
2304
 
    param.baseflag= head->cursor->ha_table_flags();
2305
2303
    param.prev_tables= prev_tables | const_tables;
2306
2304
    param.read_tables= read_tables;
2307
2305
    param.current_table= head->map;
8122
8120
      we check that all query fields are indeed covered by 'cur_index'.
8123
8121
    */
8124
8122
    if (pk < MAX_KEY && cur_index != pk &&
8125
 
        (table->cursor->ha_table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX))
 
8123
        (table->cursor->getEngine()->check_flag(HTON_BIT_PRIMARY_KEY_IN_READ_INDEX)))
8126
8124
    {
8127
8125
      /* For each table field */
8128
8126
      for (uint32_t i= 0; i < table->s->fields; i++)