From b5f66b02a43f45d1478f01d5e172578785c88fea Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Jul 2004 17:18:04 +0500 Subject: [PATCH] mysqltest.c: Bug #4338 mysql-test-run fails if compiled with non-latin1 character set. client/mysqltest.c: Bug #4338 mysql-test-run fails if compiled with non-latin1 character set. --- client/mysqltest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/mysqltest.c b/client/mysqltest.c index 5ba4ad7336c..f0d2eb0aded 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1628,6 +1628,7 @@ int do_connect(struct st_query* q) if (opt_compress) mysql_options(&next_con->mysql,MYSQL_OPT_COMPRESS,NullS); mysql_options(&next_con->mysql, MYSQL_OPT_LOCAL_INFILE, 0); + mysql_options(&next_con->mysql, MYSQL_SET_CHARSET_NAME, "latin1"); #ifdef HAVE_OPENSSL if (opt_use_ssl) @@ -2692,6 +2693,8 @@ int main(int argc, char **argv) if (opt_compress) mysql_options(&cur_con->mysql,MYSQL_OPT_COMPRESS,NullS); mysql_options(&cur_con->mysql, MYSQL_OPT_LOCAL_INFILE, 0); + mysql_options(&cur_con->mysql, MYSQL_SET_CHARSET_NAME, "latin1"); + #ifdef HAVE_OPENSSL if (opt_use_ssl) mysql_ssl_set(&cur_con->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,