summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-05-26 00:18:24 +0300
committerunknown <monty@mysql.com>2005-05-26 00:18:24 +0300
commit865b8917d68d806a30f1f420e23d5ed9549841e2 (patch)
treeb627cbb065f4b71892deaf1d32879fb4197c576e /sql/item.h
parent5ec889c798aff4c0368f646162f569697d818657 (diff)
downloadmariadb-git-865b8917d68d806a30f1f420e23d5ed9549841e2.tar.gz
Move function from header file to make it easier to debug
sql/item.cc: Move function to make it easier to debug sql/item.h: Move function to make them easier to debug
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h15
1 files changed, 1 insertions, 14 deletions
diff --git a/sql/item.h b/sql/item.h
index f8fe05cfdb2..18b419dd6d5 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -233,20 +233,7 @@ public:
static void *operator new(size_t size, MEM_ROOT *mem_root)
{ return (void*) alloc_root(mem_root, (uint) size); }
/* Special for SP local variable assignment - reusing slots */
- static void *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;
- return (void *)reuse;
- }
- if (rsize)
- (*rsize)= size;
- return (void *)sql_alloc((uint)size);
- }
+ static void *operator new(size_t size, Item *reuse, uint *rsize);
static void operator delete(void *ptr,size_t size) { TRASH(ptr, size); }
static void operator delete(void *ptr, MEM_ROOT *mem_root) {}