diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-11 17:32:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-11 17:32:20 +0300 |
| commit | 3b99a274a845edddeb2234108d0978d57f447c3d (patch) | |
| tree | 6badd008396bc4cdc6a5077066eb9b3057a075b9 /storage | |
| parent | dab4abbb09d1b204a64187c17de88234da3071a6 (diff) | |
| parent | 197bf0fe35efb148c4e751e1b695786d61238e8e (diff) | |
| download | mariadb-git-3b99a274a845edddeb2234108d0978d57f447c3d.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0import.cc | 10 | ||||
| -rw-r--r-- | storage/xtradb/row/row0import.cc | 6 | ||||
| -rw-r--r-- | storage/xtradb/row/row0mysql.cc | 8 |
3 files changed, 6 insertions, 18 deletions
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc index 04456043f8a..a9c24a0f8cc 100644 --- a/storage/innobase/row/row0import.cc +++ b/storage/innobase/row/row0import.cc @@ -1804,10 +1804,6 @@ PageConverter::update_records( m_rec_iter.open(block); - if (!page_is_leaf(block->frame)) { - return DB_SUCCESS; - } - while (!m_rec_iter.end()) { rec_t* rec = m_rec_iter.current(); @@ -1922,11 +1918,7 @@ PageConverter::update_index_page( return(DB_SUCCESS); } - if (!page_is_leaf(block->frame)) { - return (DB_SUCCESS); - } - - return(update_records(block)); + return page_is_leaf(block->frame) ? update_records(block) : DB_SUCCESS; } /** diff --git a/storage/xtradb/row/row0import.cc b/storage/xtradb/row/row0import.cc index 3e60287a2e4..36ffba68291 100644 --- a/storage/xtradb/row/row0import.cc +++ b/storage/xtradb/row/row0import.cc @@ -1804,10 +1804,6 @@ PageConverter::update_records( m_rec_iter.open(block); - if (!page_is_leaf(block->frame)) { - return DB_SUCCESS; - } - while (!m_rec_iter.end()) { rec_t* rec = m_rec_iter.current(); ibool deleted = rec_get_deleted_flag(rec, comp); @@ -1921,7 +1917,7 @@ PageConverter::update_index_page( return(DB_SUCCESS); } - return(update_records(block)); + return page_is_leaf(block->frame) ? update_records(block) : DB_SUCCESS; } /** diff --git a/storage/xtradb/row/row0mysql.cc b/storage/xtradb/row/row0mysql.cc index ce4fe7f53ea..1acdfe53e0c 100644 --- a/storage/xtradb/row/row0mysql.cc +++ b/storage/xtradb/row/row0mysql.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2000, 2018, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2015, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under @@ -1504,8 +1504,7 @@ error_exit: doc_ids difference should not exceed FTS_DOC_ID_MAX_STEP value. */ - if (next_doc_id > 1 - && doc_id - next_doc_id >= FTS_DOC_ID_MAX_STEP) { + if (doc_id - next_doc_id >= FTS_DOC_ID_MAX_STEP) { fprintf(stderr, "InnoDB: Doc ID " UINT64PF " is too" " big. Its difference with largest" @@ -5270,7 +5269,8 @@ row_rename_table_for_mysql( } } - if (dict_table_has_fts_index(table) + if ((dict_table_has_fts_index(table) + || DICT_TF2_FLAG_IS_SET(table, DICT_TF2_FTS_HAS_DOC_ID)) && !dict_tables_have_same_db(old_name, new_name)) { err = fts_rename_aux_tables(table, new_name, trx); if (err != DB_TABLE_NOT_FOUND) { |