summaryrefslogtreecommitdiff
path: root/storage/myisam
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-04-19 15:23:21 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-04-19 15:23:21 +0300
commitd71a8855eef34e5792b4939ee5e88e6625080d91 (patch)
treeed4d5b9916395132fa56675eb58a9229d0672bbe /storage/myisam
parent419385dbf10453b17a370fd9e5bd934d09e0b440 (diff)
parent66c14d3a8d31e877ede75d23f96dc61a4aa12971 (diff)
downloadmariadb-git-d71a8855eef34e5792b4939ee5e88e6625080d91.tar.gz
Merge 10.2 to 10.3
Temporarily disable main.cte_recursive due to hang in an added test related to MDEV-15575.
Diffstat (limited to 'storage/myisam')
-rw-r--r--storage/myisam/mi_delete_all.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/myisam/mi_delete_all.c b/storage/myisam/mi_delete_all.c
index 37fdf2dcb04..c772e843ecf 100644
--- a/storage/myisam/mi_delete_all.c
+++ b/storage/myisam/mi_delete_all.c
@@ -62,6 +62,10 @@ int mi_delete_all_rows(MI_INFO *info)
if (mysql_file_chsize(info->dfile, 0, 0, MYF(MY_WME)) ||
mysql_file_chsize(share->kfile, share->base.keystart, 0, MYF(MY_WME)))
goto err;
+
+ if (info->opt_flag & WRITE_CACHE_USED)
+ reinit_io_cache(&info->rec_cache, WRITE_CACHE, 0, 1, 1);
+
(void) _mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE);
DBUG_RETURN(0);