← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/subselect.cc

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/subselect.cc
2722
2722
 
2723
2723
void subselect_uniquesubquery_engine::print(String *str)
2724
2724
{
2725
 
  const char *table_name= tab->table->getShare()->getTableName();
2726
2725
  str->append(STRING_WITH_LEN("<primary_index_lookup>("));
2727
2726
  tab->ref.items[0]->print(str);
2728
2727
  str->append(STRING_WITH_LEN(" in "));
2735
2734
    str->append(STRING_WITH_LEN("<temporary table>"));
2736
2735
  }
2737
2736
  else
2738
 
    str->append(table_name, tab->table->getShare()->getTableNameSize());
2739
 
  KeyInfo *key_info= tab->table->key_info+ tab->ref.key;
 
2737
    str->append(tab->table->getShare()->getTableNameRef());
2740
2738
  str->append(STRING_WITH_LEN(" on "));
2741
 
  str->append(key_info->name);
 
2739
  str->append(tab->table->key_info[tab->ref.key].name);
2742
2740
  if (cond)
2743
2741
  {
2744
2742
    str->append(STRING_WITH_LEN(" where "));
2776
2774
  str->append(STRING_WITH_LEN("<index_lookup>("));
2777
2775
  tab->ref.items[0]->print(str);
2778
2776
  str->append(STRING_WITH_LEN(" in "));
2779
 
  str->append(tab->table->getShare()->getTableName(), tab->table->getShare()->getTableNameSize());
 
2777
  str->append(tab->table->getShare()->getTableNameRef());
2780
2778
  KeyInfo *key_info= tab->table->key_info+ tab->ref.key;
2781
2779
  str->append(STRING_WITH_LEN(" on "));
2782
2780
  str->append(key_info->name);