diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-01 21:55:30 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-02 10:09:44 +0100 |
| commit | d4df7bc9b1fbdfb5c98134091a9ff998af60954f (patch) | |
| tree | dfd2f5128ccf94b6e86d2475aee23acf53fa868c /sql/sql_lex.h | |
| parent | 80d3eee072025f34984e474ea160651eac9e11e5 (diff) | |
| parent | 96cb428b350ba48ee17ad9968d08f5318e48258c (diff) | |
| download | mariadb-git-d4df7bc9b1fbdfb5c98134091a9ff998af60954f.tar.gz | |
Merge branch 'github/10.0' into 10.1
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 292f3d6d90f..4fcd090e1f5 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. - Copyright (c) 2010, 2016, MariaDB + Copyright (c) 2010, 2018, MariaDB Corporation 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 @@ -502,7 +502,7 @@ public: } static void *operator new(size_t size, MEM_ROOT *mem_root) throw () { return (void*) alloc_root(mem_root, (uint) size); } - static void operator delete(void *ptr,size_t size) { TRASH(ptr, size); } + static void operator delete(void *ptr,size_t size) { TRASH_FREE(ptr, size); } static void operator delete(void *ptr, MEM_ROOT *mem_root) {} // Ensures that at least all members used during cleanup() are initialized. |