← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/field.cc

  • Committer: Olaf van der Spek
  • Date: 2011-11-09 20:20:23 UTC
  • mto: This revision was merged to the branch mainline in revision 2457.
  • Revision ID: olafvdspek@gmail.com-20111109202023-df2axkpkey9qouze
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/field.cc
369
369
    (In cases where we would choose wrong we would have to generate a
370
370
    ER_NON_UNIQ_ERROR).
371
371
  */
372
 
  return (not my_strcasecmp(system_charset_info, item_field->name, field_name) &&
 
372
  return (not system_charset_info->strcasecmp(item_field->name, field_name) &&
373
373
          (not item_field->table_name || not table_name ||
374
 
           (not my_strcasecmp(table_alias_charset, item_field->table_name, table_name) &&
 
374
           (not table_alias_charset->strcasecmp(item_field->table_name, table_name) &&
375
375
            (not item_field->db_name || not db_name ||
376
 
             (item_field->db_name && not my_strcasecmp(system_charset_info, item_field->db_name, db_name))))));
 
376
             (item_field->db_name && not system_charset_info->strcasecmp(item_field->db_name, db_name))))));
377
377
}
378
378
 
379
379