diff options
| author | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2018-05-09 19:44:13 +0530 |
|---|---|---|
| committer | Thirunarayanan Balathandayuthapani <thiru@mariadb.com> | 2018-05-09 19:44:13 +0530 |
| commit | af9e7e9f35bd7352e6c17920b9c353111cad6d19 (patch) | |
| tree | 24d2e50161ee43da99a938c4e4375825e62b9b25 | |
| parent | 515bede6a8f8b2b4000decb3db513c692f4cfa7a (diff) | |
| download | mariadb-git-bb-10.3-thiru-GA.tar.gz | |
- Fixed compilation issue and merging error.bb-10.3-thiru-GA
| -rw-r--r-- | storage/innobase/dict/dict0dict.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index 60e003c56f7..69143590149 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -1029,8 +1029,6 @@ static bool dict_parse_tbl_name( return false; } - const char* is_part = strstr(tbl_buf, "#"); - if (char* is_part = strchr(tbl_buf, '#')) { is_part = '\0'; } diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 80c5859a70a..b0731bd44c3 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -6704,7 +6704,7 @@ check_if_can_drop_indexes: for (dict_index_t* index = dict_table_get_first_index(indexed_table); index != NULL; index = dict_table_get_next_index(index)) { - if (!index->to_be_dropped && dict_index_is_corrupted(index) + if (!index->to_be_dropped && index->is_corrupted() && index->is_committed()) { my_error(ER_INDEX_CORRUPT, MYF(0), index->name()); goto err_exit; |