← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/subselect.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/item/subselect.cc
2964
2964
    assert(tmp_table->s->db_type() == myisam_engine);
2965
2965
    assert(
2966
2966
      tmp_table->s->uniques ||
2967
 
      tmp_table->key_info->key_length >= tmp_table->cursor->max_key_length() ||
2968
 
      tmp_table->key_info->key_parts > tmp_table->cursor->max_key_parts());
 
2967
      tmp_table->key_info->key_length >= tmp_table->cursor->getEngine()->max_key_length() ||
 
2968
      tmp_table->key_info->key_parts > tmp_table->cursor->getEngine()->max_key_parts());
2969
2969
    tmp_table->free_tmp_table(session);
2970
2970
    delete result;
2971
2971
    result= NULL;