1. 24 Jan, 2023 7 commits
    • Marko Mäkelä's avatar
      Merge 10.8 into 10.9 · 4d9fe403
      Marko Mäkelä authored
      4d9fe403
    • Marko Mäkelä's avatar
      Merge 10.7 into 10.8 · fa543a0f
      Marko Mäkelä authored
      fa543a0f
    • Marko Mäkelä's avatar
      Merge 10.6 into 10.7 · cea50896
      Marko Mäkelä authored
      cea50896
    • Marko Mäkelä's avatar
      MDEV-30400 Assertion height == btr_page_get_level(...) on INSERT · de4030e4
      Marko Mäkelä authored
      This also fixes part of MDEV-29835 Partial server freeze
      which is caused by violations of the latching order that was
      defined in https://dev.mysql.com/worklog/task/?id=6326
      (WL#6326: InnoDB: fix index->lock contention). Unless the
      current thread is holding an exclusive dict_index_t::lock,
      it must acquire page latches in a strict parent-to-child,
      left-to-right order. Not all cases of MDEV-29835 are fixed yet.
      Failure to follow the correct latching order will cause deadlocks
      of threads due to lock order inversion.
      
      As part of these changes, the BTR_MODIFY_TREE mode is modified
      so that an Update latch (U a.k.a. SX) will be acquired on the
      root page, and eXclusive latches (X) will be acquired on all pages
      leading to the leaf page, as well as any left and right siblings
      of the pages along the path. The DEBUG_SYNC test innodb.innodb_wl6326
      will be removed, because at the time the DEBUG_SYNC point is hit,
      the thread is actually holding several page latches that will be
      blocking a concurrent SELECT statement.
      
      We also remove double bookkeeping that was caused due to excessive
      information hiding in mtr_t::m_memo. We simply let mtr_t::m_memo
      store information of latched pages, and ensure that
      mtr_memo_slot_t::object is never a null pointer.
      The tree_blocks[] and tree_savepoints[] were redundant.
      
      buf_page_get_low(): If innodb_change_buffering_debug=1, to avoid
      a hang, do not try to evict blocks if we are holding a latch on
      a modified page. The test innodb.innodb-change-buffer-recovery
      will be removed, because change buffering may no longer be forced
      by debug injection when the change buffer comprises multiple pages.
      Remove a debug assertion that could fail when
      innodb_change_buffering_debug=1 fails to evict a page.
      For other cases, the assertion is redundant, because we already
      checked that right after the got_block: label. The test
      innodb.innodb-change-buffering-recovery will be removed, because
      due to this change, we will be unable to evict the desired page.
      
      mtr_t::lock_register(): Register a change of a page latch
      on an unmodified buffer-fixed block.
      
      mtr_t::x_latch_at_savepoint(), mtr_t::sx_latch_at_savepoint():
      Replaced by the use of mtr_t::upgrade_buffer_fix(), which now
      also handles RW_S_LATCH.
      
      mtr_t::set_modified(): For temporary tables, invoke
      buf_page_t::set_modified() here and not in mtr_t::commit().
      We will never set the MTR_MEMO_MODIFY flag on other than
      persistent data pages, nor set mtr_t::m_modifications when
      temporary data pages are modified.
      
      mtr_t::commit(): Only invoke the buf_flush_note_modification() loop
      if persistent data pages were modified.
      
      mtr_t::get_already_latched(): Look up a latched page in mtr_t::m_memo.
      This avoids many redundant entries in mtr_t::m_memo, as well as
      redundant calls to buf_page_get_gen() for blocks that had already
      been looked up in a mini-transaction.
      
      btr_get_latched_root(): Return a pointer to an already latched root page.
      This replaces btr_root_block_get() in cases where the mini-transaction
      has already latched the root page.
      
      btr_page_get_parent(): Fetch a parent page that was already latched
      in BTR_MODIFY_TREE, by invoking mtr_t::get_already_latched().
      If needed, upgrade the root page U latch to X.
      This avoids bloating mtr_t::m_memo as well as performing redundant
      buf_pool.page_hash lookups. For non-QUICK CHECK TABLE as well as for
      B-tree defragmentation, we will invoke btr_cur_search_to_nth_level().
      
      btr_cur_search_to_nth_level(): This will only be used for non-leaf
      (level>0) B-tree searches that were formerly named BTR_CONT_SEARCH_TREE
      or BTR_CONT_MODIFY_TREE. In MDEV-29835, this function could be
      removed altogether, or retained for the case of
      CHECK TABLE without QUICK.
      
      btr_cur_t::left_block: Remove. btr_pcur_move_backward_from_page()
      can retrieve the left sibling from the end of mtr_t::m_memo.
      
      btr_cur_t::open_leaf(): Some clean-up.
      
      btr_cur_t::search_leaf(): Replaces btr_cur_search_to_nth_level()
      for searches to level=0 (the leaf level). We will never release
      parent page latches before acquiring leaf page latches. If we need to
      temporarily release the level=1 page latch in the BTR_SEARCH_PREV or
      BTR_MODIFY_PREV latch_mode, we will reposition the cursor on the
      child node pointer so that we will land on the correct leaf page.
      
      btr_cur_t::pessimistic_search_leaf(): Implement new BTR_MODIFY_TREE
      latching logic in the case that page splits or merges will be needed.
      The parent pages (and their siblings) should already be latched on
      the first dive to the leaf and be present in mtr_t::m_memo; there
      should be no need for BTR_CONT_MODIFY_TREE. This pre-latching almost
      suffices; it must be revised in MDEV-29835 and work-arounds removed
      for cases where mtr_t::get_already_latched() fails to find a block.
      
      rtr_search_to_nth_level(): A SPATIAL INDEX version of
      btr_search_to_nth_level() that can search to any level
      (including the leaf level).
      
      rtr_search_leaf(), rtr_insert_leaf(): Wrappers for
      rtr_search_to_nth_level().
      
      rtr_search(): Replaces rtr_pcur_open().
      
      rtr_latch_leaves(): Replaces btr_cur_latch_leaves(). Note that unlike
      in the B-tree code, there is no error handling in case the sibling
      pages are corrupted.
      
      rtr_cur_restore_position(): Remove an unused constant parameter.
      
      btr_pcur_open_on_user_rec(): Remove the constant parameter
      mode=PAGE_CUR_GE.
      
      row_ins_clust_index_entry_low(): Use a new
      mode=BTR_MODIFY_ROOT_AND_LEAF to gain access to the root page
      when mode!=BTR_MODIFY_TREE, to write the PAGE_ROOT_AUTO_INC.
      
      BTR_SEARCH_TREE, BTR_CONT_SEARCH_TREE: Remove.
      
      BTR_CONT_MODIFY_TREE: Note that this is only used by
      rtr_search_to_nth_level().
      
      btr_pcur_optimistic_latch_leaves(): Replaces
      btr_cur_optimistic_latch_leaves().
      
      ibuf_delete_rec(): Acquire exclusive ibuf.index->lock in order
      to avoid a deadlock with ibuf_insert_low(BTR_MODIFY_PREV).
      
      btr_blob_log_check_t(): Acquire a U latch on the root page,
      so that btr_page_alloc() in btr_store_big_rec_extern_fields()
      will avoid a deadlock.
      
      btr_store_big_rec_extern_fields(): Assert that the root page latch
      is being held.
      
      Tested by: Matthias Leich
      Reviewed by: Vladislav Lesin
      de4030e4
    • Denis Protivensky's avatar
      MDEV-24623 Replicate bulk insert as table-level exclusive key · 39f46745
      Denis Protivensky authored
      - introduce table key construction function in wsrep service interface
      - don't add row keys when replicating bulk insert
      - don't start bulk insert on applier or when transaction is not active
      - don't start bulk insert on system versioned tables
      - implement actual bulk insert table-level key replication
      Reviewed-by: default avatarJan Lindström <jan.lindstrom@mariadb.com>
      39f46745
    • Daniel Black's avatar
      rpm: ignore man3 · a10003bd
      Daniel Black authored
      During testing of RPM packages in MDEV-30203:
        file /usr/share/man/man3 from install of
        MariaDB-devel-11.0.1-1.el7_9.x86_64 conflicts with file from
        package filesystem-3.2-25.el7.x86_64
      
      MariaDB is the first libmariadb to include man3 man pages
      so make the changes here like what is done for man1 and man8.
      a10003bd
    • Thirunarayanan Balathandayuthapani's avatar
      MDEV-30393 InnoDB: Assertion failure in dict0dict.cc upon ADD FULLTEXT INDEX · ef6b3806
      Thirunarayanan Balathandayuthapani authored
      Problem:
      ========
      - InnoDB fails to remove the newly created table or index from
      data dictionary and table cache if the alter fails in commit phase
      
      Solution:
      ========
      - InnoDB should restart the transaction to remove the newly
      created table and index when it fails in commit phase of an alter
      operation. innodb_fts.misc_debug tests the scenario with the
      help of debug point "stats_lock_fail"
      ef6b3806
  2. 23 Jan, 2023 8 commits
  3. 20 Jan, 2023 2 commits
  4. 19 Jan, 2023 4 commits
    • Marko Mäkelä's avatar
      MDEV-30400 Assertion height == btr_page_get_level(...) on INSERT · f9cac8d2
      Marko Mäkelä authored
      This also fixes part of MDEV-29835 Partial server freeze
      which is caused by violations of the latching order that was
      defined in https://dev.mysql.com/worklog/task/?id=6326
      (WL#6326: InnoDB: fix index->lock contention). Unless the
      current thread is holding an exclusive dict_index_t::lock,
      it must acquire page latches in a strict parent-to-child,
      left-to-right order. Not all cases are fixed yet. Failure to
      follow the correct latching order will cause deadlocks of threads
      due to lock order inversion.
      
      As part of these changes, the BTR_MODIFY_TREE mode is modified
      so that an Update latch (U a.k.a. SX) will be acquired on the
      root page, and eXclusive latches (X) will be acquired on all pages
      leading to the leaf page, as well as any left and right siblings
      of the pages along the path. The test innodb.innodb_wl6326
      will be removed, because at the time the DEBUG_SYNC point is hit,
      the thread is actually holding several page latches that will be
      blocking a concurrent SELECT statement.
      
      We also remove double bookkeeping that was caused due to excessive
      information hiding in mtr_t::m_memo. We simply let mtr_t::m_memo
      store information of latched pages, and ensure that
      mtr_memo_slot_t::object is never a null pointer.
      The tree_blocks[] and tree_savepoints[] were redundant.
      
      mtr_t::get_already_latched(): Look up a latched page in mtr_t::m_memo.
      This avoids many redundant entries in mtr_t::m_memo, as well as
      redundant calls to buf_page_get_gen() for blocks that had already
      been looked up in a mini-transaction.
      
      btr_get_latched_root(): Return a pointer to an already latched root page.
      This replaces btr_root_block_get() in cases where the mini-transaction
      has already latched the root page.
      
      btr_page_get_parent(): Fetch a parent page that was already latched
      in BTR_MODIFY_TREE, by invoking mtr_t::get_already_latched().
      If needed, upgrade the root page U latch to X.
      This avoids bloating mtr_t::m_memo as well as redundant
      buf_pool.page_hash lookups. For non-QUICK CHECK TABLE as well as for
      B-tree defragmentation, we will invoke btr_cur_search_to_nth_level().
      
      btr_cur_search_to_nth_level(): This will only be used for non-leaf
      (level>0) B-tree searches that were formerly named BTR_CONT_SEARCH_TREE
      or BTR_CONT_MODIFY_TREE. In MDEV-29835, this function could be
      removed altogether, or retained for the case of
      CHECK TABLE without QUICK.
      
      btr_cur_t::search_leaf(): Replaces btr_cur_search_to_nth_level()
      for searches to level=0 (the leaf level).
      
      btr_cur_t::pessimistic_search_leaf(): Implement the new
      BTR_MODIFY_TREE latching logic in the case that page splits
      or merges will be needed. The parent pages (and their siblings)
      should already be latched on the first dive to the leaf and be
      present in mtr_t::m_memo; there should be no need for
      BTR_CONT_MODIFY_TREE. This pre-latching almost suffices;
      MDEV-29835 will have to revise it and remove work-arounds where
      mtr_t::get_already_latched() fails to find a block.
      
      rtr_search_to_nth_level(): A SPATIAL INDEX version of
      btr_search_to_nth_level() that can search to any level
      (including the leaf level).
      
      rtr_search_leaf(), rtr_insert_leaf(): Wrappers for
      rtr_search_to_nth_level().
      
      rtr_search(): Replaces rtr_pcur_open().
      
      rtr_cur_restore_position(): Remove an unused constant parameter.
      
      btr_pcur_open_on_user_rec(): Remove the constant parameter
      mode=PAGE_CUR_GE.
      
      btr_cur_latch_leaves(): Update a pre-existing mtr_t::m_memo entry
      for the current leaf page.
      
      row_ins_clust_index_entry_low(): Use a new
      mode=BTR_MODIFY_ROOT_AND_LEAF to gain access to the root page
      when mode!=BTR_MODIFY_TREE, to write the PAGE_ROOT_AUTO_INC.
      
      btr_cur_t::open_leaf(): Some clean-up.
      
      mtr_t::lock_register(): Register a page latch on a buffer-fixed block.
      
      BTR_SEARCH_TREE, BTR_CONT_SEARCH_TREE: Remove.
      
      BTR_CONT_MODIFY_TREE: Note that this is only used by
      rtr_search_to_nth_level().
      
      btr_pcur_optimistic_latch_leaves(): Replaces
      btr_cur_optimistic_latch_leaves().
      
      ibuf_delete_rec(): Acquire ibuf.index->lock.u_lock() in order
      to avoid a deadlock with ibuf_insert_low(BTR_MODIFY_PREV).
      
      Tested by: Matthias Leich
      f9cac8d2
    • Marko Mäkelä's avatar
      MDEV-30289: Implement small_vector for mtr_t::m_memo · 67dc8af2
      Marko Mäkelä authored
      To avoid heap memory allocation overhead for mtr_t::m_memo,
      we will allocate a small number of elements statically in
      mtr_t::m_memo::small. Only if that preallocated data is
      insufficient, we will invoke my_alloc() or my_realloc() for
      more storage. The implementation of the data structure is
      inspired by llvm::SmallVector.
      67dc8af2
    • Marko Mäkelä's avatar
    • Daniele Sciascia's avatar
      MDEV-29774 BF abort no longer wakes up debug_sync waiters · eeb8ebb1
      Daniele Sciascia authored
      Since commit d7d3ad69, "hard" kill is
      required to interrupt debug sync waits.
      Affected the following tests:
       - galera_var_retry_autocommit,
       - galera_bf_abort_at_after_statement
       - galera_parallel_apply_3nodes
      Reviewed-by: default avatarJan Lindström <jan.lindstrom@mariadb.com>
      eeb8ebb1
  5. 18 Jan, 2023 8 commits
  6. 17 Jan, 2023 11 commits
    • Oleksandr Byelkin's avatar
      v5.5.4-stable · 9924466b
      Oleksandr Byelkin authored
      9924466b
    • Marko Mäkelä's avatar
      Merge 10.5 into 10.6 · a8c5635c
      Marko Mäkelä authored
      a8c5635c
    • Marko Mäkelä's avatar
      Merge 10.4 into 10.5 · 0459d2cc
      Marko Mäkelä authored
      0459d2cc
    • Marko Mäkelä's avatar
      Merge 10.3 into 10.4 · 2b3423c4
      Marko Mäkelä authored
      2b3423c4
    • Marko Mäkelä's avatar
      MDEV-30422 Merge new release of InnoDB 5.7.41 to 10.3 · 489b5569
      Marko Mäkelä authored
      MySQL 5.7.41 includes one InnoDB change
      mysql/mysql-server@d2d6b2dd00f709bc528386009150d4bc726e25a0
      that seems to be applicable to MariaDB Server 10.3 and 10.4.
      Even though commit 5b9ee8d8
      seems to have fixed sporadic failures on our CI systems, it is
      theoretically possible that another race condition remained.
      
      buf_flush_page_cleaner_coordinator(): In the final loop,
      wait also for buf_get_n_pending_read_ios() to reach 0.
      In this way, if a secondary index leaf page was read into the
      buffer pool and ibuf_merge_or_delete_for_page() modified that
      page or some change buffer pages, the flush loop would execute
      until the buffer pool really is in a clean state.
      
      This potential data corruption bug does not affect MariaDB Server 10.5
      or later, thanks to commit b42294bc
      which removed change buffer merges that are not explicitly requested.
      489b5569
    • Sergei Golubchik's avatar
      fix failures of main.func_json --ps · 22cd3358
      Sergei Golubchik authored
      in normal execution, the item is wrapped in Item_func_conv_charset.
      
      in --ps the whole is wrapped again in Item_direct_ref_to_item
      22cd3358
    • Sergei Golubchik's avatar
      cleanup: const_Item->real_item() · 3b932255
      Sergei Golubchik authored
      allow real_item() to be called for const Item*,
      remove casts in the code
      3b932255
    • Sergei Golubchik's avatar
      ADD CONSTRAINT IF NOT EXISTS didn't work in SP · cce76fef
      Sergei Golubchik authored
      "if not exists" must be stored in a separate read-only property
      cce76fef
    • Sergei Golubchik's avatar
      MDEV-22602 Disable UPDATE CASCADE for SQL constraints · a5eff044
      Sergei Golubchik authored
      fix it for named constraints too
      a5eff044
    • Rucha Deodhar's avatar
      MDEV-30304: Json Range only affects first row of the result set · b915b96f
      Rucha Deodhar authored
      Analysis:
      Parsing json path happens only once. When paring, we set types of path
      (types_used) to use later. If the path type has range or wild card, only
      then multiple values get added to the result set.
      However for each row in the table, types_used still gets
      overwritten to default (no multiple values) and is also not set again
      (because path is already parsed). Since multiple values depend on the
      type of path, they dont get added to result set either.
      
      Fix:
      set default for types_used only if path is not parsed already.
      b915b96f
    • Jan Lindström's avatar
      Stabilize tests · 107d5460
      Jan Lindström authored
      galera_gcache_recover and galera_gcache_recover_manytrx
        grepping on error log is not always successful as messages
        might be in different order or contain different values
      
      galera_vote_sr
        We need to make sure required table creation has replicated
        as we use WSREP_ON=off
      107d5460