diff options
| author | Alexander Barkov <bar@mariadb.org> | 2018-02-08 19:06:25 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2018-02-08 19:06:25 +0400 |
| commit | 3cad31f2a758f797ef0acac5625d0e007ecbce93 (patch) | |
| tree | 73c054636c4858b2a51eddf7eaa653746d67524e /sql/sql_cursor.cc | |
| parent | 560b9895d413bdfedda0a0ca871a635858990c05 (diff) | |
| parent | 5c057b3fef3aa92cfadbd63043799b430132a494 (diff) | |
| download | mariadb-git-3cad31f2a758f797ef0acac5625d0e007ecbce93.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_cursor.cc')
| -rw-r--r-- | sql/sql_cursor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_cursor.cc b/sql/sql_cursor.cc index 40eb7046108..99d95c86b2f 100644 --- a/sql/sql_cursor.cc +++ b/sql/sql_cursor.cc @@ -215,7 +215,7 @@ void Server_side_cursor::operator delete(void *ptr, size_t size) MEM_ROOT own_root= *cursor->mem_root; DBUG_ENTER("Server_side_cursor::operator delete"); - TRASH(ptr, size); + TRASH_FREE(ptr, size); /* If this cursor has never been opened mem_root is empty. Otherwise mem_root points to the memory the cursor object was allocated in. |