From 8a2b4d531dc661ee605eeecdfc901bc833f86564 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 11 Jun 2021 14:30:42 +1000 Subject: [PATCH] MDEV-20162: fix connect-abstract test case The check-testcase record uses a mysqltest connection to the database to do the recording. With the server configured as an abstract socket, the mysqltest client cannot connect and fails. We work around this by starting the server as normal and then restart with an abstract socket and test this. This didn't affect Windows as it just did a tcp connection. So this did affect all unix socket based systems except Linux as this was the only one that supported abstract sockets. --- mysql-test/main/connect-abstract.cnf | 3 --- mysql-test/main/connect-abstract.result | 2 -- mysql-test/main/connect-abstract.test | 5 ++++- mysql-test/unstable-tests | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/mysql-test/main/connect-abstract.cnf b/mysql-test/main/connect-abstract.cnf index 5798c4f2f2aab..ed7dbd838f02e 100644 --- a/mysql-test/main/connect-abstract.cnf +++ b/mysql-test/main/connect-abstract.cnf @@ -1,9 +1,6 @@ !include include/default_my.cnf -[mysqld.1] -socket= @ENV.ABSTRACT_SOCKET - # Using @OPT.port here for uniqueness [ENV] ABSTRACT_SOCKET= @mtr-test-abstract-socket-@OPT.port diff --git a/mysql-test/main/connect-abstract.result b/mysql-test/main/connect-abstract.result index 68a9674dfaad0..8f7c125196a0d 100644 --- a/mysql-test/main/connect-abstract.result +++ b/mysql-test/main/connect-abstract.result @@ -1,5 +1,3 @@ -connect con1,localhost,root,,test,,$ABSTRACT_SOCKET; select 1; 1 1 -disconnect con1; diff --git a/mysql-test/main/connect-abstract.test b/mysql-test/main/connect-abstract.test index 0f212fe5a0d20..09bc607e0e8f2 100644 --- a/mysql-test/main/connect-abstract.test +++ b/mysql-test/main/connect-abstract.test @@ -1,6 +1,9 @@ --source include/linux.inc --source include/not_embedded.inc +let $restart_parameters=--socket=$ABSTRACT_SOCKET +--source include/kill_mysqld.inc +--source include/start_mysqld.inc + connect(con1,localhost,root,,test,,$ABSTRACT_SOCKET); select 1; -disconnect con1; diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests index df4a1e7444768..a76912f4c7881 100644 --- a/mysql-test/unstable-tests +++ b/mysql-test/unstable-tests @@ -37,7 +37,6 @@ main.backup_stages : MDEV-23401 - Bad file descriptor main.binary_to_hex : MDEV-20211 - Wrong result main.check_constraint : Modified in 10.4.18 main.connect : MDEV-17282 - Wrong result -main.connect-abstract : MDEV-20162 - Could not execute 'check-testcase' main.connect2 : MDEV-13885 - Server crash main.create : Modified in 10.4.18 main.create_delayed : MDEV-10605 - failed with timeout