← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_list.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/table_list.cc
276
276
    else
277
277
    {
278
278
      // A normal table
279
 
      {
280
 
        str->append_identifier(db, db_length);
281
 
        str->append('.');
282
 
      }
283
 
      str->append_identifier(table_name, table_name_length);
 
279
      str->append_identifier(str_ref(schema));
 
280
      str->append('.');
 
281
      str->append_identifier(str_ref(table_name));
284
282
      cmp_name= table_name;
285
283
    }
286
 
    if (my_strcasecmp(table_alias_charset, cmp_name, alias))
 
284
    if (my_strcasecmp(table_alias_charset, cmp_name, alias) && alias && alias[0])
287
285
    {
288
 
 
289
 
      if (alias && alias[0])
290
 
      {
291
 
        str->append(' ');
292
 
        string t_alias(alias);
293
 
        boost::to_lower(t_alias);
294
 
        str->append_identifier(t_alias);
295
 
      }
 
286
      str->append(' ');
 
287
      str->append_identifier(boost::to_lower_copy(string(alias)));
296
288
    }
297
289
 
298
290
    if (index_hints)