diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-09 15:00:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-09 15:00:21 +0300 |
| commit | 66ae50a564f1d145d36f7de8dc266ce9266acf26 (patch) | |
| tree | 7fe24cde51d4a3f53a4b7a67d48c168016f3dc10 /storage/innobase/dict | |
| parent | 9b688471274868ff94115fd6e4255ee01befedad (diff) | |
| parent | 7e07e38cf687ccd7fa3bd3a35c1eb7e4b307ca5f (diff) | |
| download | mariadb-git-66ae50a564f1d145d36f7de8dc266ce9266acf26.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/dict')
| -rw-r--r-- | storage/innobase/dict/dict0boot.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/dict/dict0dict.cc | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/storage/innobase/dict/dict0boot.cc b/storage/innobase/dict/dict0boot.cc index 0055ca6ef17..29db56599e2 100644 --- a/storage/innobase/dict/dict0boot.cc +++ b/storage/innobase/dict/dict0boot.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2016, 2019, MariaDB Corporation. +Copyright (c) 2016, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -142,7 +142,7 @@ dict_hdr_create( /* Create the dictionary header file block in a new, allocated file segment in the system tablespace */ - block = fseg_create(fil_system.sys_space, 0, + block = fseg_create(fil_system.sys_space, DICT_HDR + DICT_HDR_FSEG_HEADER, mtr); ut_a(DICT_HDR_PAGE_NO == block->page.id.page_no()); diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index d5b1e3f7e24..411abdcd494 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -6047,7 +6047,11 @@ dict_foreign_qualify_index( return(false); } - if (index->type & (DICT_SPATIAL | DICT_FTS)) { + if (index->type & (DICT_SPATIAL | DICT_FTS | DICT_CORRUPT)) { + return false; + } + + if (index->online_status >= ONLINE_INDEX_ABORTED) { return false; } |