MDEV-7761 Some MTR tests fail when run on a host named 'localhost'

vuvova · vuvova · commit ad297c51811d · 2025-07-21T10:24:14.000+02:00
skip the test in the unlikely case of hostname being "localhost"
diff --git a/mysql-test/include/hostname_is_not_localhost.inc b/mysql-test/include/hostname_is_not_localhost.inc
@@ -0,0 +1,3 @@
+if (`select @@hostname='localhost'`) {
+  skip need hostname!='localhost';
+}
diff --git a/mysql-test/main/explain_non_select.test b/mysql-test/main/explain_non_select.test
@@ -2,6 +2,7 @@
 # MariaDB tests for EXPLAIN UPDATE/DELETE.
 #
 --source include/have_partition.inc
+--source include/hostname_is_not_localhost.inc
 
 --disable_warnings
 drop table if exists t0, t1;
diff --git a/mysql-test/main/information_schema_db.test b/mysql-test/main/information_schema_db.test
@@ -3,6 +3,7 @@
 -- source include/not_embedded.inc
 -- source include/have_innodb.inc
 -- source include/testdb_only.inc
+-- source include/hostname_is_not_localhost.inc
 
 set local sql_mode="";
 set global sql_mode="";
diff --git a/mysql-test/main/mariadb-import.test b/mysql-test/main/mariadb-import.test
@@ -1,5 +1,6 @@
 --source include/not_embedded.inc
 --source include/have_innodb.inc
+--source include/hostname_is_not_localhost.inc
 
 # Basic test case for --table (restore single table)
 create table t1(i int);
diff --git a/mysql-test/main/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test
@@ -3,6 +3,7 @@
 -- source include/have_working_dns.inc
 -- source include/have_innodb.inc
 -- source include/have_partition.inc
+-- source include/hostname_is_not_localhost.inc
 
 let majorminor=`select substring_index(version(), '.', 2)`;
 # for major upgrade test, see below
diff --git a/mysql-test/main/selectivity_no_engine.test b/mysql-test/main/selectivity_no_engine.test
@@ -1,6 +1,7 @@
 --source include/have_stat_tables.inc
 --source include/default_optimizer_switch.inc
 --source include/test_db_charset_latin1.inc
+--source include/hostname_is_not_localhost.inc
 
 --echo #
 --echo #  Engine-agnostic tests for statistics-based selectivity calculations.
diff --git a/mysql-test/main/stat_tables.test b/mysql-test/main/stat_tables.test
@@ -4,6 +4,7 @@
 --source include/have_stat_tables.inc
 --source include/have_partition.inc
 --source include/have_sequence.inc
+--source include/hostname_is_not_localhost.inc
 
 select @@global.use_stat_tables;
 select @@session.use_stat_tables;
diff --git a/mysql-test/main/stat_tables_innodb.test b/mysql-test/main/stat_tables_innodb.test
@@ -1,6 +1,7 @@
 --source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 --source include/have_sequence.inc
+--source include/hostname_is_not_localhost.inc
 
 SET SESSION DEFAULT_STORAGE_ENGINE='InnoDB';
 
diff --git a/mysql-test/main/upgrade_MDEV-19650.test b/mysql-test/main/upgrade_MDEV-19650.test
@@ -1,4 +1,4 @@
-
+-- source include/hostname_is_not_localhost.inc
 -- source include/mysql_upgrade_preparation.inc
 
 call mtr.add_suppression("Cannot load from mysql.proc. The table is probably corrupted");
diff --git a/mysql-test/suite/perfschema/t/privilege_table_io.test b/mysql-test/suite/perfschema/t/privilege_table_io.test
@@ -3,6 +3,7 @@
 # sometimes contains duplicated entries of roles_mapping.
 
 --source include/not_embedded.inc
+--source include/hostname_is_not_localhost.inc
 --source include/have_perfschema.inc
 --source include/restart_mysqld.inc
 --source ../include/table_io_setup_helper.inc
diff --git a/mysql-test/suite/roles/acl_statistics.test b/mysql-test/suite/roles/acl_statistics.test
@@ -1,5 +1,6 @@
 # Test case for validating acl statistics for the feedback plugin.
 --source include/not_embedded.inc
+--source include/hostname_is_not_localhost.inc
 
 # First get a baseline of the initial statistics.
 SHOW STATUS LIKE 'Acl%';
diff --git a/mysql-test/suite/sysschema/t/v_privileges_by_table_by_level.test b/mysql-test/suite/sysschema/t/v_privileges_by_table_by_level.test
@@ -1,4 +1,5 @@
 -- source include/not_embedded.inc
+-- source include/hostname_is_not_localhost.inc
 # Tests for sys schema
 # Verify the sys.privileges_by_table_by_level view
 
diff --git a/storage/spider/mysql-test/spider/r/mdev_28009.result b/storage/spider/mysql-test/spider/r/mdev_28009.result
@@ -1,3 +1,4 @@
+call mtr.add_suppression('Can''t get hardware address with error');
 FOUND 1 /\[Warning\] .*spider-table-sts-thread-count is deprecated and will be removed in a future release/ in mysqld.1.1.err
 select @@spider_table_sts_thread_count;
 @@spider_table_sts_thread_count
diff --git a/storage/spider/mysql-test/spider/r/vector.result b/storage/spider/mysql-test/spider/r/vector.result
@@ -1,3 +1,4 @@
+call mtr.add_suppression('Can''t get hardware address with error');
 INSTALL SONAME 'ha_spider';
 SET spider_same_server_link= ON;
 create server s foreign data wrapper mysql options (host "127.0.0.1", database "test", user "root", port $MASTER_1_MYPORT);
diff --git a/storage/spider/mysql-test/spider/t/mdev_28009.test b/storage/spider/mysql-test/spider/t/mdev_28009.test
@@ -1,5 +1,6 @@
 # If log_warnings is lower than 2 then the deprecation warnings will
 # not be logged
+call mtr.add_suppression('Can''t get hardware address with error');
 if (`select @@log_warnings < 2`)
 {
   skip Test requires log_warnings > 1;
diff --git a/storage/spider/mysql-test/spider/t/vector.test b/storage/spider/mysql-test/spider/t/vector.test
@@ -1,4 +1,7 @@
+call mtr.add_suppression('Can''t get hardware address with error');
+--disable_warnings
 INSTALL SONAME 'ha_spider';
+--enable_warnings
 SET spider_same_server_link= ON;
 
 --evalp create server s foreign data wrapper mysql options (host "127.0.0.1", database "test", user "root", port $MASTER_1_MYPORT)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+if (`select @@hostname='localhost'`) {
	`2`	`+ skip need hostname!='localhost';`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`# MariaDB tests for EXPLAIN UPDATE/DELETE.`
`3`	`3`	`#`
`4`	`4`	`--source include/have_partition.inc`
	`5`	`+--source include/hostname_is_not_localhost.inc`
`5`	`6`
`6`	`7`	`--disable_warnings`
`7`	`8`	`drop table if exists t0, t1;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-`
	`1`	`+-- source include/hostname_is_not_localhost.inc`
`2`	`2`	`-- source include/mysql_upgrade_preparation.inc`
`3`	`3`
`4`	`4`	`call mtr.add_suppression("Cannot load from mysql.proc. The table is probably corrupted");`