← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/charset.c

  • Committer: Brian Aker
  • Date: 2008-07-18 20:10:26 UTC
  • mfrom: (51.3.29 remove-dbug)
  • Revision ID: brian@tangent.org-20080718201026-tto5golt0xhwqe4a
Merging in Jay's final patch on dbug.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/charset.c
392
392
{
393
393
  const char *sharedir= SHAREDIR;
394
394
  char *res;
395
 
  DBUG_ENTER("get_charsets_dir");
396
395
 
397
396
  if (charsets_dir != NULL)
398
397
    strmake(buf, charsets_dir, FN_REFLEN-1);
406
405
              NullS);
407
406
  }
408
407
  res= convert_dirname(buf,buf,NullS);
409
 
  DBUG_PRINT("info",("charsets dir: '%s'", buf));
410
 
  DBUG_RETURN(res);
 
408
  return(res);
411
409
}
412
410
 
413
411
CHARSET_INFO *all_charsets[256];
593
591
{
594
592
  uint cs_number;
595
593
  CHARSET_INFO *cs;
596
 
  DBUG_ENTER("get_charset_by_csname");
597
 
  DBUG_PRINT("enter",("name: '%s'", cs_name));
598
594
 
599
595
  (void) init_available_charsets(MYF(0));       /* If it isn't initialized */
600
596
 
608
604
    my_error(EE_UNKNOWN_CHARSET, MYF(ME_BELL), cs_name, index_file);
609
605
  }
610
606
 
611
 
  DBUG_RETURN(cs);
 
607
  return(cs);
612
608
}
613
609
 
614
610