diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 10:29:15 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-03 10:32:21 +0300 |
commit | dbc716675b183dc972a40dd1320f4bdae04c1f29 (patch) | |
tree | 65550afccea8fc9e0d47ba16a679eef44c7dab1a /storage/innobase/dict/dict0mem.cc | |
parent | e3f44d8d0eb0277312391686672f81a460094917 (diff) | |
parent | c0fca2863bcbd7cd231f1aa747b4f8d999e3a00e (diff) | |
download | mariadb-git-dbc716675b183dc972a40dd1320f4bdae04c1f29.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/dict/dict0mem.cc')
-rw-r--r-- | storage/innobase/dict/dict0mem.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc index 7fc8ab79395..db62134bdef 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -283,7 +283,6 @@ dict_mem_table_add_col( dict_col_t* col; ulint i; - ut_ad(table); ut_ad(table->magic_n == DICT_TABLE_MAGIC_N); ut_ad(!heap == !name); |