← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/records.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/records.cc
191
191
    */
192
192
    if (!table->sort.addon_field &&
193
193
        session->variables.read_rnd_buff_size &&
194
 
        !(table->cursor->ha_table_flags() & HA_FAST_KEY_READ) &&
 
194
        !(table->cursor->getEngine()->check_flag(HTON_BIT_FAST_KEY_READ)) &&
195
195
        (table->db_stat & HA_READ_ONLY ||
196
196
        table->reginfo.lock_type <= TL_READ_NO_INSERT) &&
197
197
        (uint64_t) table->s->reclength* (table->cursor->stats.records+
229
229
    if (!table->no_cache &&
230
230
        (use_record_cache > 0 ||
231
231
        (int) table->reginfo.lock_type <= (int) TL_READ_WITH_SHARED_LOCKS ||
232
 
        !(table->s->db_options_in_use & HA_OPTION_PACK_RECORD) ||
233
 
        (use_record_cache < 0 &&
234
 
          !(table->cursor->ha_table_flags() & HA_NOT_DELETE_WITH_CACHE))))
 
232
        !(table->s->db_options_in_use & HA_OPTION_PACK_RECORD)))
235
233
      table->cursor->extra_opt(HA_EXTRA_CACHE, session->variables.read_buff_size);
236
234
  }
237
235