Bug #32124 addendum

 Fixed the handling of system variable retrieval
in prepared statements : added a cleanup method
that clears up the cache and restores the 
original scope of the variable (which is overwritten
at fix_fields()).

sql/item_func.cc:
  ug #32124: 
   - preserve the requested variable scope
   - clean up the cache and restore the variable
     scope for prepared statements.
sql/item_func.h:
  Bug #32124: preserve the requested variable scope

1 files changed, 3 insertions, 1 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 778ffd5757f..08906ae826e 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1433,7 +1433,7 @@ public:
 class Item_func_get_system_var :public Item_func
 {
   sys_var *var;
-  enum_var_type var_type;
+  enum_var_type var_type, orig_var_type;
   LEX_STRING component;
   longlong cached_llval;
   double cached_dval;
@@ -1468,6 +1468,8 @@ public:
   */
   bool is_written_to_binlog();
   bool eq(const Item *item, bool binary_cmp) const;
+
+  void cleanup();
 };