1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge 10.6 into 10.8

This commit is contained in:
Marko Mäkelä
2023-02-10 13:43:53 +02:00
299 changed files with 2528 additions and 1655 deletions

View File

@@ -142,7 +142,7 @@ public:
void print_explain_json_for_children(Explain_query *query,
Json_writer *writer, bool is_analyze);
bool print_explain_json_cache(Json_writer *writer, bool is_analyze);
virtual ~Explain_node(){}
virtual ~Explain_node() = default;
};
@@ -289,7 +289,7 @@ class Explain_aggr_node : public Sql_alloc
{
public:
virtual enum_explain_aggr_node_type get_type()= 0;
virtual ~Explain_aggr_node() {}
virtual ~Explain_aggr_node() = default;
Explain_aggr_node *child;
};