summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--storage/innobase/dict/dict0load.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc
index 63ccf6bbb96..4014d28c2fb 100644
--- a/storage/innobase/dict/dict0load.cc
+++ b/storage/innobase/dict/dict0load.cc
@@ -1571,7 +1571,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);
@@ -1678,7 +1678,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 =