diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-12-27 21:39:05 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-12-27 21:39:05 -0500 |
| commit | 901f7ebcf3aa45c99f82e655a8482c50f10b840e (patch) | |
| tree | 091845fdaadfeb3dbafaca03acec1fdeeffefead /sql/sys_vars.cc | |
| parent | 5ddd8149e44122feb0989b9944113d2b92d6f84a (diff) | |
| parent | ec6d8dadc01269451332e5b24b12a5350a2a4896 (diff) | |
| download | mariadb-git-901f7ebcf3aa45c99f82e655a8482c50f10b840e.tar.gz | |
Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index e0de7960ec9..581a5f18746 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -31,6 +31,7 @@ #include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */ #include "sql_priv.h" #include "sql_class.h" // set_var.h: THD +#include "sql_parse.h" #include "sys_vars.h" #include "events.h" @@ -466,7 +467,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; |