Commit 49a49207 authored by unknown's avatar unknown
Browse files

Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  selena.:H:/MYSQL/src/#14137-mysql-5.0


sql/mysqld.cc:
  Auto merged
parents 41985b5c bc2961dc

sql/mysqld.cc

+1 −0
Original line number Diff line number Diff line
@@ -7155,6 +7155,7 @@ static void fix_paths(void) 
	     CHARSET_DIR, NullS);

  }

  (void) my_load_path(mysql_charsets_dir, mysql_charsets_dir, buff);

  convert_dirname(mysql_charsets_dir, mysql_charsets_dir, NullS);

  charsets_dir=mysql_charsets_dir;



  if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir))