From 2936fb127d551a1abd6f30bdfd50a8a9bcf4e41b Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Mon, 6 Apr 2015 18:54:08 +0300 Subject: [PATCH] MDEV-7919: main.explain_json* fail in buildbot with valgrind Correctly initialize Explain_node::connection_type, remove unused Explain_node constructor. --- sql/sql_explain.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/sql_explain.h b/sql/sql_explain.h index 97a04573361..c93b00747ea 100644 --- a/sql/sql_explain.h +++ b/sql/sql_explain.h @@ -160,8 +160,9 @@ class Explain_query; class Explain_node : public Sql_alloc { public: - Explain_node(MEM_ROOT *root) - :children(root) + Explain_node(MEM_ROOT *root) : + connection_type(EXPLAIN_NODE_OTHER), + children(root) {} /* A type specifying what kind of node this is */ enum explain_node_type @@ -181,7 +182,6 @@ public: EXPLAIN_NODE_NON_MERGED_SJ /* aka JTBM semi-join */ }; - Explain_node() : connection_type(EXPLAIN_NODE_OTHER) {} virtual enum explain_node_type get_type()= 0; virtual int get_select_id()= 0;