diff options
| author | Georg Richter <georg@mariadb.com> | 2016-10-06 12:31:23 +0200 |
|---|---|---|
| committer | Georg Richter <georg@mariadb.com> | 2016-10-06 12:31:23 +0200 |
| commit | 00fc86f1af81786b85f380bc03c03938552b60e6 (patch) | |
| tree | f40590300bcb3f9580be5de2f20055ce68886a45 | |
| parent | 14b1c8c80d89ab54cadedf94fa7604b8f917aecd (diff) | |
| download | mariadb-git-00fc86f1af81786b85f380bc03c03938552b60e6.tar.gz | |
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)
| -rw-r--r-- | mysql-test/r/ssl_ca.result | 16 | ||||
| -rw-r--r-- | mysql-test/t/ssl_ca.test | 19 |
2 files changed, 0 insertions, 35 deletions
diff --git a/mysql-test/r/ssl_ca.result b/mysql-test/r/ssl_ca.result index 8ea3e30eb06..afffe4e4dff 100644 --- a/mysql-test/r/ssl_ca.result +++ b/mysql-test/r/ssl_ca.result @@ -6,19 +6,3 @@ ERROR 2026 (HY000): SSL connection error: xxxx # try to connect with correct '--ssl-ca' path : should connect have_ssl 1 -# -# Bug#21920678: SSL-CA DOES NOT ACCEPT ~USER TILDE HOME DIRECTORY -# PATH SUBSTITUTION -# -# try to connect with '--ssl-ca' option using tilde home directoy -# path substitution : should connect -have_ssl -1 -# try to connect with '--ssl-key' option using tilde home directoy -# path substitution : should connect -have_ssl -1 -# try to connect with '--ssl-cert' option using tilde home directoy -# path substitution : should connect -have_ssl -1 diff --git a/mysql-test/t/ssl_ca.test b/mysql-test/t/ssl_ca.test index 5870d9598fc..106da140130 100644 --- a/mysql-test/t/ssl_ca.test +++ b/mysql-test/t/ssl_ca.test @@ -14,22 +14,3 @@ --echo # try to connect with correct '--ssl-ca' path : should connect --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';" - ---echo # ---echo # Bug#21920678: SSL-CA DOES NOT ACCEPT ~USER TILDE HOME DIRECTORY ---echo # PATH SUBSTITUTION ---echo # - ---let $mysql_test_dir_path= `SELECT IF(LENGTH('$HOME'), REPLACE('=$MYSQL_TEST_DIR', '=$HOME', '=~'), '=$MYSQL_TEST_DIR')` - ---echo # try to connect with '--ssl-ca' option using tilde home directoy ---echo # path substitution : should connect ---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';" - ---echo # try to connect with '--ssl-key' option using tilde home directoy ---echo # path substitution : should connect ---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';" - ---echo # try to connect with '--ssl-cert' option using tilde home directoy ---echo # path substitution : should connect ---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';" |