diff options
| author | unknown <jamppa@bk-internal.mysql.com> | 2007-04-17 15:45:35 +0200 |
|---|---|---|
| committer | unknown <jamppa@bk-internal.mysql.com> | 2007-04-17 15:45:35 +0200 |
| commit | 9340cb193e40516d051f02cdd074dd30b99816a4 (patch) | |
| tree | 87310f47abe960fdb7ddb0d4d388995eb3ce601b /mysys/my_alloc.c | |
| parent | cc76701e8f47ca52ca209150f49ba665a215c1d0 (diff) | |
| parent | 9c0097fa8b4b5adc593797166fcd6f5ea53fca19 (diff) | |
| download | mariadb-git-9340cb193e40516d051f02cdd074dd30b99816a4.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
mysql-test/r/strict.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysys/my_alloc.c')
| -rw-r--r-- | mysys/my_alloc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 5a0ac7b87f7..edf1be1b2b6 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -330,8 +330,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); |