← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2008-11-21 23:53:09 UTC
  • mfrom: (590.1.8 drizzle-nofrm)
  • Revision ID: brian@tangent.org-20081121235309-77pu95n2pboadtos
Merge in Stewart's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
16338
16338
  str->append (STRING_WITH_LEN(" ("));
16339
16339
  if (key_name.length)
16340
16340
  {
16341
 
    if (session && !my_strnncoll(system_charset_info,
16342
 
                             (const unsigned char *)key_name.str, key_name.length, 
16343
 
                             (const unsigned char *)primary_key_name, 
16344
 
                             strlen(primary_key_name)))
16345
 
      str->append(primary_key_name);
 
16341
    if (session && is_primary_key_name(key_name.str))
 
16342
      str->append(is_primary_key_name(key_name.str));
16346
16343
    else
16347
16344
      append_identifier(session, str, key_name.str, key_name.length);
16348
16345
  }