mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add "have_ssl" as synonym for "have_openssl"

Browse source 
mysql-test/t/openssl_1.test:
  Add "have_ssl" as synonym for "have_openssl"
  Correct comment
This commit is contained in:
unknown 2007-03-05 10:03:42 +01:00
commit 3880c80fc6
14 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/include/have_openssl.inc
View file

@ -1,4 +0,0 @@
-- require r/have_openssl.require
disable_query_log;
show variables like "have_openssl";
enable_query_log;

4
mysql-test/include/have_ssl.inc Normal file
View file

@ -0,0 +1,4 @@
-- require r/have_ssl.require
disable_query_log;
show variables like "have_ssl";
enable_query_log;

2
mysql-test/r/have_openssl.require → mysql-test/r/have_ssl.require
View file

@ -1,2 +1,2 @@
Variable_name Value
have_openssl YES
have_ssl YES

2
mysql-test/t/func_des_encrypt.test
View file

@ -1,4 +1,4 @@
-- source include/have_openssl.inc
-- source include/have_ssl.inc
# This test can't be in func_encrypt.test, because it requires
# --des-key-file to not be set.

2
mysql-test/t/func_encrypt.test
View file

@ -1,4 +1,4 @@
-- source include/have_openssl.inc
-- source include/have_ssl.inc
--disable_warnings
drop table if exists t1;

7
mysql-test/t/openssl_1.test
View file

@ -1,6 +1,7 @@
# We test openssl. Result set is optimized to be compiled with --with-openssl.
# Use mysql-test-run with --with-openssl option.
-- source include/have_openssl.inc
# Tests for SSL connections, only run if mysqld is compiled
# with support for SSL.
-- source include/have_ssl.inc
--disable_warnings
drop table if exists t1;

2
mysql-test/t/rpl_openssl.test
View file

@ -1,4 +1,4 @@
source include/have_openssl.inc;
source include/have_ssl.inc;
source include/master-slave.inc;
# We don't test all types of ssl auth params here since it's a bit hard

2
mysql-test/t/ssl.test
View file

@ -1,7 +1,7 @@
# Turn on ssl between the client and server
# and run a number of tests
-- source include/have_openssl.inc
-- source include/have_ssl.inc
connect (ssl_con,localhost,root,,,,,SSL);

2
mysql-test/t/ssl_compress.test
View file

@ -1,7 +1,7 @@
# Turn on compression between the client and server
# and run a number of tests
-- source include/have_openssl.inc
-- source include/have_ssl.inc
-- source include/have_compress.inc
connect (ssl_compress_con,localhost,root,,,,,SSL COMPRESS);

2
mysql-test/t/ssl_connect.test
View file

@ -1,5 +1,5 @@
-- source include/have_openssl.inc
-- source include/have_ssl.inc
# Repeat connect/disconnect

2
mysql-test/t/ssl_des.test
View file

@ -2,7 +2,7 @@
# then turn on ssl between the client and server
# and run a number of standard tests
-- source include/have_openssl.inc
-- source include/have_ssl.inc
# Connect by ip to avoid turning on "ssl-verify-server-cert"
connect (ssl_con,127.0.0.1,root,,,,$MASTER_MYPORT,SSL);