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

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2017-09-25 22:05:56 +03:00
parent b773270c39 86c3ba65aa
commit 4a32e2395e
140 changed files with 858 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_alloc.h
View File

@@ -27,11 +27,13 @@ class Sql_alloc
public:
static void *operator new(size_t size) throw ()
{
return thd_alloc(thd_get_current_thd(), size);
DBUG_ASSERT(size < UINT_MAX32);
return thd_alloc(thd_get_current_thd(), uint(size));
}
static void *operator new[](size_t size) throw ()
{
return thd_alloc(thd_get_current_thd(), size);
DBUG_ASSERT(size < UINT_MAX32);
return thd_alloc(thd_get_current_thd(), uint(size));
}
static void *operator new[](size_t size, MEM_ROOT *mem_root) throw ()
{ return alloc_root(mem_root, size); }