diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-04-18 14:55:42 -0600 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-04-18 14:55:42 -0600 |
| commit | 4177856a56bae216184595f5c18987e2abe31957 (patch) | |
| tree | 6095a90eae7e27fd721699fb2a8fef7d74ac69a6 /mysys/my_alloc.c | |
| parent | 9508b781eff5a2a6857f1467b0a39dbde06e4446 (diff) | |
| parent | 9340cb193e40516d051f02cdd074dd30b99816a4 (diff) | |
| download | mariadb-git-4177856a56bae216184595f5c18987e2abe31957.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/51
into siva.hindu.god:/home/tsmith/m/bk/maint/51
client/mysql_upgrade.c:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysys/my_alloc.c:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.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 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); |