diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-25 22:05:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-25 22:05:56 +0300 |
| commit | 4a32e2395e1ff6cf7274d0567282b1747031108b (patch) | |
| tree | f20565057eebcd25fda9292e66695bbf8a409f41 /sql/sql_alloc.h | |
| parent | b773270c397a97425abc506e7d7fbc5fedb99d9c (diff) | |
| parent | 86c3ba65aa39e1e81c52f3455a1bcf187906dffc (diff) | |
| download | mariadb-git-4a32e2395e1ff6cf7274d0567282b1747031108b.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_alloc.h')
| -rw-r--r-- | sql/sql_alloc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_alloc.h b/sql/sql_alloc.h index 36fe665c475..4db12964f0a 100644 --- a/sql/sql_alloc.h +++ b/sql/sql_alloc.h @@ -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); } |