diff options
author | Alexander Barkov <bar@mariadb.org> | 2017-07-05 17:43:32 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2017-07-05 17:43:32 +0400 |
commit | 3b9273d20334f95b85047058ae978615b61a57ed (patch) | |
tree | 78ce9901370c84f6e5f6d1b07e6cc487a6fee7bb /storage/maria/ma_write.c | |
parent | a4d9fa99ea25fa87f7a8ecf36579ec1585d1c397 (diff) | |
parent | 58dd72f18cca5e706a5bd0dfcf3e22aba9bb8448 (diff) | |
download | mariadb-git-3b9273d20334f95b85047058ae978615b61a57ed.tar.gz |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'storage/maria/ma_write.c')
-rw-r--r-- | storage/maria/ma_write.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/maria/ma_write.c b/storage/maria/ma_write.c index 1261379f4d6..aad555a85a1 100644 --- a/storage/maria/ma_write.c +++ b/storage/maria/ma_write.c @@ -107,9 +107,10 @@ int maria_write(MARIA_HA *info, uchar *record) if (_ma_readinfo(info,F_WRLCK,1)) DBUG_RETURN(my_errno); - if (share->base.reloc == (ha_rows) 1 && - share->base.records == (ha_rows) 1 && - share->state.state.records == (ha_rows) 1) + if ((share->state.changed & STATE_DATA_FILE_FULL) || + (share->base.reloc == (ha_rows) 1 && + share->base.records == (ha_rows) 1 && + share->state.state.records == (ha_rows) 1)) { /* System file */ my_errno=HA_ERR_RECORD_FILE_FULL; goto err2; |