Merge 10.5 into 10.6

MariaDB · May 22, 2023 · eb2e074 · eb2e074
2 parents f307160 + 3f59bbe
commit eb2e074
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -331,6 +331,7 @@ mysql-test-run-asan:
  needs:
  - "fedora-sanitizer: [-DWITH_ASAN=YES]"
  <<: *mysql-test-run-def
+ allow_failure: true
  artifacts:
  when: always # Also show results when tests fail
  reports:

diff --git a/sql/handler.cc b/sql/handler.cc
@@ -7970,6 +7970,9 @@ Compare_keys handler::compare_key_parts(const Field &old_field,
  concurrent accesses. And it's an overkill to take LOCK_plugin and
  iterate the whole installed_htons[] array every time.
 
+ @note Object victim_thd is not guaranteed to exist after this
+ function returns.
+
  @param bf_thd brute force THD asking for the abort
  @param victim_thd victim THD to be aborted
 
@@ -7983,6 +7986,8 @@ int ha_abort_transaction(THD *bf_thd, THD *victim_thd, my_bool signal)
  if (!WSREP(bf_thd) &&
  !(bf_thd->variables.wsrep_OSU_method == WSREP_OSU_RSU &&
  wsrep_thd_is_toi(bf_thd))) {
+ mysql_mutex_unlock(&victim_thd->LOCK_thd_data);
+ mysql_mutex_unlock(&victim_thd->LOCK_thd_kill);
  DBUG_RETURN(0);
  }
 
@@ -7994,6 +7999,8 @@ int ha_abort_transaction(THD *bf_thd, THD *victim_thd, my_bool signal)
  else
  {
  WSREP_WARN("Cannot abort InnoDB transaction");
+ mysql_mutex_unlock(&victim_thd->LOCK_thd_data);
+ mysql_mutex_unlock(&victim_thd->LOCK_thd_kill);
  }
 
  DBUG_RETURN(0);

diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
@@ -446,7 +446,9 @@ static bool fil_node_open_file(fil_node_t *node)
  }
  }
 
- return fil_node_open_file_low(node);
+ /* The node can be opened beween releasing and acquiring fil_system.mutex
+ in the above code */
+ return node->is_open() || fil_node_open_file_low(node);
 }
 
 /** Close the file handle. */