set_var.cc, set_var.h:

  New thread variable client_character_set


sql/set_var.h:
  New thread variable client_character_set
sql/set_var.cc:
  New thread variable client_character_set

1 files changed, 17 insertions, 0 deletions

diff --git a/sql/set_var.h b/sql/set_var.h
index 3b4ec9d5bfe..d80285d0e40 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -423,6 +423,22 @@ public:
   bool check_default(enum_var_type type) { return 0; }
 };
 
+class sys_var_thd_client_charset :public sys_var_thd
+{
+public:
+  sys_var_thd_client_charset(const char *name_arg) :sys_var_thd(name_arg)
+  {}
+  bool check(THD *thd, set_var *var);
+  bool update(THD *thd, set_var *var);
+  SHOW_TYPE type() { return SHOW_CHAR; }
+  byte *value_ptr(THD *thd, enum_var_type type);
+  bool check_update_type(Item_result type)
+  {
+    return type != STRING_RESULT;		/* Only accept strings */
+  }
+  bool check_default(enum_var_type type) { return 0; }
+};
+
 
 /* Variable that you can only read from */
 
@@ -473,6 +489,7 @@ public:
   enum_var_type type;
   union
   {
+    CHARSET_INFO *charset;
     CONVERT *convert;
     ulong ulong_value;
   } save_result;