summaryrefslogtreecommitdiff
path: root/mysys/my_alloc.c
diff options
context:
space:
mode:
authortsmith@siva.hindu.god <>2007-04-18 14:55:42 -0600
committertsmith@siva.hindu.god <>2007-04-18 14:55:42 -0600
commit9232def96b915339ed0e2ab70c52bf695425869d (patch)
tree6095a90eae7e27fd721699fb2a8fef7d74ac69a6 /mysys/my_alloc.c
parent77dcfdd8e714e5d8e671c5a1a843cdb5ab73f386 (diff)
parentb465b3084792e5b70e8a01ecfce9cdfc0a468995 (diff)
downloadmariadb-git-9232def96b915339ed0e2ab70c52bf695425869d.tar.gz
Merge siva.hindu.god:/home/tsmith/m/bk/51
into siva.hindu.god:/home/tsmith/m/bk/maint/51
Diffstat (limited to 'mysys/my_alloc.c')
-rw-r--r--mysys/my_alloc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c
index 233abf793e0..b4ebaeba647 100644
--- a/mysys/my_alloc.c
+++ b/mysys/my_alloc.c
@@ -334,8 +334,6 @@ void free_root(MEM_ROOT *root, myf MyFlags)
DBUG_ENTER("free_root");
DBUG_PRINT("enter",("root: 0x%lx flags: %u", (long) root, (uint) MyFlags));
- if (!root) /* QQ: Should be deleted */
- DBUG_VOID_RETURN; /* purecov: inspected */
if (MyFlags & MY_MARK_BLOCKS_FREE)
{
mark_blocks_free(root);