summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-10-13 11:28:06 +0200
committerunknown <msvensson@neptunus.(none)>2005-10-13 11:28:06 +0200
commitc7ff3bdb987e2e336c174c6cee521900932a6a53 (patch)
treeb16d012169c367cc7c751e20be9b2a01fc98c63e /mysql-test/t
parentefc190e7d9e4f17ec320f56a0b8f851d1c67103a (diff)
downloadmariadb-git-c7ff3bdb987e2e336c174c6cee521900932a6a53.tar.gz
Updated after testing
mysql-test/mysql-test-run.pl: Improved printouts mysql-test/r/compress.result: Updated test result mysql-test/r/ssl.result: Updated test result mysql-test/r/ssl_compress.result: Updated test result mysql-test/t/compress.test: Use new connection Use common include file Test feature is turned on both before and after tests mysql-test/t/ssl.test: Use new connection Use common include file Test feature is turned on both before and after tests mysql-test/t/ssl_compress.test: Use new connection Use common include file Test feature is turned on both before and after tests
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/compress.test10
-rw-r--r--mysql-test/t/ssl.test9
-rw-r--r--mysql-test/t/ssl_compress.test13
3 files changed, 15 insertions, 17 deletions
diff --git a/mysql-test/t/compress.test b/mysql-test/t/compress.test
index fb1c8793f33..46244edd2a8 100644
--- a/mysql-test/t/compress.test
+++ b/mysql-test/t/compress.test
@@ -3,15 +3,13 @@
-- source include/have_compress.inc
-
-# Reconnect to turn compress on for
-# default connection
-disconnect default;
-connect (default,localhost,root,,,,,COMPRESS);
+connect (comp_con,localhost,root,,,,,COMPRESS);
# Check compression turned on
SHOW STATUS LIKE 'Compression';
# Source select test case
--- source t/select.test
+-- source include/common-tests.inc
+# Check compression turned on
+SHOW STATUS LIKE 'Compression';
diff --git a/mysql-test/t/ssl.test b/mysql-test/t/ssl.test
index 921b3262013..de88569d74a 100644
--- a/mysql-test/t/ssl.test
+++ b/mysql-test/t/ssl.test
@@ -3,16 +3,15 @@
-- source include/have_openssl.inc
-# Reconnect to turn ssl on for
-# default connection
-disconnect default;
-connect (default,localhost,root,,,,,SSL);
+connect (ssl_con,localhost,root,,,,,SSL);
# Check ssl turned on
SHOW STATUS LIKE 'Ssl_cipher';
# Source select test case
--- source t/select.test
+-- source include/common-tests.inc
+# Check ssl turned on
+SHOW STATUS LIKE 'Ssl_cipher';
diff --git a/mysql-test/t/ssl_compress.test b/mysql-test/t/ssl_compress.test
index 2d40b85c33d..f5fe86e9a81 100644
--- a/mysql-test/t/ssl_compress.test
+++ b/mysql-test/t/ssl_compress.test
@@ -4,11 +4,7 @@
-- source include/have_openssl.inc
-- source include/have_compress.inc
-
-# Reconnect to turn ssl and compress on for
-# default connection
-disconnect default;
-connect (default,localhost,root,,,,,SSL COMPRESS);
+connect (ssl_compress_con,localhost,root,,,,,SSL COMPRESS);
# Check ssl turned on
SHOW STATUS LIKE 'Ssl_cipher';
@@ -17,5 +13,10 @@ SHOW STATUS LIKE 'Ssl_cipher';
SHOW STATUS LIKE 'Compression';
# Source select test case
--- source t/select.test
+-- source include/common-tests.inc
+
+# Check ssl turned on
+SHOW STATUS LIKE 'Ssl_cipher';
+# Check compression turned on
+SHOW STATUS LIKE 'Compression';