← Back to branch summary

~stewart/drizzle/embedded-innodb-configuration-io-threads

« back to all changes in this revision

Viewing changes to drizzled/item/subselect.cc

  • Committer: Stewart Smith
  • Date: 2010-05-17 07:06:21 UTC
  • mfrom: (1447.1.4)
  • Revision ID: stewart@flamingspork.com-20100517070621-7xusw9kb7dk1fzw7
Merged embedded-innodb-configuration-open-files into embedded-innodb-configuration-io-threads.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/subselect.cc
2705
2705
void subselect_uniquesubquery_engine::print(String *str,
2706
2706
                                            enum_query_type query_type)
2707
2707
{
2708
 
  char *table_name= tab->table->s->table_name.str;
 
2708
  char *table_name= const_cast<char *>(tab->table->s->getTableName());
2709
2709
  str->append(STRING_WITH_LEN("<primary_index_lookup>("));
2710
2710
  tab->ref.items[0]->print(str, query_type);
2711
2711
  str->append(STRING_WITH_LEN(" in "));
2712
 
  if (tab->table->s->table_category == TABLE_CATEGORY_TEMPORARY)
 
2712
  if (tab->table->getShare()->isTemporaryCategory())
2713
2713
  {
2714
2714
    /*
2715
2715
      Temporary tables' names change across runs, so they can't be used for
2718
2718
    str->append(STRING_WITH_LEN("<temporary table>"));
2719
2719
  }
2720
2720
  else
2721
 
    str->append(table_name, tab->table->s->table_name.length);
2722
 
  KEY *key_info= tab->table->key_info+ tab->ref.key;
 
2721
    str->append(table_name, tab->table->s->getTableNameSize());
 
2722
  KeyInfo *key_info= tab->table->key_info+ tab->ref.key;
2723
2723
  str->append(STRING_WITH_LEN(" on "));
2724
2724
  str->append(key_info->name);
2725
2725
  if (cond)
2742
2742
  for (uint32_t i= 0; i < key_info->key_parts; i++)
2743
2743
    tab->ref.items[i]->print(str);
2744
2744
  str->append(STRING_WITH_LEN(" in "));
2745
 
  str->append(tab->table->s->table_name.str, tab->table->s->table_name.length);
 
2745
  str->append(tab->table->s->getTableName(), tab->table->s->getTableNameSize());
2746
2746
  str->append(STRING_WITH_LEN(" on "));
2747
2747
  str->append(key_info->name);
2748
2748
  if (cond)
2760
2760
  str->append(STRING_WITH_LEN("<index_lookup>("));
2761
2761
  tab->ref.items[0]->print(str, query_type);
2762
2762
  str->append(STRING_WITH_LEN(" in "));
2763
 
  str->append(tab->table->s->table_name.str, tab->table->s->table_name.length);
2764
 
  KEY *key_info= tab->table->key_info+ tab->ref.key;
 
2763
  str->append(tab->table->s->getTableName(), tab->table->s->getTableNameSize());
 
2764
  KeyInfo *key_info= tab->table->key_info+ tab->ref.key;
2765
2765
  str->append(STRING_WITH_LEN(" on "));
2766
2766
  str->append(key_info->name);
2767
2767
  if (check_null)
2938
2938
  select_union  *tmp_result_sink;
2939
2939
  /* The table into which the subquery is materialized. */
2940
2940
  Table         *tmp_table;
2941
 
  KEY           *tmp_key; /* The only index on the temporary table. */
 
2941
  KeyInfo           *tmp_key; /* The only index on the temporary table. */
2942
2942
  uint32_t          tmp_key_parts; /* Number of keyparts in tmp_key. */
2943
2943
  Item_in_subselect *item_in= (Item_in_subselect *) item;
2944
2944
 
3012
3012
        (Item**) session->alloc(sizeof(Item*) * tmp_key_parts)))
3013
3013
    return(true);
3014
3014
 
3015
 
  KEY_PART_INFO *cur_key_part= tmp_key->key_part;
 
3015
  KeyPartInfo *cur_key_part= tmp_key->key_part;
3016
3016
  StoredKey **ref_key= tab->ref.key_copy;
3017
3017
  unsigned char *cur_ref_buff= tab->ref.key_buff;
3018
3018