summaryrefslogtreecommitdiff
path: root/mysql-test/r/reset_connection.result
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2019-02-02 10:02:03 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2019-02-02 17:32:15 +0100
commit261ce5286f266f1a5fab5e8adc2c08adef658d13 (patch)
tree8f74ae3a7b7e4aed0b1f106082e98d66ad659774 /mysql-test/r/reset_connection.result
parent915ed7e614383093d688db6b4fd8bc7b948e1b70 (diff)
downloadmariadb-git-261ce5286f266f1a5fab5e8adc2c08adef658d13.tar.gz
MDEV-18281 COM_RESET_CONNECTION changes the connection encoding
Store original charset during client authentication, and restore it for COM_RESET_CONNECTION
Diffstat (limited to 'mysql-test/r/reset_connection.result')
-rw-r--r--mysql-test/r/reset_connection.result20
1 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/reset_connection.result b/mysql-test/r/reset_connection.result
index 925195f704e..54f6ffdbd25 100644
--- a/mysql-test/r/reset_connection.result
+++ b/mysql-test/r/reset_connection.result
@@ -5,3 +5,23 @@ Com_select 10
SHOW local STATUS LIKE 'com_select';
Variable_name Value
Com_select 0
+# Test if charset changes after reset (utf8)
+connect utf8_conn,localhost,root,,,,,CHARSET=utf8;
+connection utf8_conn;
+SELECT IF(@@character_set_client='utf8','OK', 'FAIL') AS RESULT;
+RESULT
+OK
+SELECT IF(@@character_set_client='utf8','OK', 'FAIL') AS RESULT;
+RESULT
+OK
+disconnect utf8_conn;
+# Test if charset changes after reset (latin1)
+connect latin1_conn,localhost,root,,,,,CHARSET=latin1;
+connection latin1_conn;
+SELECT IF(@@character_set_client='latin1','OK', 'FAIL') AS RESULT;
+RESULT
+OK
+SELECT IF(@@character_set_client='latin1','OK', 'FAIL') AS RESULT;
+RESULT
+OK
+disconnect latin1_conn;