mirror of
https://github.com/MariaDB/server.git
synced 2026-04-20 15:25:33 +02:00
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
This commit is contained in:
commit
49a492075a
1 changed files with 1 additions and 0 deletions
|
|
@ -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))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue