diff options
| author | bar@mysql.com <> | 2004-07-06 17:18:04 +0500 |
|---|---|---|
| committer | bar@mysql.com <> | 2004-07-06 17:18:04 +0500 |
| commit | 1bc5370cfffa01ac90fb1b1a575b3751fc64ac56 (patch) | |
| tree | 7db73dcd38954f379b4867e570a535dc49d6ffe6 /client | |
| parent | 30a86a0be9f1fc3dd8836a1524e446a54ba441c6 (diff) | |
| download | mariadb-git-1bc5370cfffa01ac90fb1b1a575b3751fc64ac56.tar.gz | |
mysqltest.c:
Bug #4338 mysql-test-run fails if compiled with non-latin1 character set.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 3 |
1 files changed, 3 insertions, 0 deletions
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, |