summaryrefslogtreecommitdiff
path: root/storage/innobase/fsp
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-06-21 14:22:22 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-06-21 14:22:22 +0300
commita42c80bd480c2060eca30101dab20ea6f6418bc8 (patch)
treea0a7ab27e52c867637c51ac7126abea15cc4c049 /storage/innobase/fsp
parentbcedb4200f26468d33f7064c1e6e126d81b21162 (diff)
parentbaf0ef9a18fa69e97deb750d9fa545dd4f162596 (diff)
downloadmariadb-git-a42c80bd480c2060eca30101dab20ea6f6418bc8.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/fsp')
-rw-r--r--storage/innobase/fsp/fsp0fsp.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc
index ceaab79b1c4..3d5a7edd947 100644
--- a/storage/innobase/fsp/fsp0fsp.cc
+++ b/storage/innobase/fsp/fsp0fsp.cc
@@ -2323,7 +2323,6 @@ fsp_reserve_free_extents(
uint32_t n_pages)
{
ulint reserve;
- size_t total_reserved = 0;
ut_ad(mtr);
*n_reserved = n_ext;
@@ -2409,8 +2408,7 @@ try_again:
return(true);
}
try_to_extend:
- if (ulint n = fsp_try_extend_data_file(space, header, mtr)) {
- total_reserved += n;
+ if (fsp_try_extend_data_file(space, header, mtr)) {
goto try_again;
}