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

Merge 10.6 into 10.7

Browse source
This commit is contained in:
Marko Mäkelä 2022-12-16 10:31:22 +02:00
commit 299280738c
6 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debian/additions/debian-start.inc.sh vendored
View file

@ -27,7 +27,7 @@ function check_for_crashed_tables() {
select concat('\''select count(*) into @discard from `'\'',
TABLE_SCHEMA, '\''`.`'\'', TABLE_NAME, '\''`'\'')
from information_schema.TABLES where TABLE_SCHEMA<>'\''INFORMATION_SCHEMA'\'' and TABLE_SCHEMA<>'\''PERFORMANCE_SCHEMA'\'' and ( ENGINE='\''MyISAM'\'' or ENGINE='\''Aria'\'' )' | \
xargs -i "${MARIADB}" --skip-column-names --silent --batch \
xargs -i ${MARIADB} --skip-column-names --silent --batch \
--force -e "{}" &>"${tempfile}"
set -e
@ -72,7 +72,7 @@ function check_root_accounts() {
logger -p daemon.info -i -t"$0" "Checking for insecure root accounts."
ret=$( echo "SELECT count(*) FROM mysql.user WHERE user='root' and password='' and plugin in ('', 'mysql_native_password', 'mysql_old_password');" | "$MARIADB" --skip-column-names )
ret=$( echo "SELECT count(*) FROM mysql.user WHERE user='root' and password='' and plugin in ('', 'mysql_native_password', 'mysql_old_password');" | $MARIADB --skip-column-names )
if [ "$ret" -ne "0" ]; then
logger -p daemon.warn -i -t"$0" "WARNING: mysql.user contains $ret root accounts without password!"
fi

4
mysql-test/suite/galera/disabled.def
View file

@ -20,4 +20,8 @@ galera_var_notify_ssl_ipv6 : MDEV-29861 Galera test case hangs
galera_var_node_address : MDEV-20485 Galera test failure
MDEV-26575 : MDEV-29878 Galera test failure on MDEV-26575
galera_bf_abort_shutdown : MDEV-29918 Assertion failure on galera_bf_abort_shutdown
# Links to below failures in MDEV-30172
galera_wan : [ERROR] WSREP: /home/buildbot/buildbot/build/gcs/src/gcs_state_msg.cpp:gcs_state_msg_get_quorum():947: Failed to establish quorum.
galera_var_ignore_apply_errors : 28: "Server did not transition to READY state"
galera_bf_kill_debug : timeout after 900 seconds
galera_ssl_upgrade : [Warning] Failed to load slave replication state from table mysql.gtid_slave_pos: 130: Incorrect file format 'gtid_slave_pos'

5
mysql-test/suite/galera_3nodes/disabled.def
View file

@ -18,3 +18,8 @@ galera_vote_rejoin_mysqldump : MDEV-24481: galera_3nodes.galera_vote_rejoin_mysq
galera_ssl_reload : MDEV-30172 At line 50: mysql_shutdown failed
GCF-354 : mysqltest: At line 39: query 'DROP TABLE test.t1' failed: 1047: WSREP has not yet prepared node for application use
GCF-354 : mysqltest: At line 30: query 'INSERT INTO test.t1 values (1)' failed: 1180: Got error 6 "No such device or address"
galera_ipv6_mysqldump : mysql_shutdown failed
# Opensuse/suse/rocky9/rocky84/rhel9/rhel8-ppc64le .. - all same IPv6 isn't configured right or skipping or galera
galera_ipv6_mysqldump : Can't connect to server on '::1' (115)
galera_ipv6_rsync : Can't connect to server on '::1' (115)
galera_ipv6_rsync_section : Can't connect to server on '::1' (115)

2
mysql-test/suite/galera_sr/disabled.def
View file

@ -12,4 +12,4 @@
GCF-1060 : MDEV-26528 wrong usage of mutex LOCK_thd_kill and LOCK_thd_kill
galera_sr_cc_master : MDEV-29882 Galera test failure on galera_sr_cc_master
mysql-wsrep-features#138 : At line 25: query 'DROP TABLE t1' failed: 2013: Lost connection to MySQL server during query

6
storage/innobase/handler/handler0alter.cc
View file

@ -10101,6 +10101,7 @@ commit_try_rebuild(
ha_innobase_inplace_ctx*ctx,
TABLE* altered_table,
const TABLE* old_table,
bool statistics_exist,
trx_t* trx,
const char* table_name)
{
@ -10171,7 +10172,9 @@ commit_try_rebuild(
if (error == DB_SUCCESS) {
/* The statistics for the surviving indexes will be
re-inserted in alter_stats_rebuild(). */
error = trx->drop_table_statistics(old_name);
if (statistics_exist) {
error = trx->drop_table_statistics(old_name);
}
if (error == DB_SUCCESS) {
error = trx->drop_table(*user_table);
}
@ -11316,6 +11319,7 @@ fail:
if (commit_try_rebuild(ha_alter_info, ctx,
altered_table, table,
table_stats && index_stats,
trx,
table_share->table_name.str)) {
goto fail;

5
storage/innobase/include/fil0fil.h
View file

@ -1547,9 +1547,10 @@ template<bool have_reference> inline void fil_space_t::flush()
}
else if (have_reference)
flush_low();
else if (!(acquire_low() & STOPPING))
else
{
flush_low();
if (!(acquire_low() & (STOPPING | CLOSING)))
flush_low();
release();
}
}