diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-06-24 23:57:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-30 11:43:02 +0200 |
| commit | 3f32bf627f00a86b80d8377fc7aeb1e79b7ca917 (patch) | |
| tree | e1cb2e030db015f56fe59f41bee6481de5c6f31d /sql/set_var.cc | |
| parent | 11debf698f0fabd7b59f60191857a2c2cf16a7de (diff) | |
| download | mariadb-git-3f32bf627f00a86b80d8377fc7aeb1e79b7ca917.tar.gz | |
More tests for "MDEV-7563 Support CHECK constraint".
Testing non-ASCII string literals.
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 6 |
1 files changed, 2 insertions, 4 deletions
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; |