diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bug25714.c | 1 | ||||
| -rw-r--r-- | tests/mysql_client_fw.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/bug25714.c b/tests/bug25714.c index 7e6be13624b..b657630f30e 100644 --- a/tests/bug25714.c +++ b/tests/bug25714.c @@ -70,6 +70,7 @@ int main (int argc, char **argv) (long) mysql_insert_id(&conn)); mysql_close(&conn); + mysql_server_end(); my_end(0); return 0; diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c index 990fdb158be..b7211989f1f 100644 --- a/tests/mysql_client_fw.c +++ b/tests/mysql_client_fw.c @@ -67,6 +67,7 @@ static unsigned int opt_drop_db= 1; static const char *opt_basedir= "./"; static const char *opt_vardir= "mysql-test/var"; +static char mysql_charsets_dir[FN_REFLEN+1]; static longlong opt_getopt_ll_test= 0; @@ -1187,6 +1188,9 @@ static struct my_option client_test_long_options[] = { {"basedir", 'b', "Basedir for tests.", &opt_basedir, &opt_basedir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"character-sets-dir", 'C', + "Directory for character set files.", &charsets_dir, + &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"count", 't', "Number of times test to be executed", &opt_count_read, &opt_count_read, 0, GET_UINT, REQUIRED_ARG, 1, 0, 0, 0, 0, 0}, {"database", 'D', "Database to use", &opt_db, &opt_db, @@ -1332,6 +1336,10 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), exit(0); break; } + case 'C': + strmake_buf(mysql_charsets_dir, argument); + charsets_dir = mysql_charsets_dir; + break; case '?': case 'I': /* Info */ usage(); |