diff options
| author | Monty <monty@mariadb.org> | 2017-05-17 00:34:48 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-05-17 00:34:48 +0300 |
| commit | 6378c95ee07cccc2f2187b2caddc4496e14827d9 (patch) | |
| tree | 1e7b9066e15288e3471f0c800e5dda820d3d0daf /include/maria.h | |
| parent | 314350a722e65081472113c53657ad239f3bef72 (diff) | |
| download | mariadb-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 'include/maria.h')
| -rw-r--r-- | include/maria.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/maria.h b/include/maria.h index e25fa4c24ee..f88ad610213 100644 --- a/include/maria.h +++ b/include/maria.h @@ -392,7 +392,7 @@ my_bool maria_test_if_sort_rep(MARIA_HA *info, ha_rows rows, ulonglong key_map, int maria_init_bulk_insert(MARIA_HA *info, size_t cache_size, ha_rows rows); void maria_flush_bulk_insert(MARIA_HA *info, uint inx); -void maria_end_bulk_insert(MARIA_HA *info); +int maria_end_bulk_insert(MARIA_HA *info, my_bool abort); int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves); void maria_versioning(MARIA_HA *info, my_bool versioning); void maria_ignore_trids(MARIA_HA *info); |