Auto-merged.

1 files changed, 2 insertions, 3 deletions

diff --git a/sql/set_var.h b/sql/set_var.h
index 5f1f889c4ce..ece3b80edb4 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -92,10 +92,9 @@ public:
           on_check_function on_check_func, on_update_function on_update_func,
           uint deprecated_version, const char *substitute, int parse_flag);
   /**
-    The instance should only be destroyed on shutdown, as it doesn't unlink
-    itself from the chain.
+    All the cleanup procedures should be performed here
   */
-  virtual ~sys_var() {}
+  virtual void cleanup() {}
   /**
     downcast for sys_var_pluginvar. Returns this if it's an instance
     of sys_var_pluginvar, and 0 otherwise.