Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
1 parent
e85df7f
commit 8a2b4d5
Showing
4 changed files
with
4 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
connect con1,localhost,root,,test,,$ABSTRACT_SOCKET; | ||
select 1; | ||
1 | ||
1 | ||
disconnect con1; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters