diff options
author | Igor Babaev <igor@askmonty.org> | 2010-09-27 23:24:46 -0700 |
---|---|---|
committer | Igor Babaev <igor@askmonty.org> | 2010-09-27 23:24:46 -0700 |
commit | 7970b3346a9909f2d4e63b528a4d3bb5f11515ae (patch) | |
tree | 18315f0df2b1c7c77ab0373dcdc3e2034705a38d /mysys | |
parent | 81dab9363884c1e669941a48313d0a207ebabbca (diff) | |
parent | 69dd773b67a9892561f148964e51d3be606f7c77 (diff) | |
download | mariadb-git-7970b3346a9909f2d4e63b528a4d3bb5f11515ae.tar.gz |
Merge
Diffstat (limited to 'mysys')
-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 e4854581204..70f2972b03f 100644 --- a/mysys/tree.c +++ b/mysys/tree.c @@ -221,6 +221,8 @@ TREE_ELEMENT *tree_insert(TREE *tree, void *key, uint key_size, } if (element == &tree->null_element) { + if (tree->flag & TREE_ONLY_DUPS) + return((TREE_ELEMENT *) 1); uint alloc_size=sizeof(TREE_ELEMENT)+key_size+tree->size_of_element; tree->allocated+=alloc_size; |