Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1

into rurik.mysql.com:/home/igor/mysql-4.1
This commit is contained in:
igor@rurik.mysql.com 2003-12-24 13:26:12 -08:00
commit bca79db52f

View file

@ -5766,8 +5766,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);