Merge rurik.mysql.com:/home/igor/mysql-4.1

into rurik.mysql.com:/home/igor/dev/mysql-4.1-2
This commit is contained in:
unknown 2003-12-13 17:36:03 -08:00
commit 4463200308

View file

@ -5772,8 +5772,9 @@ static void fix_paths(void)
{
strxnmov(mysql_charsets_dir, sizeof(mysql_charsets_dir)-1, buff,
CHARSET_DIR, NullS);
charsets_dir=mysql_charsets_dir;
}
(void) my_load_path(mysql_charsets_dir, mysql_charsets_dir, buff);
charsets_dir=mysql_charsets_dir;
if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir))
exit(1);