diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-04 17:34:11 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-04 17:34:11 -0600 |
| commit | fdff9c0a4521e4006eb7dd718e19077afe6fbb37 (patch) | |
| tree | 4a4e924d33acb60a72c034f4b7ff58112c07d6dd /mysys/tree.c | |
| parent | 1da42e7b8a4219827f4f435d837f41b1b1919d51 (diff) | |
| parent | 2197533b9b04a76f275e23a24449687089a1c528 (diff) | |
| download | mariadb-git-fdff9c0a4521e4006eb7dd718e19077afe6fbb37.tar.gz | |
Merge mysql.sashanet.com:/home/sasha/src/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysys/tree.c:
Auto merged
sql-bench/bench-init.pl.sh:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysys/tree.c')
| -rw-r--r-- | mysys/tree.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/tree.c b/mysys/tree.c index af64be55d2f..02e8fdb12bd 100644 --- a/mysys/tree.c +++ b/mysys/tree.c @@ -266,6 +266,8 @@ int tree_delete(TREE *tree, void *key) } if (remove_colour == BLACK) rb_delete_fixup(tree,parent); + if (tree->free) + (*tree->free)(ELEMENT_KEY(tree,element)); my_free((gptr) element,MYF(0)); tree->elements_in_tree--; return 0; |