From bc12d5fd4382ad021b77a875d4b7dbd5f2c38d1c Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 3 Sep 2015 18:06:55 +0200
Subject: MDEV-6066: Merge new defaults from 5.6 and 5.7

cosmetic fixes. test fixes.
---
 sql/set_var.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/set_var.cc')

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)
-- 
cgit v1.2.1