diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 09:41:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-02 09:41:44 +0300 |
| commit | 1813d92d0c505a1c752f4a9d6e37db6bffe4efdd (patch) | |
| tree | f570314890197949ae55cbbad3a94eb5893c4177 /storage/innobase/row/row0ins.cc | |
| parent | 0fe97c20b341665058491fca4d665207406775c6 (diff) | |
| parent | f347b3e0e6592329b1447fa460aca0a4b1f680b1 (diff) | |
| download | mariadb-git-1813d92d0c505a1c752f4a9d6e37db6bffe4efdd.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/row/row0ins.cc')
| -rw-r--r-- | storage/innobase/row/row0ins.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc index 91c401cd4ba..5f3cdb4356e 100644 --- a/storage/innobase/row/row0ins.cc +++ b/storage/innobase/row/row0ins.cc @@ -1240,8 +1240,10 @@ row_ins_foreign_check_on_constraint( update->info_bits = 0; update->n_fields = foreign->n_fields; - UNIV_MEM_INVALID(update->fields, - update->n_fields * sizeof *update->fields); +#ifdef HAVE_valgrind_or_MSAN + MEM_UNDEFINED(update->fields, + update->n_fields * sizeof *update->fields); +#endif /* HAVE_valgrind_or_MSAN */ bool affects_fulltext = false; |