database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

compilation fixes for sys-devel/gcc-11.2.0:11

Browse Source 
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]
This commit is contained in:
Sergei Golubchik
2021-10-28 09:18:22 +02:00
parent 657bcf928e
commit 1203b65849
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_cursor.h
View File

@ -39,7 +39,7 @@ class JOIN;
its base class. its base class.
*/ */
class Server_side_cursor: protected Query_arena, public Sql_alloc class Server_side_cursor: protected Query_arena
{ {
protected: protected:
/** Row destination used for fetch */ /** Row destination used for fetch */
@ -61,6 +61,8 @@ public:
} }
virtual ~Server_side_cursor(); virtual ~Server_side_cursor();
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); static void operator delete(void *ptr, size_t size);
static void operator delete(void *, MEM_ROOT *){} static void operator delete(void *, MEM_ROOT *){}
}; };

4
sql/sql_prepare.h
View File

@ -115,7 +115,7 @@ class Ed_row;
automatic type conversion. automatic type conversion.
*/ */
class Ed_result_set: public Sql_alloc class Ed_result_set
{ {
public: public:
operator List<Ed_row>&() { return *m_rows; } operator List<Ed_row>&() { return *m_rows; }
@ -129,6 +129,8 @@ public:
size_t get_field_count() const { return m_column_count; } 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 *ptr, size_t size) throw ();
static void operator delete(void *, MEM_ROOT *){} static void operator delete(void *, MEM_ROOT *){}
private: private: