← 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-01 05:22:14 UTC
  • mfrom: (1919.3.53 drizzle_pbms)
  • Revision ID: me@mark.atwood.name-20110801052214-3wdsx3xgld6b5v4f
merge lp:~barry-leslie/drizzle/drizzle_pbms

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();
2725
2726
  str->append(STRING_WITH_LEN("<primary_index_lookup>("));
2726
2727
  tab->ref.items[0]->print(str);
2727
2728
  str->append(STRING_WITH_LEN(" in "));
2734
2735
    str->append(STRING_WITH_LEN("<temporary table>"));
2735
2736
  }
2736
2737
  else
2737
 
    str->append(tab->table->getShare()->getTableNameRef());
 
2738
    str->append(table_name, tab->table->getShare()->getTableNameSize());
 
2739
  KeyInfo *key_info= tab->table->key_info+ tab->ref.key;
2738
2740
  str->append(STRING_WITH_LEN(" on "));
2739
 
  str->append(tab->table->key_info[tab->ref.key].name);
 
2741
  str->append(key_info->name);
2740
2742
  if (cond)
2741
2743
  {
2742
2744
    str->append(STRING_WITH_LEN(" where "));
2774
2776
  str->append(STRING_WITH_LEN("<index_lookup>("));
2775
2777
  tab->ref.items[0]->print(str);
2776
2778
  str->append(STRING_WITH_LEN(" in "));
2777
 
  str->append(tab->table->getShare()->getTableNameRef());
 
2779
  str->append(tab->table->getShare()->getTableName(), tab->table->getShare()->getTableNameSize());
2778
2780
  KeyInfo *key_info= tab->table->key_info+ tab->ref.key;
2779
2781
  str->append(STRING_WITH_LEN(" on "));
2780
2782
  str->append(key_info->name);