← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2009-02-08 21:54:58 UTC
  • Revision ID: brian@tangent.org-20090208215458-37su1x726dto0191
Remove dead code around charset variable/directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
360
360
char *default_tz_name;
361
361
char glob_hostname[FN_REFLEN];
362
362
char drizzle_real_data_home[FN_REFLEN],
363
 
     language[FN_REFLEN], reg_ext[FN_EXTLEN], drizzle_charsets_dir[FN_REFLEN],
364
 
     *opt_init_file, *opt_tc_log_file;
 
363
     language[FN_REFLEN], 
 
364
     reg_ext[FN_EXTLEN],
 
365
     *opt_init_file, 
 
366
     *opt_tc_log_file;
365
367
char drizzle_unpacked_real_data_home[FN_REFLEN];
366
368
uint32_t reg_ext_length;
367
369
const key_map key_map_empty(0);
2434
2436
  OPT_FLUSH,                   OPT_SAFE,
2435
2437
  OPT_STORAGE_ENGINE,          OPT_INIT_FILE,
2436
2438
  OPT_DELAY_KEY_WRITE_ALL,
2437
 
  OPT_DELAY_KEY_WRITE,         OPT_CHARSETS_DIR,
 
2439
  OPT_DELAY_KEY_WRITE,
2438
2440
  OPT_MASTER_INFO_FILE,
2439
2441
  OPT_MASTER_RETRY_COUNT,      OPT_LOG_TC, OPT_LOG_TC_SIZE,
2440
2442
  OPT_WANT_CORE,
2573
2575
   N_("Set the default character set."),
2574
2576
   (char**) &default_character_set_name, (char**) &default_character_set_name,
2575
2577
   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
2576
 
  {"character-sets-dir", OPT_CHARSETS_DIR,
2577
 
   N_("Directory where character sets are."), (char**) &charsets_dir,
2578
 
   (char**) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
2579
2578
  {"chroot", 'r',
2580
2579
   N_("Chroot drizzled daemon during startup."),
2581
2580
   (char**) &drizzled_chroot, (char**) &drizzled_chroot, 0, GET_STR, REQUIRED_ARG,
3322
3321
  drizzle_data_home_len= 2;
3323
3322
 
3324
3323
  /* Variables in libraries */
3325
 
  charsets_dir= 0;
3326
3324
  default_character_set_name= (char*) DRIZZLE_DEFAULT_CHARSET_NAME;
3327
3325
  default_collation_name= compiled_default_collation_name;
3328
3326
  character_set_filesystem_name= (char*) "binary";
3467
3465
      delay_key_write_options= (uint) type-1;
3468
3466
    }
3469
3467
    break;
3470
 
  case OPT_CHARSETS_DIR:
3471
 
    strncpy(drizzle_charsets_dir, argument, sizeof(drizzle_charsets_dir)-1);
3472
 
    charsets_dir = drizzle_charsets_dir;
3473
 
    break;
3474
3468
  case OPT_TX_ISOLATION:
3475
3469
    {
3476
3470
      int type;
3699
3693
                   (MY_RETURN_REAL_PATH|MY_RESOLVE_SYMLINKS));
3700
3694
  (void) unpack_dirname(drizzle_unpacked_real_data_home, buff);
3701
3695
  convert_dirname(language,language,NULL);
3702
 
  (void) my_load_path(drizzle_home,drizzle_home,""); // Resolve current dir
3703
 
  (void) my_load_path(drizzle_real_data_home,drizzle_real_data_home,drizzle_home);
3704
 
  (void) my_load_path(pidfile_name,pidfile_name,drizzle_real_data_home);
 
3696
  (void) my_load_path(drizzle_home, drizzle_home,""); // Resolve current dir
 
3697
  (void) my_load_path(drizzle_real_data_home, drizzle_real_data_home,drizzle_home);
 
3698
  (void) my_load_path(pidfile_name, pidfile_name,drizzle_real_data_home);
3705
3699
  (void) my_load_path(opt_plugin_dir, opt_plugin_dir_ptr ? opt_plugin_dir_ptr :
3706
3700
                                      get_relative_path(PKGPLUGINDIR),
3707
3701
                                      drizzle_home);
3708
3702
  opt_plugin_dir_ptr= opt_plugin_dir;
3709
3703
 
3710
 
  const char *sharedir=get_relative_path(PKGDATADIR);
 
3704
  const char *sharedir= get_relative_path(PKGDATADIR);
3711
3705
  if (test_if_hard_path(sharedir))
3712
3706
    strncpy(buff,sharedir,sizeof(buff)-1);              /* purecov: tested */
3713
3707
  else
3718
3712
  convert_dirname(buff,buff,NULL);
3719
3713
  (void) my_load_path(language,language,buff);
3720
3714
 
3721
 
  /* If --character-sets-dir isn't given, use shared library dir */
3722
 
  if (charsets_dir != drizzle_charsets_dir)
3723
 
  {
3724
 
    strcpy(drizzle_charsets_dir, buff);
3725
 
    strncat(drizzle_charsets_dir, CHARSET_DIR,
3726
 
            sizeof(drizzle_charsets_dir)-strlen(buff)-1);
3727
 
  }
3728
 
  (void) my_load_path(drizzle_charsets_dir, drizzle_charsets_dir, buff);
3729
 
  convert_dirname(drizzle_charsets_dir, drizzle_charsets_dir, NULL);
3730
 
  charsets_dir=drizzle_charsets_dir;
3731
 
 
3732
3715
  {
3733
3716
    char *tmp_string;
3734
3717
    struct stat buf;