diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-10-31 10:34:19 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-10-31 10:34:19 +0100 |
| commit | 2b7007803ef62d9ccb9558ea2f0d3801dd53374b (patch) | |
| tree | d80e8a59a3ff542c63f77ec5931e7b6fea7d3974 /sql/sql_prepare.h | |
| parent | f5ecaf232e06392e91ba2fd914d69386059f02a5 (diff) | |
| parent | c1adc4d078672c4b85018b8c5b71dcb68489a72e (diff) | |
| download | mariadb-git-2b7007803ef62d9ccb9558ea2f0d3801dd53374b.tar.gz | |
Merge branch '10.6' into 10.7
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 d4a03c433b2..1a96df85a19 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: |