Bug#29363867: LOST CONNECTION TO MYSQL SERVER DURING QUERY

Tor Didriksen · Tor Didriksen · commit 56b09e45ea4f · 2021-03-02T18:13:02.000+01:00
Note: this patch is for 5.7.

Post-push fix for broken /opt/developerstudio12.5/bin/CC
Internal compiler assert when CTOR initializes const class members.
So make them non-const, and initialize in CTOR body instead.

Change-Id: I8c0b3e8b581b68a5aa7713c8b529f77f7a0b51d4
diff --git a/sql/set_var.cc b/sql/set_var.cc
@@ -311,10 +311,11 @@ bool sys_var::set_default(THD *thd, set_var* var)
 }
 
 Sys_var_tracker::Sys_var_tracker(sys_var *var)
-    : m_is_dynamic(var->cast_pluginvar() != NULL),
-      m_name(m_is_dynamic ? current_thd->strmake(var->name) : var->name),
-      m_var(m_is_dynamic ? NULL : var)
-{}
+{
+  m_is_dynamic = (var->cast_pluginvar() != NULL);
+  m_name = (m_is_dynamic ? current_thd->strmake(var->name) : var->name);
+  m_var = (m_is_dynamic ? NULL : var);
+}
 
 sys_var *Sys_var_tracker::bind_system_variable(THD *thd) {
   if (!m_is_dynamic ||                                               // (1)
diff --git a/sql/set_var.h b/sql/set_var.h
@@ -255,8 +255,8 @@ class Sys_var_tracker
   bool is_sys_var(sys_var *x) const { return m_var == x; }
 
 private:
-  const bool m_is_dynamic;   ///< true if dynamic variable
-  const LEX_CSTRING m_name;  ///< variable name
+  bool m_is_dynamic;   ///< true if dynamic variable
+  LEX_CSTRING m_name;  ///< variable name
 
   sys_var *m_var;  ///< variable pointer
 };
