diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 15:48:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 15:48:47 +0200 |
| commit | c7f322c91faf97a9f758c288b38e1385fd89b32d (patch) | |
| tree | cf2a4cf562acffdf5b4b96d84e34f29c7f428458 /sql/unireg.h | |
| parent | d5ce7824444b7491f420061076ae5087d4829428 (diff) | |
| parent | 8036d0a3590dddf4d51ba02bc74ba3a5a96674f7 (diff) | |
| download | mariadb-git-c7f322c91faf97a9f758c288b38e1385fd89b32d.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index bfd9a4c393b..e9c62334e86 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -81,7 +81,8 @@ #define cmp_record(A,B) memcmp((A)->record[0],(A)->B,(size_t) (A)->s->reclength) #define empty_record(A) { \ restore_record((A),s->default_values); \ - bfill((A)->null_flags,(A)->s->null_bytes,255);\ + if ((A)->s->null_bytes) \ + bfill((A)->null_flags,(A)->s->null_bytes,255); \ } /* Defines for use with openfrm, openprt and openfrd */ |