← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merge from Monty's tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
4778
4778
  char tmp_path[FN_REFLEN];
4779
4779
  if (!test_if_hard_path(dir))
4780
4780
  {
4781
 
    strxnmov(tmp_path,sizeof(tmp_path)-1, mysql_real_data_home,
4782
 
             dir, NULL);
 
4781
    strcpy(tmp_path, mysql_real_data_home);
 
4782
    strncat(tmp_path, dir, sizeof(tmp_path)-strlen(mysql_real_data_home)-1);
4783
4783
    dir=tmp_path;
4784
4784
  }
4785
4785
  return !fn_format(to, name, dir, extension,
4814
4814
 
4815
4815
  char *sharedir=get_relative_path(SHAREDIR);
4816
4816
  if (test_if_hard_path(sharedir))
4817
 
    strmake(buff,sharedir,sizeof(buff)-1);              /* purecov: tested */
 
4817
    strncpy(buff,sharedir,sizeof(buff)-1);              /* purecov: tested */
4818
4818
  else
4819
 
    strxnmov(buff,sizeof(buff)-1,mysql_home,sharedir,NULL);
 
4819
  {
 
4820
    strcpy(buff, mysql_home);
 
4821
    strncat(buff, sharedir, sizeof(buff)-strlen(mysql_home)-1);
 
4822
  }
4820
4823
  convert_dirname(buff,buff,NULL);
4821
4824
  (void) my_load_path(language,language,buff);
4822
4825
 
4823
4826
  /* If --character-sets-dir isn't given, use shared library dir */
4824
4827
  if (charsets_dir != mysql_charsets_dir)
4825
4828
  {
4826
 
    strxnmov(mysql_charsets_dir, sizeof(mysql_charsets_dir)-1, buff,
4827
 
             CHARSET_DIR, NULL);
 
4829
    strcpy(mysql_charsets_dir, buff);
 
4830
    strncat(mysql_charsets_dir, CHARSET_DIR,
 
4831
            sizeof(mysql_charsets_dir)-strlen(buff)-1);
4828
4832
  }
4829
4833
  (void) my_load_path(mysql_charsets_dir, mysql_charsets_dir, buff);
4830
4834
  convert_dirname(mysql_charsets_dir, mysql_charsets_dir, NULL);