← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.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/sql_table.cc
685
685
    /* Check if we have used the same field name before */
686
686
    for (dup_no=0; (dup_field=it2++) != sql_field; dup_no++)
687
687
    {
688
 
      if (my_strcasecmp(system_charset_info,
689
 
                        sql_field->field_name,
690
 
                        dup_field->field_name) == 0)
 
688
      if (system_charset_info->strcasecmp(sql_field->field_name, dup_field->field_name) == 0)
691
689
      {
692
690
        /*
693
691
          If this was a CREATE ... SELECT statement, accept a field
950
948
      it= alter_info->create_list.begin();
951
949
      field=0;
952
950
      while ((sql_field=it++) && ++proto_field_nr &&
953
 
             my_strcasecmp(system_charset_info,
954
 
                           column->field_name.data(),
955
 
                           sql_field->field_name))
 
951
             system_charset_info->strcasecmp(column->field_name.data(), sql_field->field_name))
956
952
      {
957
 
        field++;
 
953
        field++;
958
954
      }
959
955
 
960
956
      if (!sql_field)
965
961
 
966
962
      while ((dup_column= cols2++) != column)
967
963
      {
968
 
        if (!my_strcasecmp(system_charset_info,
969
 
                           column->field_name.data(), dup_column->field_name.data()))
 
964
        if (!system_charset_info->strcasecmp(column->field_name.data(), dup_column->field_name.data()))
970
965
        {
971
966
          my_printf_error(ER_DUP_FIELDNAME,
972
967
                          ER(ER_DUP_FIELDNAME),MYF(0),
1531
1526
static bool
1532
1527
check_if_keyname_exists(const char *name, KeyInfo *start, KeyInfo *end)
1533
1528
{
1534
 
  for (KeyInfo *key=start ; key != end ; key++)
1535
 
    if (!my_strcasecmp(system_charset_info,name,key->name))
 
1529
  for (KeyInfo *key= start; key != end; key++)
 
1530
  {
 
1531
    if (!system_charset_info->strcasecmp(name, key->name))
1536
1532
      return 1;
 
1533
  }
1537
1534
  return 0;
1538
1535
}
1539
1536