Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into selena.:H:/MYSQL/src/#14137-mysql-5.0
This commit is contained in:
commit
0eacb6fb35
@ -7155,6 +7155,7 @@ static void fix_paths(void)
|
|||||||
CHARSET_DIR, NullS);
|
CHARSET_DIR, NullS);
|
||||||
}
|
}
|
||||||
(void) my_load_path(mysql_charsets_dir, mysql_charsets_dir, buff);
|
(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;
|
charsets_dir=mysql_charsets_dir;
|
||||||
|
|
||||||
if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir))
|
if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user