diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-01-16 20:13:47 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-01-16 20:13:47 +0100 |
| commit | 542f13cfe2b253347281658933394a5fb527722c (patch) | |
| tree | 03d2815c37cf303913042350d627e132ab1c84b1 /sql-common | |
| parent | f33566b55f7537d7d4e05be4fac722fffa4ce612 (diff) | |
| parent | 3c45559db8e6185afcf0c19cb493bebf4e444b5a (diff) | |
| download | mariadb-git-542f13cfe2b253347281658933394a5fb527722c.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
client/mysql.cc:
Auto merged
myisam/mi_open.c:
Auto merged
sql-common/client.c:
Auto merged
Diffstat (limited to 'sql-common')
| -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 |