Skip to content

Commit 00fc86f

Browse files
committed
Remove test for using bash characters in tls/ssl file and directory names.
bash char substitution is not supported for other file options (e.g. read default file)
1 parent 14b1c8c commit 00fc86f

File tree

2 files changed

+0
-35
lines changed

2 files changed

+0
-35
lines changed

mysql-test/r/ssl_ca.result

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,3 @@ ERROR 2026 (HY000): SSL connection error: xxxx
66
# try to connect with correct '--ssl-ca' path : should connect
77
have_ssl
88
1
9-
#
10-
# Bug#21920678: SSL-CA DOES NOT ACCEPT ~USER TILDE HOME DIRECTORY
11-
# PATH SUBSTITUTION
12-
#
13-
# try to connect with '--ssl-ca' option using tilde home directoy
14-
# path substitution : should connect
15-
have_ssl
16-
1
17-
# try to connect with '--ssl-key' option using tilde home directoy
18-
# path substitution : should connect
19-
have_ssl
20-
1
21-
# try to connect with '--ssl-cert' option using tilde home directoy
22-
# path substitution : should connect
23-
have_ssl
24-
1

mysql-test/t/ssl_ca.test

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,3 @@
1414

1515
--echo # try to connect with correct '--ssl-ca' path : should connect
1616
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';"
17-
18-
--echo #
19-
--echo # Bug#21920678: SSL-CA DOES NOT ACCEPT ~USER TILDE HOME DIRECTORY
20-
--echo # PATH SUBSTITUTION
21-
--echo #
22-
23-
--let $mysql_test_dir_path= `SELECT IF(LENGTH('$HOME'), REPLACE('=$MYSQL_TEST_DIR', '=$HOME', '=~'), '=$MYSQL_TEST_DIR')`
24-
25-
--echo # try to connect with '--ssl-ca' option using tilde home directoy
26-
--echo # path substitution : should connect
27-
--exec $MYSQL --ssl-ca$mysql_test_dir_path/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';"
28-
29-
--echo # try to connect with '--ssl-key' option using tilde home directoy
30-
--echo # path substitution : should connect
31-
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key$mysql_test_dir_path/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';"
32-
33-
--echo # try to connect with '--ssl-cert' option using tilde home directoy
34-
--echo # path substitution : should connect
35-
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert$mysql_test_dir_path/std_data/client-cert.pem test -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';"

0 commit comments

Comments
 (0)