Commit fd713f26 authored by Sergei Golubchik's avatar Sergei Golubchik

mariadb-conv --character-sets-dir

and pass the correct dir in mtr
parent 4e946cb1
...@@ -70,6 +70,9 @@ static struct my_option long_options[] = ...@@ -70,6 +70,9 @@ static struct my_option long_options[] =
{"delimiter", 0, "Treat the specified characters as delimiters.", {"delimiter", 0, "Treat the specified characters as delimiters.",
&opt.m_delimiter, &opt.m_delimiter, 0, GET_STR, REQUIRED_ARG, &opt.m_delimiter, &opt.m_delimiter, 0, GET_STR, REQUIRED_ARG,
0, 0, 0, 0, 0, 0}, 0, 0, 0, 0, 0, 0},
{"character-sets-dir", OPT_CHARSETS_DIR,
"Directory for character set files.", &charsets_dir,
&charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
}; };
......
...@@ -2121,7 +2121,7 @@ sub environment_setup { ...@@ -2121,7 +2121,7 @@ sub environment_setup {
$ENV{'EXE_MYSQL'}= $exe_mysql; $ENV{'EXE_MYSQL'}= $exe_mysql;
$ENV{'MYSQL_PLUGIN'}= $exe_mysql_plugin; $ENV{'MYSQL_PLUGIN'}= $exe_mysql_plugin;
$ENV{'MYSQL_EMBEDDED'}= $exe_mysql_embedded; $ENV{'MYSQL_EMBEDDED'}= $exe_mysql_embedded;
$ENV{'MARIADB_CONV'}= $exe_mariadb_conv; $ENV{'MARIADB_CONV'}= "$exe_mariadb_conv --character-sets-dir=$path_charsetsdir";
if(IS_WINDOWS) if(IS_WINDOWS)
{ {
$ENV{'MYSQL_INSTALL_DB_EXE'}= mtr_exe_exists("$bindir/sql$opt_vs_config/mysql_install_db", $ENV{'MYSQL_INSTALL_DB_EXE'}= mtr_exe_exists("$bindir/sql$opt_vs_config/mysql_install_db",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment