summaryrefslogtreecommitdiff
path: root/storage/myisam/ft_boolean_search.c
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2017-05-17 00:34:48 +0300
committerMonty <monty@mariadb.org>2017-05-17 00:34:48 +0300
commit6378c95ee07cccc2f2187b2caddc4496e14827d9 (patch)
tree1e7b9066e15288e3471f0c800e5dda820d3d0daf /storage/myisam/ft_boolean_search.c
parent314350a722e65081472113c53657ad239f3bef72 (diff)
downloadmariadb-git-6378c95ee07cccc2f2187b2caddc4496e14827d9.tar.gz
Fix that end_bulk_insert() doesn't write to to-be-deleted files
This affected mainly MyISAM and Aria engines. Also fixed that end_bulk_insert() detects errors from internal mi_end_bulk_insert() and ma_end_bulk_insert() - delete_tree() and delete_tree_element() now has an extra argument that marks if future calls to tree->free should be ignored. - tree->free changed to function returning int, to be able to signal errors. - Restored deleting flag in MyISAM that was accidently disabled in mi_extra(PREPARE_FOR_DROP)
Diffstat (limited to 'storage/myisam/ft_boolean_search.c')
-rw-r--r--storage/myisam/ft_boolean_search.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c
index a44e24c9db1..dee57513912 100644
--- a/storage/myisam/ft_boolean_search.c
+++ b/storage/myisam/ft_boolean_search.c
@@ -1039,7 +1039,7 @@ void ft_boolean_close_search(FT_INFO *ftb)
{
if (is_tree_inited(& ftb->no_dupes))
{
- delete_tree(& ftb->no_dupes);
+ delete_tree(&ftb->no_dupes, 0);
}
free_root(& ftb->mem_root, MYF(0));
my_free(ftb);