← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

Merge Padraig

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
7995
7995
        if (table_list->schema_table && 
7996
7996
            table_list->schema_table->getRequestedObject() & OPTIMIZE_I_S_TABLE)
7997
7997
        {
7998
 
          const char *tmp_buff;
7999
 
          int f_idx;
8000
7998
          if (table_list->has_db_lookup_value)
8001
7999
          {
8002
 
            f_idx= table_list->schema_table->getFirstColumnIndex();
8003
 
            tmp_buff= table_list->schema_table->getColumnName(f_idx);
8004
 
            tmp2.append(tmp_buff, strlen(tmp_buff), cs);
 
8000
            int f_idx= table_list->schema_table->getFirstColumnIndex();
 
8001
            const string &tmp_buff= table_list->schema_table->getColumnName(f_idx);
 
8002
            tmp2.append(tmp_buff.c_str(), tmp_buff.length(), cs);
8005
8003
          }
8006
8004
          if (table_list->has_table_lookup_value)
8007
8005
          {
8008
8006
            if (table_list->has_db_lookup_value)
8009
8007
              tmp2.append(',');
8010
 
            f_idx= table_list->schema_table->getSecondColumnIndex();
8011
 
            tmp_buff= table_list->schema_table->getColumnName(f_idx);
8012
 
            tmp2.append(tmp_buff, strlen(tmp_buff), cs);
 
8008
            int f_idx= table_list->schema_table->getSecondColumnIndex();
 
8009
            const string &tmp_buff= table_list->schema_table->getColumnName(f_idx);
 
8010
            tmp2.append(tmp_buff.c_str(), tmp_buff.length(), cs);
8013
8011
          }
8014
8012
          if (tmp2.length())
8015
8013
            item_list.push_back(new Item_string(tmp2.ptr(),tmp2.length(),cs));