diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 15:34:59 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 15:34:59 +0300 |
commit | 4b959bd8df18a281248c7325a61f4a79ce7691da (patch) | |
tree | a1ad0e5b950eea62a6eebe4b26e820269654f17c /storage/innobase/os | |
parent | 0a7faed75ad49b99bace0882f89e08639c85679b (diff) | |
parent | acc58fd83584c49049951a2c54c7f82a0c7ec412 (diff) | |
download | mariadb-git-4b959bd8df18a281248c7325a61f4a79ce7691da.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/os')
-rw-r--r-- | storage/innobase/os/os0file.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index 4c6b063d372..37827d7ae29 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -7839,13 +7839,17 @@ invalid: space->flags = (space->flags & FSP_FLAGS_MEM_MASK) | flags; this->size = ulint(size_bytes / psize); - space->size += this->size; + space->committed_size = space->size += this->size; } else if (space->id != TRX_SYS_SPACE || space->size_in_header) { /* If this is not the first-time open, do nothing. For the system tablespace, we always get invoked as first=false, so we detect the true first-time-open based - on size_in_header and proceed to initiailze the data. */ + on size_in_header and proceed to initialize the data. */ return true; + } else { + /* Initialize the size of predefined tablespaces + to FSP_SIZE. */ + space->committed_size = size; } ut_ad(space->free_limit == 0 || space->free_limit == free_limit); |