← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/charset.c

  • Committer: Stewart Smith
  • Date: 2008-06-30 05:33:25 UTC
  • mfrom: (12.2.8 drizzle)
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: stewart@flamingspork.com-20080630053325-mwrv6bjaufcpvj8n
merge my work

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/charset.c
355
355
  uchar *buf;
356
356
  int  fd;
357
357
  uint len, tmp_len;
358
 
  MY_STAT stat_info;
 
358
  struct stat stat_info;
359
359
  
360
 
  if (!my_stat(filename, &stat_info, MYF(myflags)) ||
 
360
  if (stat(filename, &stat_info) ||
361
361
       ((len= (uint)stat_info.st_size) > MY_MAX_ALLOWED_BUF) ||
362
362
       !(buf= (uchar*) my_malloc(len,myflags)))
363
363
    return TRUE;