diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-11 09:05:36 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-10 06:30:42 -0500 |
| commit | f8aa54f1bcf285895c69371399bd5f72904ef908 (patch) | |
| tree | fb8bfcf401aee91875e059d2a9d8fbef50256760 /sql/sys_vars.ic | |
| parent | eaf9c4b54f106d5c4046677c3c17bcb9f81aca17 (diff) | |
| download | mariadb-git-f8aa54f1bcf285895c69371399bd5f72904ef908.tar.gz | |
MDEV-11685: sql_mode can't be set with non-ascii connection charset
The supplied sql_mode(s) should be converted to ASCII first,
before comparing it with the sql_mode set.
Diffstat (limited to 'sql/sys_vars.ic')
| -rw-r--r-- | sql/sys_vars.ic | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.ic b/sql/sys_vars.ic index c7f148afd39..780450b484b 100644 --- a/sql/sys_vars.ic +++ b/sql/sys_vars.ic @@ -1347,7 +1347,7 @@ public: if (var->value->result_type() == STRING_RESULT) { - if (!(res=var->value->val_str(&str))) + if (!(res=var->value->val_str_ascii(&str))) return true; else { |