Skip to content

Commit

Permalink
MDEV-20162: fix connect-abstract test case
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
grooverdan committed Jun 11, 2021
1 parent e85df7f commit 8a2b4d5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
3 changes: 0 additions & 3 deletions 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
2 changes: 0 additions & 2 deletions mysql-test/main/connect-abstract.result
@@ -1,5 +1,3 @@
connect con1,localhost,root,,test,,$ABSTRACT_SOCKET;
select 1;
1
1
disconnect con1;
5 changes: 4 additions & 1 deletion 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;
1 change: 0 additions & 1 deletion mysql-test/unstable-tests
Expand Up @@ -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
Expand Down

0 comments on commit 8a2b4d5

Please sign in to comment.