database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +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

2
sql/sql_prepare.h
View File

@@ -125,7 +125,7 @@ public:
MEM_ROOT *mem_root_arg);
/** We don't call member destructors, they all are POD types. */
~Ed_result_set() {}
~Ed_result_set() = default;
size_t get_field_count() const { return m_column_count; }