diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-13 19:01:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-13 19:01:28 +0300 |
| commit | 805340936aa47493886bafd119863d83c475f45c (patch) | |
| tree | 46e5a4bd2e8311ef2880caa0526ce705a40c925e /storage/innobase/dict/dict0load.cc | |
| parent | f9e53a659c87f1147d4f6d004702077d4d0ce5d7 (diff) | |
| parent | d83a4432503d199f6aed8e378563b08471d090dc (diff) | |
| download | mariadb-git-805340936aa47493886bafd119863d83c475f45c.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/dict/dict0load.cc')
| -rw-r--r-- | storage/innobase/dict/dict0load.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index 78844680de6..18d67ac2f0b 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -1536,7 +1536,7 @@ dict_load_column_low( ulint pos; ulint num_base; - ut_ad(table || column); + ut_ad(!table == !!column); if (rec_get_deleted_flag(rec, 0)) { return(dict_load_column_del); @@ -1643,7 +1643,7 @@ err_len: } num_base = mach_read_from_4(field); - if (column == NULL) { + if (table) { if (prtype & DATA_VIRTUAL) { #ifdef UNIV_DEBUG dict_v_col_t* vcol = |