← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2008-12-02 16:33:43 UTC
  • mfrom: (632.1.19 devel)
  • Revision ID: brian@tangent.org-20081202163343-007ifg17p0lvjga7
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
128
128
 
129
129
  if (from[0] == '#' && !strncmp(from, MYSQL50_TABLE_NAME_PREFIX,
130
130
                                 MYSQL50_TABLE_NAME_PREFIX_LENGTH))
131
 
    return((uint) (strmake(to, from+MYSQL50_TABLE_NAME_PREFIX_LENGTH,
132
 
                                to_length-1) -
133
 
                        (from + MYSQL50_TABLE_NAME_PREFIX_LENGTH)));
 
131
    return((uint) (strncpy(to, from+MYSQL50_TABLE_NAME_PREFIX_LENGTH,
 
132
                           to_length-1) -
 
133
                           (from + MYSQL50_TABLE_NAME_PREFIX_LENGTH)));
134
134
  length= strconvert(system_charset_info, from,
135
135
                     &my_charset_filename, to, to_length, &errors);
136
136
  if (check_if_legal_tablename(to) &&
950
950
                                                    MY_CS_BINSORT,MYF(0))))
951
951
    {
952
952
      char tmp[64];
953
 
      strmake(strmake(tmp, save_cs->csname, sizeof(tmp)-4),
954
 
              STRING_WITH_LEN("_bin"));
 
953
      char *tmp_pos= tmp;
 
954
      strncpy(tmp_pos, save_cs->csname, sizeof(tmp)-4);
 
955
      tmp_pos+= strlen(tmp);
 
956
      strncpy(tmp_pos, STRING_WITH_LEN("_bin"));
955
957
      my_error(ER_UNKNOWN_COLLATION, MYF(0), tmp);
956
958
      return(true);
957
959
    }
2039
2041
  if (!check_if_keyname_exists(field_name,start,end) &&
2040
2042
      !is_primary_key_name(field_name))
2041
2043
    return (char*) field_name;                  // Use fieldname
2042
 
  buff_end=strmake(buff,field_name, sizeof(buff)-4);
 
2044
 
 
2045
  buff_end= strncpy(buff, field_name, sizeof(buff)-4);
 
2046
  buff_end+= strlen(buff);
2043
2047
 
2044
2048
  /*
2045
2049
    Only 3 chars + '\0' left, so need to limit to 2 digit