From 72e7f011b29998d8a3e15eb5b381ef962af5fe5b Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 5 Apr 2019 10:30:58 +0300 Subject: Upgrade to 8.0.15 --- mysql/sql/sql_alloc.h | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 mysql/sql/sql_alloc.h (limited to 'mysql/sql/sql_alloc.h') diff --git a/mysql/sql/sql_alloc.h b/mysql/sql/sql_alloc.h deleted file mode 100644 index 629dfe1..0000000 --- a/mysql/sql/sql_alloc.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef SQL_ALLOC_INCLUDED -#define SQL_ALLOC_INCLUDED -/* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ - -#include "my_sys.h" // TRASH -#include "thr_malloc.h" // alloc_root - -/** - MySQL standard memory allocator class. You have to inherit the class - in order to use it. -*/ -class Sql_alloc -{ -public: - static void *operator new(size_t size) throw () - { - return sql_alloc(size); - } - static void *operator new[](size_t size) throw () - { - return sql_alloc(size); - } - static void *operator new[](size_t size, MEM_ROOT *mem_root) throw () - { return alloc_root(mem_root, size); } - static void *operator new(size_t size, MEM_ROOT *mem_root) throw () - { return alloc_root(mem_root, size); } - static void operator delete(void *ptr, size_t size) { TRASH(ptr, size); } - static void operator delete(void *ptr, MEM_ROOT *mem_root) - { /* never called */ } - static void operator delete[](void *ptr, MEM_ROOT *mem_root) - { /* never called */ } - static void operator delete[](void *ptr, size_t size) { TRASH(ptr, size); } - - inline Sql_alloc() {} - inline ~Sql_alloc() {} -}; - -#endif // SQL_ALLOC_INCLUDED -- cgit v1.1