← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/charset.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:
mysys/charset.cc
128
128
  char *res;
129
129
 
130
130
  if (charsets_dir != NULL)
131
 
    strmake(buf, charsets_dir, FN_REFLEN-1);
 
131
    strncpy(buf, charsets_dir, FN_REFLEN-1);
132
132
  else
133
133
  {
134
134
    if (test_if_hard_path(sharedir) ||
151
151
  cs->state|= MY_CS_AVAILABLE;
152
152
}
153
153
 
154
 
static void *cs_alloc(size_t size)
 
154
void *cs_alloc(size_t size)
155
155
{
156
156
  return my_once_alloc(size, MYF(MY_WME));
157
157
}