diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:39:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:39:45 +0300 |
| commit | 4cd7979c56130194cc3742e1037998d11f98c047 (patch) | |
| tree | 70131981da1d874d68b9e8cc8e7bf293e405907e /storage/innobase/dict/dict0load.cc | |
| parent | 619dc2b24f26aea29345dc3f3289bed406738025 (diff) | |
| parent | 9c34a4124d67d9e3f70837eaeb11290f35e8f8d0 (diff) | |
| download | mariadb-git-4cd7979c56130194cc3742e1037998d11f98c047.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/dict/dict0load.cc')
| -rw-r--r-- | storage/innobase/dict/dict0load.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc index 3606b902510..67f863ee907 100644 --- a/storage/innobase/dict/dict0load.cc +++ b/storage/innobase/dict/dict0load.cc @@ -2674,11 +2674,13 @@ dict_load_table_low(table_name_t& name, const rec_t* rec, dict_table_t** table) ulint n_v_col; if (const char* error_text = dict_sys_tables_rec_check(rec)) { + *table = NULL; return(error_text); } if (!dict_sys_tables_rec_read(rec, name, &table_id, &space_id, &t_num, &flags, &flags2)) { + *table = NULL; return(dict_load_table_flags); } |