summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2016-06-24 23:57:27 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-30 11:43:02 +0200
commit3f32bf627f00a86b80d8377fc7aeb1e79b7ca917 (patch)
treee1cb2e030db015f56fe59f41bee6481de5c6f31d /sql/sql_acl.cc
parent11debf698f0fabd7b59f60191857a2c2cf16a7de (diff)
downloadmariadb-git-3f32bf627f00a86b80d8377fc7aeb1e79b7ca917.tar.gz
More tests for "MDEV-7563 Support CHECK constraint".
Testing non-ASCII string literals.
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r--sql/sql_acl.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 91f337fa713..fde894c0cf6 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -11774,7 +11774,6 @@ static bool parse_com_change_user_packet(MPVIO_EXT *mpvio, uint packet_length)
{
if (thd_init_client_charset(thd, uint2korr(next_field)))
DBUG_RETURN(1);
- thd->update_charset();
next_field+= 2;
}
@@ -11940,7 +11939,6 @@ static ulong parse_client_handshake_packet(MPVIO_EXT *mpvio,
DBUG_PRINT("info", ("client_character_set: %d", (uint) net->read_pos[8]));
if (thd_init_client_charset(thd, (uint) net->read_pos[8]))
return packet_error;
- thd->update_charset();
end= (char*) net->read_pos+32;
}
else