From 3f32bf627f00a86b80d8377fc7aeb1e79b7ca917 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Fri, 24 Jun 2016 23:57:27 +0200 Subject: More tests for "MDEV-7563 Support CHECK constraint". Testing non-ASCII string literals. --- sql/set_var.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sql/set_var.cc') diff --git a/sql/set_var.cc b/sql/set_var.cc index 5392a0065ac..b178681e952 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -966,10 +966,8 @@ int set_var_collation_client::check(THD *thd) int set_var_collation_client::update(THD *thd) { - thd->variables.character_set_client= character_set_client; - thd->variables.character_set_results= character_set_results; - thd->variables.collation_connection= collation_connection; - thd->update_charset(); + thd->update_charset(character_set_client, collation_connection, + character_set_results); thd->protocol_text.init(thd); thd->protocol_binary.init(thd); return 0; -- cgit v1.2.1