← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/subselect.cc

Merged Drizzle's Trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/subselect.cc
2969
2969
     table since it will not be used, and tell the caller we failed to
2970
2970
     initialize the engine.
2971
2971
  */
2972
 
  if (tmp_table->getShare()->keys == 0)
 
2972
  if (tmp_table->getShare()->sizeKeys() == 0)
2973
2973
  {
2974
2974
    assert(tmp_table->getShare()->db_type() == myisam_engine);
2975
2975
    assert(
2987
2987
    Make sure there is only one index on the temp table, and it doesn't have
2988
2988
    the extra key part created when s->uniques > 0.
2989
2989
  */
2990
 
  assert(tmp_table->getShare()->keys == 1 && tmp_columns->elements == tmp_key_parts);
 
2990
  assert(tmp_table->getShare()->sizeKeys() == 1 && tmp_columns->elements == tmp_key_parts);
2991
2991
 
2992
2992
 
2993
2993
  /* 2. Create/initialize execution related objects. */