← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_list.cc

  • Committer: Brian Aker
  • Date: 2009-11-30 19:13:19 UTC
  • mfrom: (1225.1.39 figure)
  • Revision ID: brian@gaz-20091130191319-zyt51fidacic3brf
Merge Padraig

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_list.cc
64
64
 
65
65
bool TableList::placeholder()
66
66
{
67
 
  return derived || schema_table || (create && !table->getDBStat()) || !table;
 
67
  return derived || (create && !table->getDBStat()) || !table;
68
68
}
69
69
 
70
70
/*
292
292
        str->append_identifier(db, db_length);
293
293
        str->append('.');
294
294
      }
295
 
      if (schema_table)
296
 
      {
297
 
        str->append_identifier(schema_table_name, strlen(schema_table_name));
298
 
        cmp_name= schema_table_name;
299
 
      }
300
 
      else
301
 
      {
302
 
        str->append_identifier(table_name, table_name_length);
303
 
        cmp_name= table_name;
304
 
      }
 
295
      str->append_identifier(table_name, table_name_length);
 
296
      cmp_name= table_name;
305
297
    }
306
298
    if (my_strcasecmp(table_alias_charset, cmp_name, alias))
307
299
    {