diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-05-20 18:33:07 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-05-20 18:33:07 +0200 |
| commit | fd713f26f39938e52fe9c17cc946c3ff91c87446 (patch) | |
| tree | 8496d1f8762e5f1f3d30a8819ffed909efa0f0b1 | |
| parent | 4e946cb1f17fbb15c26ff4c0e91f479e618e7a4a (diff) | |
| download | mariadb-git-fd713f26f39938e52fe9c17cc946c3ff91c87446.tar.gz | |
mariadb-conv --character-sets-dir
and pass the correct dir in mtr
| -rw-r--r-- | client/mariadb-conv.cc | 3 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/client/mariadb-conv.cc b/client/mariadb-conv.cc index 27430ff5fd4..1774debe5f9 100644 --- a/client/mariadb-conv.cc +++ b/client/mariadb-conv.cc @@ -70,6 +70,9 @@ static struct my_option long_options[] = {"delimiter", 0, "Treat the specified characters as delimiters.", &opt.m_delimiter, &opt.m_delimiter, 0, GET_STR, REQUIRED_ARG, 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} }; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c1adb76fe0f..60ee1557847 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2121,7 +2121,7 @@ sub environment_setup { $ENV{'EXE_MYSQL'}= $exe_mysql; $ENV{'MYSQL_PLUGIN'}= $exe_mysql_plugin; $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) { $ENV{'MYSQL_INSTALL_DB_EXE'}= mtr_exe_exists("$bindir/sql$opt_vs_config/mysql_install_db", |