← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/charset.cc

  • Committer: Monty Taylor
  • Date: 2008-12-14 19:06:32 UTC
  • mfrom: (673.2.2 strxmov-clean)
  • mto: This revision was merged to the branch mainline in revision 676.
  • Revision ID: monty@inaugust.com-20081214190632-5u3k17j8plmeugga
Merged from Toru.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/charset.cc
132
132
  else
133
133
  {
134
134
    if (test_if_hard_path(sharedir) ||
135
 
        is_prefix(sharedir, DEFAULT_CHARSET_HOME))
136
 
      strxmov(buf, sharedir, "/", CHARSET_DIR, NULL);
 
135
        is_prefix(sharedir, DEFAULT_CHARSET_HOME))
 
136
      sprintf(buf,"%s/%s",sharedir,CHARSET_DIR);
137
137
    else
138
 
      strxmov(buf, DEFAULT_CHARSET_HOME, "/", sharedir, "/", CHARSET_DIR,
139
 
              NULL);
 
138
      sprintf(buf,"%s/%s/%s",DEFAULT_CHARSET_HOME,sharedir,CHARSET_DIR);
140
139
  }
141
140
  res= convert_dirname(buf,buf,NULL);
142
141
  return(res);