database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2023-02-10 12:02:11 +02:00
parent a9eb272f91 cacea31687
commit c41c79650a
277 changed files with 2048 additions and 1500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_explain.h
View File

@ -143,7 +143,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;
};
@ -290,7 +290,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;
};