after-merge fix: new sys_var_character_set_client classs introduced to perform

separate checking.

1 files changed, 14 insertions, 0 deletions

diff --git a/sql/set_var.h b/sql/set_var.h
index eb2c893c89e..0e282212a3f 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -667,6 +667,20 @@ public:
 };
 
 
+class sys_var_character_set_client: public sys_var_character_set_sv
+{
+public:
+  sys_var_character_set_client(sys_var_chain *chain, const char *name_arg,
+                               CHARSET_INFO *SV::*offset_arg,
+                               CHARSET_INFO **global_default_arg,
+                               bool is_nullable= 0)
+    : sys_var_character_set_sv(chain, name_arg, offset_arg, global_default_arg,
+                               is_nullable)
+  { }
+  bool check(THD *thd, set_var *var);
+};
+
+
 class sys_var_character_set_database :public sys_var_character_set
 {
 public: