diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 18:06:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-04 10:33:56 +0200 |
| commit | bc12d5fd4382ad021b77a875d4b7dbd5f2c38d1c (patch) | |
| tree | ed6ce95f6ee9ff57b45c494d10f5a19473237e96 /sql/set_var.cc | |
| parent | e3982cead235e9becb1abdbf0e73876c8a6e6b28 (diff) | |
| download | mariadb-git-bc12d5fd4382ad021b77a875d4b7dbd5f2c38d1c.tar.gz | |
MDEV-6066: Merge new defaults from 5.6 and 5.7
cosmetic fixes. test fixes.
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 3756da562b9..18f6cbc41fd 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -172,13 +172,13 @@ sys_var::sys_var(sys_var_chain *chain, const char *name_arg, option.value= (uchar **)global_var_ptr(); option.def_value= def_val; option.app_type= this; + option.var_type= flags & AUTO_SET ? GET_AUTO : 0; if (chain->last) chain->last->next= this; else chain->first= this; chain->last= this; - fix_auto_flag(); } bool sys_var::update(THD *thd, set_var *var) |