← 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-09 17:33:02 UTC
  • mfrom: (656.1.54 devel)
  • Revision ID: brian@tangent.org-20081209173302-aptngvc7efxnatnt
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/charset.cc
58
58
  unsigned char *state_map;
59
59
  unsigned char *ident_map;
60
60
 
61
 
  if (!(cs->state_map= (unsigned char*) my_once_alloc(256, MYF(MY_WME))))
 
61
  if (!(cs->state_map= (unsigned char*) malloc(256)))
62
62
    return 1;
63
 
 
64
 
  if (!(cs->ident_map= (unsigned char*) my_once_alloc(256, MYF(MY_WME))))
 
63
    
 
64
  if (!(cs->ident_map= (unsigned char*) malloc(256)))
65
65
    return 1;
66
66
 
67
67
  state_map= cs->state_map;
153
153
 
154
154
void *cs_alloc(size_t size)
155
155
{
156
 
  return my_once_alloc(size, MYF(MY_WME));
 
156
  return malloc(size);
157
157
}
158
158
 
159
159