summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorunknown <pem@mysql.comhem.se>2005-05-31 13:12:23 +0200
committerunknown <pem@mysql.comhem.se>2005-05-31 13:12:23 +0200
commitd8b01c1e210c033dd25ead748f07ec06730b62b5 (patch)
treeec4dd42cda2c7fbb843a30ca94bdd0b73d9c8aac /sql/item.cc
parentc50f4be35102ca3466ee06ef64d465279c9c54be (diff)
downloadmariadb-git-d8b01c1e210c033dd25ead748f07ec06730b62b5.tar.gz
Small bug fix in SP item reusal (debug mode only).
sql/item.cc: Get the size before trashing (in debug mode only).
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc
index bf62aa1ddad..52046b8eefb 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -301,10 +301,10 @@ void *Item::operator new(size_t size, Item *reuse, uint *rsize)
{
if (reuse && size <= reuse->rsize)
{
- reuse->cleanup();
- TRASH((void *)reuse, size);
if (rsize)
(*rsize)= reuse->rsize;
+ reuse->cleanup();
+ TRASH((void *)reuse, size);
return (void *)reuse;
}
if (rsize)