database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-09-19 12:06:50 +03:00
parent ba0ee91077 b337a06829
commit ec6042bda0
193 changed files with 43208 additions and 2979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.h
View File

@@ -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));