← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/discover_ms.cc

  • Committer: Olaf van der Spek
  • Date: 2011-07-07 13:41:07 UTC
  • mto: This revision was merged to the branch mainline in revision 2385.
  • Revision ID: olafvdspek@gmail.com-20110707134107-6mi7pauiatxtf4oe
Rename strmake to strdup (standard name)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/discover_ms.cc
136
136
  if (!check_if_keyname_exists(field_name,start,end) &&
137
137
      my_strcasecmp(system_charset_info,field_name,primary_key_name))
138
138
    return (char*) field_name;                  // Use fieldname
139
 
  buff_end=strmake(buff,field_name, sizeof(buff)-4);
 
139
  buff_end=strdup(buff,field_name, sizeof(buff)-4);
140
140
 
141
141
  /*
142
142
    Only 3 chars + '\0' left, so need to limit to 2 digit
249
249
                                                    MY_CS_BINSORT,MYF(0))))
250
250
    {
251
251
      char tmp[64];
252
 
      strmake(strmake(tmp, save_cs->csname, sizeof(tmp)-4),
253
 
              STRING_WITH_LEN("_bin"));
 
252
      strdup(strdup(tmp, save_cs->csname, sizeof(tmp)-4), STRING_WITH_LEN("_bin"));
254
253
      my_error(ER_UNKNOWN_COLLATION, MYF(0), tmp);
255
254
      DBUG_RETURN(TRUE);
256
255
    }
321
320
          {
322
321
            uint cnv_errs;
323
322
            conv.copy(tmp->ptr(), tmp->length(), tmp->charset(), cs, &cnv_errs);
324
 
            interval->type_names[i]= strmake(thd->mem_root, conv.ptr(),
 
323
            interval->type_names[i]= strdup(thd->mem_root, conv.ptr(),
325
324
                                                  conv.length());
326
325
            interval->type_lengths[i]= conv.length();
327
326
          }