← Back to branch summary

~jaypipes/drizzle/item-class-file-reorg

« back to all changes in this revision

Viewing changes to mysys/charset.c

  • Committer: Brian Aker
  • Date: 2008-07-29 07:47:38 UTC
  • mfrom: (212.6.1 bzero-memset)
  • Revision ID: brian@tangent.org-20080729074738-lfzim6htapm42f2o
Merge from Mats

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/charset.c
225
225
      if (!(all_charsets[cs->number]=
226
226
         (CHARSET_INFO*) my_once_alloc(sizeof(CHARSET_INFO),MYF(0))))
227
227
        return MY_XML_ERROR;
228
 
      bzero((void*)all_charsets[cs->number],sizeof(CHARSET_INFO));
 
228
      memset((void*)all_charsets[cs->number], 0, sizeof(CHARSET_INFO));
229
229
    }
230
230
    
231
231
    if (cs->primary_number == cs->number)
441
441
    pthread_mutex_lock(&THR_LOCK_charset);
442
442
    if (!charset_initialized)
443
443
    {
444
 
      bzero(&all_charsets,sizeof(all_charsets));
 
444
      memset(&all_charsets, 0, sizeof(all_charsets));
445
445
      init_compiled_charsets(myflags);
446
446
      
447
447
      /* Copy compiled charsets */