diff options
author | tomas@poseidon.ndb.mysql.com <> | 2005-01-16 20:13:47 +0100 |
---|---|---|
committer | tomas@poseidon.ndb.mysql.com <> | 2005-01-16 20:13:47 +0100 |
commit | c0b21df9eccd3c6b36fd6d64ce2c3b57d3851963 (patch) | |
tree | 03d2815c37cf303913042350d627e132ab1c84b1 /sql-common/client.c | |
parent | 1cb5d98d85dd055c7255b7a77f71dd91760cd14b (diff) | |
parent | fa38a0d130e94d875084edec5c0d5913e98150e1 (diff) | |
download | mariadb-git-c0b21df9eccd3c6b36fd6d64ce2c3b57d3851963.tar.gz |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
Diffstat (limited to 'sql-common/client.c')
-rw-r--r-- | sql-common/client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 8259849cdbe..9dcf6b3e32c 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1424,6 +1424,7 @@ mysql_init(MYSQL *mysql) bzero((char*) (mysql),sizeof(*(mysql))); mysql->options.connect_timeout= CONNECT_TIMEOUT; mysql->last_used_con= mysql->next_slave= mysql->master = mysql; + mysql->charset=default_charset_info; strmov(mysql->net.sqlstate, not_error_sqlstate); /* By default, we are a replication pivot. The caller must reset it |