diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-10-28 09:18:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-10-28 12:01:25 +0200 |
| commit | 1203b65849cd1ecefe5f2df07f3165b9aa5e2a9d (patch) | |
| tree | 937e17e1b4c1c3f2706bf6f172b950540141615f /sql/sql_prepare.h | |
| parent | 657bcf928eb1c6a80ee2c82f0dcdd59ab02927e4 (diff) | |
| download | mariadb-git-1203b65849cd1ecefe5f2df07f3165b9aa5e2a9d.tar.gz | |
compilation fixes for sys-devel/gcc-11.2.0:11
for example:
sql/sql_prepare.cc:5714:63: error: 'static void Ed_result_set::operator delete(void*, MEM_ROOT*)' called on pointer returned from a mismatched allocation function [-Werror=mismatched-new-delete]
Diffstat (limited to 'sql/sql_prepare.h')
| -rw-r--r-- | sql/sql_prepare.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_prepare.h b/sql/sql_prepare.h index f1c4e5e4be9..acdaa9a67a7 100644 --- a/sql/sql_prepare.h +++ b/sql/sql_prepare.h @@ -115,7 +115,7 @@ class Ed_row; automatic type conversion. */ -class Ed_result_set: public Sql_alloc +class Ed_result_set { public: operator List<Ed_row>&() { return *m_rows; } @@ -129,6 +129,8 @@ public: size_t get_field_count() const { return m_column_count; } + static void *operator new(size_t size, MEM_ROOT *mem_root) + { return alloc_root(mem_root, size); } static void operator delete(void *ptr, size_t size) throw (); static void operator delete(void *, MEM_ROOT *){} private: |