diff options
| author | Monty <monty@mariadb.org> | 2020-07-03 00:35:28 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-07-03 00:35:28 +0300 |
| commit | 5211af1c16063e9c7a62e39ae4acfdc7c9f15e35 (patch) | |
| tree | a615a9bf9aaec7dd3f2f510ba2c194d673c65e78 /storage/myisam | |
| parent | f347b3e0e6592329b1447fa460aca0a4b1f680b1 (diff) | |
| parent | b6ec1e8bbf0ffca2d715aded694722e0c4b5d484 (diff) | |
| download | mariadb-git-5211af1c16063e9c7a62e39ae4acfdc7c9f15e35.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index f5f36266347..1cc396fe2cd 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -887,8 +887,9 @@ int ha_myisam::open(const char *name, int mode, uint test_if_locked) the full row to ensure we don't get any errors from valgrind and that all bytes in the row is properly reset. */ - if ((file->s->options & HA_OPTION_PACK_RECORD) && - (file->s->has_varchar_fields | file->s->has_null_fields)) + if (!(file->s->options & + (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)) && + (file->s->has_varchar_fields || file->s->has_null_fields)) int_table_flags|= HA_RECORD_MUST_BE_CLEAN_ON_WRITE; for (i= 0; i < table->s->keys; i++) |