Commit e1f3149c authored by unknown's avatar unknown
Browse files

A post-merge fix.

parent 60b7f9d6

sql/set_var.h

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ class sys_var_trust_routine_creators :public sys_var_bool_ptr 
  void warn_deprecated(THD *thd);

  void set_default(THD *thd, enum_var_type type);

  bool update(THD *thd, set_var *var);

}

};





class sys_var_thd_lc_time_names :public sys_var_thd