diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 12:06:50 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 12:06:50 +0300 |
| commit | ec6042bda097fa53c43caf4a1acc32c5a77f6ed4 (patch) | |
| tree | 751af6227789bfa916a6de426542a966845c8cd1 /sql/sql_class.h | |
| parent | ba0ee91077d9b89296328892aa5d5d293f4e0fb1 (diff) | |
| parent | b337a0682943fa7e055380b7859762acf7fb588c (diff) | |
| download | mariadb-git-ec6042bda097fa53c43caf4a1acc32c5a77f6ed4.tar.gz | |
Merge branch '10.0' into 10.1
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 d8fc9303949..f64e7cb5a3f 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -5106,7 +5106,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)); |