← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_ror_union_select.cc

  • Committer: Lee Bieber
  • Date: 2011-02-17 04:07:38 UTC
  • mfrom: (2170.4.5 optimiser-work)
  • Revision ID: kalebral@gmail.com-20110217040738-mp2e43zcc9il2sw2
Merge Stewart fix some conversions from String to std::string in EXPLAIN codepath

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_ror_union_select.cc
230
230
}
231
231
 
232
232
 
233
 
void optimizer::QuickRorUnionSelect::add_info_string(String *str)
 
233
void optimizer::QuickRorUnionSelect::add_info_string(string *str)
234
234
{
235
235
  bool first= true;
236
 
  str->append(STRING_WITH_LEN("union("));
 
236
  str->append("union(");
237
237
  for (vector<optimizer::QuickSelectInterface *>::iterator it= quick_selects.begin();
238
238
       it != quick_selects.end();
239
239
       ++it)
240
240
  {
241
241
    if (! first)
242
 
      str->append(',');
 
242
      str->append(",");
243
243
    else
244
244
      first= false;
245
245
    (*it)->add_info_string(str);
246
246
  }
247
 
  str->append(')');
 
247
  str->append(")");
248
248
}
249
249
 
250
250
 
251
 
void optimizer::QuickRorUnionSelect::add_keys_and_lengths(String *key_names,
252
 
                                                          String *used_lengths)
 
251
void optimizer::QuickRorUnionSelect::add_keys_and_lengths(string *key_names,
 
252
                                                          string *used_lengths)
253
253
{
254
254
  bool first= true;
255
255
  for (vector<optimizer::QuickSelectInterface *>::iterator it= quick_selects.begin();
262
262
    }
263
263
    else
264
264
    {
265
 
      used_lengths->append(',');
266
 
      key_names->append(',');
 
265
      used_lengths->append(",");
 
266
      key_names->append(",");
267
267
    }
268
268
    (*it)->add_keys_and_lengths(key_names, used_lengths);
269
269
  }