diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 01:02:01 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 01:02:01 +0300 |
| commit | d6a7de2022756fc1eebe11e4b9e30f33ff541a25 (patch) | |
| tree | 858b1151f3c171c0858661df0b7ebd790efb2eab /sql/sql_class.h | |
| parent | a8700998174de23cb0deeb75aba29f6afb17dedc (diff) | |
| parent | e7bb818116d6fad5376452a7d0b326e8787f6a0e (diff) | |
| download | mariadb-git-d6a7de2022756fc1eebe11e4b9e30f33ff541a25.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 6d2c9ef89fd..57ff65cb416 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -4617,7 +4617,7 @@ public: { DBUG_ENTER("unique_add"); DBUG_PRINT("info", ("tree %u - %lu", tree.elements_in_tree, max_elements)); - if (!(tree.flag & TREE_ONLY_DUPS) && + if (!(tree.flag & TREE_ONLY_DUPS) && tree.elements_in_tree >= max_elements && flush()) DBUG_RETURN(1); DBUG_RETURN(!tree_insert(&tree, ptr, 0, tree.custom_arg)); |