mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 02:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2023-05-22 08:38:21 +03:00
commit eb2e074494
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -331,6 +331,7 @@ mysql-test-run-asan:
needs: needs:
- "fedora-sanitizer: [-DWITH_ASAN=YES]" - "fedora-sanitizer: [-DWITH_ASAN=YES]"
<<: *mysql-test-run-def <<: *mysql-test-run-def
allow_failure: true
artifacts: artifacts:
when: always # Also show results when tests fail when: always # Also show results when tests fail
reports: reports:

7
sql/handler.cc
View file

@ -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 concurrent accesses. And it's an overkill to take LOCK_plugin and
iterate the whole installed_htons[] array every time. 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 bf_thd brute force THD asking for the abort
@param victim_thd victim THD to be aborted @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) && if (!WSREP(bf_thd) &&
!(bf_thd->variables.wsrep_OSU_method == WSREP_OSU_RSU && !(bf_thd->variables.wsrep_OSU_method == WSREP_OSU_RSU &&
wsrep_thd_is_toi(bf_thd))) { 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); DBUG_RETURN(0);
} }
@ -7994,6 +7999,8 @@ int ha_abort_transaction(THD *bf_thd, THD *victim_thd, my_bool signal)
else else
{ {
WSREP_WARN("Cannot abort InnoDB transaction"); 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); DBUG_RETURN(0);

4
storage/innobase/fil/fil0fil.cc
View file

@ -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. */ /** Close the file handle. */