← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/ident.cc

Merge Siddharth

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/ident.cc
87
87
    return field_name ? field_name : name ? name : "tmp_field";
88
88
  if (db_name && db_name[0])
89
89
  {
90
 
                tmp_len=strlen(db_name)+strlen(table_name)+strlen(field_name)+3;
91
 
    tmp=(char*) memory::sql_alloc(tmp_len);
 
90
    tmp_len= strlen(db_name)+strlen(table_name)+strlen(field_name)+3;
 
91
    tmp= (char*) memory::sql_alloc(tmp_len);
92
92
    snprintf(tmp, tmp_len, "%s.%s.%s",db_name,table_name,field_name);
93
93
  }
94
94
  else
95
95
  {
96
96
    if (table_name[0])
97
97
    {
98
 
                        tmp_len=strlen(table_name)+strlen(field_name)+2;
 
98
      tmp_len=strlen(table_name)+strlen(field_name)+2;
99
99
      tmp= (char*) memory::sql_alloc(tmp_len);
100
100
      snprintf(tmp, tmp_len, "%s.%s", table_name, field_name);
101
101
    }