diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-05 15:03:48 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-05 15:06:44 +0300 |
| commit | d3dcec5d657b83ca08b32f5a64b5dff01edfb13e (patch) | |
| tree | 5fd801aa0daf5e74689b17ed50a086a8acd7d6e7 /sql/set_var.h | |
| parent | b132b8895e2e59df457e063451f186b53576b034 (diff) | |
| parent | e8dd18a474ee6b48eb7f92e3831f9e359b0bdc6e (diff) | |
| download | mariadb-git-d3dcec5d657b83ca08b32f5a64b5dff01edfb13e.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 8a82e07fd6b..5f9720f0d5a 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -407,7 +407,8 @@ extern SHOW_COMP_OPTION have_openssl; SHOW_VAR* enumerate_sys_vars(THD *thd, bool sorted, enum enum_var_type type); int fill_sysvars(THD *thd, TABLE_LIST *tables, COND *cond); -sys_var *find_sys_var(THD *thd, const char *str, size_t length=0); +sys_var *find_sys_var(THD *thd, const char *str, size_t length= 0, + bool throw_error= false); int sql_set_variables(THD *thd, List<set_var_base> *var_list, bool free); #define SYSVAR_AUTOSIZE(VAR,VAL) \ |