diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-04 10:30:45 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-04 10:30:45 +0200 |
commit | daf4fa5238a67fcf47075721d86d4348adab687b (patch) | |
tree | fff85b8f2e11607c93d806e787475ad82f5055f6 /sql/set_var.h | |
parent | 756568f26c6a23c537f4d93ff00f485c6291c92e (diff) | |
parent | 7dfaded9625e832fade4ef1678bcb21c445dad2b (diff) | |
download | mariadb-git-st-10.8-merge.tar.gz |
Merge 10.7 into 10.8st-10.8-merge
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 2d538624825..611f16e8bbb 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -450,7 +450,8 @@ int sql_set_variables(THD *thd, List<set_var_base> *var_list, bool free); } \ } while(0) -void set_sys_var_value_origin(void *ptr, enum sys_var::where here); +void set_sys_var_value_origin(void *ptr, enum sys_var::where here, + const char *filename= NULL); enum sys_var::where get_sys_var_value_origin(void *ptr); inline bool IS_SYSVAR_AUTOSIZE(void *ptr) |