← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Mark Atwood
  • Date: 2011-11-11 18:23:18 UTC
  • mfrom: (2456.1.5 rf)
  • Revision ID: me@mark.atwood.name-20111111182318-skgcp9ce65fd2goa
merge lp:~olafvdspek/drizzle/refactor11

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
440
440
  return type() == item->type() && 
441
441
         name && 
442
442
         item->name &&
443
 
         not my_strcasecmp(system_charset_info, name, item->name);
 
443
         not system_charset_info->strcasecmp(name, item->name);
444
444
}
445
445
 
446
446
Item *Item::safe_charset_converter(const charset_info_st* tocs)
872
872
  {
873
873
    /* Convert database to lower case for comparison */
874
874
    strncpy(name_buff, db_name, sizeof(name_buff)-1);
875
 
    my_casedn_str(files_charset_info, name_buff);
 
875
    files_charset_info->casedn_str(name_buff);
876
876
    db_name= name_buff;
877
877
  }
878
878
 
887
887
 
888
888
      assert(cur_field->field_name != 0);
889
889
 
890
 
      if (! my_strcasecmp(system_charset_info, cur_field->field_name, field_name))
891
 
        ++cur_match_degree;
892
 
      else
 
890
      if (system_charset_info->strcasecmp(cur_field->field_name, field_name))
893
891
        continue;
 
892
      ++cur_match_degree;
894
893
 
895
894
      if (cur_field->table_name && table_name)
896
895
      {
897
896
        /* If field_name is qualified by a table name. */
898
 
        if (my_strcasecmp(table_alias_charset, cur_field->table_name, table_name))
 
897
        if (table_alias_charset->strcasecmp(cur_field->table_name, table_name))
899
898
          /* Same field names, different tables. */
900
899
          return NULL;
901
900
 
903
902
        if (cur_field->db_name && db_name)
904
903
        {
905
904
          /* If field_name is also qualified by a database name. */
906
 
          if (my_strcasecmp(system_charset_info, cur_field->db_name, db_name))
 
905
          if (system_charset_info->strcasecmp(cur_field->db_name, db_name))
907
906
          {
908
907
            /* Same field names, different databases. */
909
908
            return NULL;