Updated after testing

parent 7d29c2a4
......@@ -1166,7 +1166,7 @@ sub check_ssl_support () {
mtr_error("Couldn't find support for SSL");
return;
}
mtr_report("Skipping SSL, mysqld does not support it");
mtr_report("Skipping SSL, mysqld not compiled with SSL");
$opt_ssl_supported= 0;
$opt_ssl= 0;
return;
......@@ -1205,7 +1205,7 @@ sub check_ndbcluster_support () {
"--help"],
"", "/dev/null", "/dev/null", "") != 0 )
{
mtr_report("Skipping ndbcluster, mysqld does not support it");
mtr_report("Skipping ndbcluster, mysqld not compiled with ndbcluster");
$opt_with_ndbcluster= 0;
return;
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -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';
......@@ -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';
......@@ -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';
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment