← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
16337
16337
    if (session && is_primary_key_name(key_name.str))
16338
16338
      str->append(is_primary_key_name(key_name.str));
16339
16339
    else
16340
 
      append_identifier(session, str, key_name.str, key_name.length);
 
16340
      str->append_identifier(key_name.str, key_name.length);
16341
16341
  }
16342
16342
  str->append(')');
16343
16343
}
16372
16372
    {
16373
16373
      // A normal table
16374
16374
      {
16375
 
        append_identifier(session, str, db, db_length);
 
16375
        str->append_identifier(db, db_length);
16376
16376
        str->append('.');
16377
16377
      }
16378
16378
      if (schema_table)
16379
16379
      {
16380
 
        append_identifier(session, str, schema_table_name,
16381
 
                          strlen(schema_table_name));
 
16380
        str->append_identifier(schema_table_name, strlen(schema_table_name));
16382
16381
        cmp_name= schema_table_name;
16383
16382
      }
16384
16383
      else
16385
16384
      {
16386
 
        append_identifier(session, str, table_name, table_name_length);
 
16385
        str->append_identifier(table_name, table_name_length);
16387
16386
        cmp_name= table_name;
16388
16387
      }
16389
16388
    }
16403
16402
        }
16404
16403
      }
16405
16404
 
16406
 
      append_identifier(session, str, t_alias, strlen(t_alias));
 
16405
      str->append_identifier(t_alias, strlen(t_alias));
16407
16406
    }
16408
16407
 
16409
16408
    if (index_hints)