database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-10-29 10:21:52 +02:00
parent a8ded39557 e10838268e
commit 1c1396f09c
10 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_prepare.h
View File

@ -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: