summaryrefslogtreecommitdiff
path: root/mysql-test/t/ssl.test
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-10-12 13:56:07 +0200
committerunknown <msvensson@neptunus.(none)>2005-10-12 13:56:07 +0200
commit2bb0501d655bfc072dfc7a80e337904cd7865073 (patch)
tree5f053dd50effadde3efbece9a9d1399ad9d4e578 /mysql-test/t/ssl.test
parent20fdedb7569f11787f142629c81228439c1895b7 (diff)
downloadmariadb-git-2bb0501d655bfc072dfc7a80e337904cd7865073.tar.gz
Always test ssl and compress
- Updated after review client/mysqltest.c: Updated after review. Fix "connect" command to take SSL and/or COMPRESS as options instead of enable/disable_ssl and enable/disable_compress Commented do_connect, added test cases etc. Fix safe_get_param to make it possible to call it once for every argument without having any checks inbetween. Make a copy for query->first_argument since safe_get_param will modify query string. Now connect works inside a while loop as well. mysql-test/mysql-test-run.pl: Updated after review mysql-test/r/connect.result: Enable test that was previolsy disabled because of "no error handling" in connect mysql-test/r/mysqltest.result: Added tests for "connect" mysql-test/t/compress.test: Updated after review, use the option argument to connect mysql-test/t/connect.test: Enable test that was previolsy disabled because of "no error handling" in connect Now it's possible to use "--error" before connect, so let's use it. mysql-test/t/information_schema.test: Connection user4 was already used mysql-test/t/myisam.test: Disconnect con1 so the name can be reused mysql-test/t/mysqltest.test: Added tests for "connect" mysql-test/t/openssl_1.test: Updated after review, use the option argument to connect mysql-test/t/sp-security.test: Disconnect user1 connection so the name can be reused mysql-test/t/ssl.test: Updated after review, use the option argument to connect mysql-test/t/ssl_compress.test: Updated after review, use the option argument to connect sql/mysqld.cc: Updated after review, Compression variable is always available sql/sql_show.cc: Updated after review, Compression variable is always available sql/structs.h: Updated after review, Compression variable is always available
Diffstat (limited to 'mysql-test/t/ssl.test')
-rw-r--r--mysql-test/t/ssl.test5
1 files changed, 1 insertions, 4 deletions
diff --git a/mysql-test/t/ssl.test b/mysql-test/t/ssl.test
index d13bec60c2b..921b3262013 100644
--- a/mysql-test/t/ssl.test
+++ b/mysql-test/t/ssl.test
@@ -3,12 +3,10 @@
-- source include/have_openssl.inc
-enable_ssl;
-
# Reconnect to turn ssl on for
# default connection
disconnect default;
-connect (default,localhost,root,,);
+connect (default,localhost,root,,,,,SSL);
# Check ssl turned on
SHOW STATUS LIKE 'Ssl_cipher';
@@ -16,6 +14,5 @@ SHOW STATUS LIKE 'Ssl_cipher';
# Source select test case
-- source t/select.test
-disable_ssl;