diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 11:38:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 11:38:21 +0300 |
| commit | 4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a (patch) | |
| tree | c8b327da16aa30bc5a26bfa31a2563af1c6f4976 /sql/sys_vars.cc | |
| parent | ff77a09bda884fe6bf3917eb29b9d3a2f53f919b (diff) | |
| parent | 2bb8d7c2f36439ab6a3944476665eb1218c36f5c (diff) | |
| download | mariadb-git-4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index f873fd224fc..86d02fe11c5 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -1095,7 +1095,9 @@ static Sys_var_ulong Sys_flush_time( static bool check_ftb_syntax(sys_var *self, THD *thd, set_var *var) { return ft_boolean_check_syntax_string((uchar*) - (var->save_result.string_value.str)); + (var->save_result.string_value.str), + var->save_result.string_value.length, + self->charset(thd)); } static bool query_cache_flush(sys_var *self, THD *thd, enum_var_type type) { |