diff options
| author | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-08-24 11:15:08 -0400 |
|---|---|---|
| committer | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-08-24 11:15:08 -0400 |
| commit | 689fae640659759d9ea8c48793c39214c3751efc (patch) | |
| tree | 4c36dfd480b2ac7dc0f6d6229f905deb4502117e /mysql-test/r/mysql.result | |
| parent | 734a4c55ada2513217aad574039923ff39611c46 (diff) | |
| download | mariadb-git-689fae640659759d9ea8c48793c39214c3751efc.tar.gz | |
Bug #11972: client uses wrong character set after reconnect.
The mysql client uses the default character set on reconnect. The default character set is now controled by the client charset command while the client is running. The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.
client/mysql.cc:
Client charset command now changes the default character set and issues a SET NAMES command to the server.
mysql-test/r/mysql.result:
Corrected results for new behaviour.
mysql-test/t/mysql.test:
Removed redundant commands from test.
Diffstat (limited to 'mysql-test/r/mysql.result')
| -rw-r--r-- | mysql-test/r/mysql.result | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index ba4e9daf7cb..99633f5e12a 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -59,16 +59,16 @@ database() test unlock tables; drop table t1; -ソ -ソ +ƒ\ +ƒ\ c_cp932 +ƒ\ +ƒ\ +ƒ\ ソ ソ -ソ -ソ -ソ -ソ -ソ +ƒ\ +ƒ\ +----------------------+------------+--------+ | concat('>',col1,'<') | col2 | col3 | +----------------------+------------+--------+ |