bk commit into 5.0 tree (monty:1.1914)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1914 05/05/26 00:18:24 monty@stripped +2 -0
  Move function from header file to make it easier to debug

  sql/item.h
    1.131 05/05/26 00:18:20 monty@stripped +1 -14
    Move function to make them easier to debug

  sql/item.cc
    1.123 05/05/26 00:18:20 monty@stripped +16 -0
    Move function to make it easier to debug

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	narttu.mysql.com
# Root:	/home/my/mysql-5.0

--- 1.122/sql/item.cc	2005-05-24 21:25:44 +03:00
+++ 1.123/sql/item.cc	2005-05-26 00:18:20 +03:00
@@ -297,6 +297,22 @@
 }
 
 
+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;
+    return (void *)reuse;
+  }
+  if (rsize)
+    (*rsize)= size;
+  return (void *)sql_alloc((uint)size);
+}
+
+
 Item::Item():
   rsize(0), name(0), orig_name(0), name_length(0), fixed(0),
   collation(&my_charset_bin, DERIVATION_COERCIBLE)

--- 1.130/sql/item.h	2005-05-24 21:25:44 +03:00
+++ 1.131/sql/item.h	2005-05-26 00:18:20 +03:00
@@ -233,20 +233,7 @@
   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) {}