diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-29 17:03:34 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-03-29 17:03:34 +0300 |
| commit | 980dd09be6316e5596419e7dcdb255446b40c54e (patch) | |
| tree | 899d843b34e8f64ace918dab49d93f5ae0ab945b /storage/innobase/fsp | |
| parent | 4277c173a9815b2c2f9a53039100ad86406003e7 (diff) | |
| parent | 014dfe473a10c79bb476833db915cb586c3b0fd8 (diff) | |
| download | mariadb-git-980dd09be6316e5596419e7dcdb255446b40c54e.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/fsp')
| -rw-r--r-- | storage/innobase/fsp/fsp0fsp.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc index c8e71381491..50d5fc84384 100644 --- a/storage/innobase/fsp/fsp0fsp.cc +++ b/storage/innobase/fsp/fsp0fsp.cc @@ -942,7 +942,7 @@ fsp_try_extend_data_file(fil_space_t* space, fsp_header_t* header, mtr_t* mtr) ut_d(fsp_space_modify_check(space, mtr)); - if (space->id == srv_sys_space.space_id() + if (space->id == TRX_SYS_SPACE && !srv_sys_space.can_auto_extend_last_file()) { /* We print the error message only once to avoid @@ -956,7 +956,7 @@ fsp_try_extend_data_file(fil_space_t* space, fsp_header_t* header, mtr_t* mtr) srv_sys_space.set_tablespace_full_status(true); } return(0); - } else if (fsp_is_system_temporary(space->id) + } else if (space->id == SRV_TMP_SPACE_ID && !srv_tmp_space.can_auto_extend_last_file()) { /* We print the error message only once to avoid |