diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-12-15 18:27:11 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-12-15 18:27:11 +1100 |
| commit | fa01ffb08e53b5da7cc1bd61e06b6904b0dd9887 (patch) | |
| tree | 218367728cb3d97a75f09c9beec94ca69b26ace2 | |
| parent | 7df06dcbc39c45eaf887f32e27f76f45a31004dd (diff) | |
| parent | 03fee585c12cb6bc9e2e03b9c182fa4c6dad88b7 (diff) | |
| download | mariadb-git-fa01ffb08e53b5da7cc1bd61e06b6904b0dd9887.tar.gz | |
Merge branch '10.5' into 10.6
| -rwxr-xr-x | debian/additions/debian-start.inc.sh | 4 | ||||
| -rw-r--r-- | mysql-test/suite/galera/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera_3nodes/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera_sr/disabled.def | 2 |
4 files changed, 5 insertions, 3 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..b8c15a64377 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -21,3 +21,4 @@ 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 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" diff --git a/mysql-test/suite/galera_3nodes/disabled.def b/mysql-test/suite/galera_3nodes/disabled.def index 81b00219463..6923ca083ab 100644 --- a/mysql-test/suite/galera_3nodes/disabled.def +++ b/mysql-test/suite/galera_3nodes/disabled.def @@ -18,3 +18,4 @@ 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 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 |