diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-16 10:54:33 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-12-16 10:54:33 +0200 |
commit | 8bddaddc6fcd4f146252c2dc149ecbc51cd6c788 (patch) | |
tree | f5c359b1c9ab641ee139fcb8c2d83a93dec8e7d0 | |
parent | 89480340ba7eabfaff1ea8f51437324cb3d5964f (diff) | |
parent | 84774de49af133b6e702e51c0b0e69173a0594cd (diff) | |
download | mariadb-git-8bddaddc6fcd4f146252c2dc149ecbc51cd6c788.tar.gz |
Merge 10.7 into 10.8
-rwxr-xr-x | debian/additions/debian-start.inc.sh | 4 | ||||
-rw-r--r-- | mysql-test/suite/galera/disabled.def | 5 | ||||
-rw-r--r-- | mysql-test/suite/galera_3nodes/disabled.def | 5 | ||||
-rw-r--r-- | mysql-test/suite/galera_sr/disabled.def | 2 | ||||
-rw-r--r-- | storage/innobase/handler/handler0alter.cc | 6 | ||||
-rw-r--r-- | storage/innobase/include/fil0fil.h | 5 |
6 files changed, 21 insertions, 6 deletions
diff --git a/debian/additions/debian-start.inc.sh b/debian/additions/debian-start.inc.sh index 8a59f877aca..74340e78480 100755 --- a/debian/additions/debian-start.inc.sh +++ b/debian/additions/debian-start.inc.sh @@ -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 diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 1847490c888..a9c2c3cbf16 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -20,4 +20,9 @@ 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' +galera_parallel_simple : timeout related to wsrep_sync_wait diff --git a/mysql-test/suite/galera_3nodes/disabled.def b/mysql-test/suite/galera_3nodes/disabled.def index 0794f4a386f..5b58ce4bbe5 100644 --- a/mysql-test/suite/galera_3nodes/disabled.def +++ b/mysql-test/suite/galera_3nodes/disabled.def @@ -20,3 +20,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) diff --git a/mysql-test/suite/galera_sr/disabled.def b/mysql-test/suite/galera_sr/disabled.def index 5942cd9e814..1132a0097c4 100644 --- a/mysql-test/suite/galera_sr/disabled.def +++ b/mysql-test/suite/galera_sr/disabled.def @@ -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 diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 42b7afd0256..9e9c0dc67e8 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -10120,6 +10120,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) { @@ -10190,7 +10191,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); } @@ -11335,6 +11338,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; diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 09626569f09..940e1b68458 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -1534,9 +1534,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(); } } |