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 /storage/myisam/mi_extra.c | |
| 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 'storage/myisam/mi_extra.c')
| -rw-r--r-- | storage/myisam/mi_extra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisam/mi_extra.c b/storage/myisam/mi_extra.c index 3d6049c0172..8a2bc82d166 100644 --- a/storage/myisam/mi_extra.c +++ b/storage/myisam/mi_extra.c @@ -259,7 +259,7 @@ int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) break; case HA_EXTRA_PREPARE_FOR_DROP: /* Signals about intent to delete this table */ - //share->deleting= TRUE; + share->deleting= TRUE; share->global_changed= FALSE; /* force writing changed flag */ _mi_mark_file_changed(info); /* Fall trough */ |