summaryrefslogtreecommitdiff
path: root/sql/sys_vars.cc
diff options
context:
space:
mode:
authorvicentiu <vicentiu@mariadb.org>2017-01-06 17:09:59 +0200
committervicentiu <vicentiu@mariadb.org>2017-01-06 17:09:59 +0200
commite9aed131ead9e102c8948ebadc421960399722d4 (patch)
treeae8f4ee4ee7f7e915121ff2c73c88c20781c45ed /sql/sys_vars.cc
parente4978d26b79120c58706e57fc66e4de1ec4b230c (diff)
parentae1b3d1991b679bb38095711de27934d7683deda (diff)
downloadmariadb-git-e9aed131ead9e102c8948ebadc421960399722d4.tar.gz
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'sql/sys_vars.cc')
-rw-r--r--sql/sys_vars.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 089b6cd9c7e..4adc19231bc 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -34,6 +34,7 @@
#include "sql_plugin.h" // Includes my_global.h
#include "sql_priv.h"
#include "sql_class.h" // set_var.h: THD
+#include "sql_parse.h"
#include "sys_vars.h"
#include "events.h"
@@ -613,7 +614,7 @@ static bool check_cs_client(sys_var *self, THD *thd, set_var *var)
return true;
// Currently, UCS-2 cannot be used as a client character set
- if (((CHARSET_INFO *)(var->save_result.ptr))->mbminlen > 1)
+ if (!is_supported_parser_charset((CHARSET_INFO *)(var->save_result.ptr)))
return true;
return false;