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

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2020-08-21 11:53:55 +03:00
commit f2739e2a96
2 changed files with 23 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scripts/mysqld_safe.sh
View file

@ -23,7 +23,6 @@ numa_interleave=0
wsrep_on=0
dry_run=0
defaults_group_suffix=
ignore_unknown=1
# Initial logging status: error log is not open, and not using syslog
logging=init
@ -371,22 +370,11 @@ parse_arguments() {
--help) usage ;;
--ignore-unknown) ignore_unknown=1 ;;
--no-ignore-unknown|--not-ignore-unknown) ignore_unknown=0 ;;
*)
if test $ignore_unknown -eq 0
then
case "$unrecognized_handling" in
collect) append_arg_to_args "$arg" ;;
complain) log_error "unknown option '$arg'"
esac
else
case "$arg" in
"--loose-"*) append_arg_to_args "$arg" ;;
*) append_arg_to_args "--loose-$arg"
esac
fi
case "$unrecognized_handling" in
collect) append_arg_to_args "$arg" ;;
complain) log_error "unknown option '$arg'" ;;
esac
esac
done
}

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

@ -1496,21 +1496,27 @@ void fil_system_t::create(ulint hash_size)
void fil_system_t::close()
{
ut_ad(this == &fil_system);
ut_a(!UT_LIST_GET_LEN(LRU));
ut_a(unflushed_spaces.empty());
ut_a(!UT_LIST_GET_LEN(space_list));
ut_ad(!sys_space);
ut_ad(!temp_space);
ut_ad(this == &fil_system);
ut_a(!UT_LIST_GET_LEN(LRU));
ut_a(unflushed_spaces.empty());
ut_a(!UT_LIST_GET_LEN(space_list));
ut_ad(!sys_space);
ut_ad(!temp_space);
if (is_initialised()) {
m_initialised = false;
spaces.free();
mutex_free(&mutex);
fil_space_crypt_cleanup();
}
if (is_initialised())
{
m_initialised= false;
spaces.free();
mutex_free(&mutex);
fil_space_crypt_cleanup();
}
ut_ad(!spaces.array);
ut_ad(!spaces.array);
#ifdef UNIV_LINUX
ssd.clear();
ssd.shrink_to_fit();
#endif /* UNIV_LINUX */
}
/** Opens all system tablespace data files. They stay open until the