diff options
| author | unknown <serg@serg.mylan> | 2004-07-06 16:30:04 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-07-06 16:30:04 +0200 |
| commit | 63af3802e01e9b22cfabbcabf64c7d880877dedf (patch) | |
| tree | 0e86e3fbce3ba4be093e578d8c1f19972731b1c7 /client | |
| parent | 3340c1d7f3c3371d9f93add8c006a1cbeb7e01d1 (diff) | |
| parent | c7586d02cbd9ff6fab1e577c2c4f7c324f98b7e6 (diff) | |
| download | mariadb-git-63af3802e01e9b22cfabbcabf64c7d880877dedf.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
client/mysqltest.c:
Auto merged
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 8747f4f82eb..442f44f434e 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -1568,6 +1568,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) @@ -2632,6 +2633,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, |