1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add "have_ssl" as synonym for "have_openssl"

Browse Source
This commit is contained in:
msvensson@pilot.blaudden 2007-03-05 10:03:42 +01:00
parent ab61d07a30
commit 9a2eea4019
14 changed files with 25 additions and 22 deletions
Show Stats 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 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 # This test can't be in func_encrypt.test, because it requires
# --des-key-file to not be set. # --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 --disable_warnings
drop table if exists t1; 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. # Tests for SSL connections, only run if mysqld is compiled
# Use mysql-test-run with --with-openssl option. # with support for SSL.
-- source include/have_openssl.inc
-- source include/have_ssl.inc
--disable_warnings --disable_warnings
drop table if exists t1; 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; source include/master-slave.inc;
# We don't test all types of ssl auth params here since it's a bit hard # 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 # Turn on ssl between the client and server
# and run a number of tests # and run a number of tests
-- source include/have_openssl.inc -- source include/have_ssl.inc
connect (ssl_con,localhost,root,,,,,SSL); 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 # Turn on compression between the client and server
# and run a number of tests # and run a number of tests
-- source include/have_openssl.inc -- source include/have_ssl.inc
-- source include/have_compress.inc -- source include/have_compress.inc
connect (ssl_compress_con,localhost,root,,,,,SSL COMPRESS); 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 # 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 # then turn on ssl between the client and server
# and run a number of standard tests # 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 by ip to avoid turning on "ssl-verify-server-cert"
connect (ssl_con,127.0.0.1,root,,,,$MASTER_MYPORT,SSL); connect (ssl_con,127.0.0.1,root,,,,$MASTER_MYPORT,SSL);

2
sql/mysql_priv.h
View File

@ -1383,7 +1383,7 @@ extern handlerton myisammrg_hton;
#define have_merge_db myisammrg_hton.state #define have_merge_db myisammrg_hton.state
extern SHOW_COMP_OPTION have_isam; extern SHOW_COMP_OPTION have_isam;
extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_dlopen; extern SHOW_COMP_OPTION have_raid, have_ssl, have_symlink, have_dlopen;
extern SHOW_COMP_OPTION have_query_cache; extern SHOW_COMP_OPTION have_query_cache;
extern SHOW_COMP_OPTION have_geometry, have_rtree_keys; extern SHOW_COMP_OPTION have_geometry, have_rtree_keys;
extern SHOW_COMP_OPTION have_crypt; extern SHOW_COMP_OPTION have_crypt;

10
sql/mysqld.cc
View File

@ -489,7 +489,7 @@ CHARSET_INFO *national_charset_info, *table_alias_charset;
CHARSET_INFO *character_set_filesystem; CHARSET_INFO *character_set_filesystem;
SHOW_COMP_OPTION have_isam; SHOW_COMP_OPTION have_isam;
SHOW_COMP_OPTION have_raid, have_openssl, have_symlink, have_query_cache; SHOW_COMP_OPTION have_raid, have_ssl, have_symlink, have_query_cache;
SHOW_COMP_OPTION have_geometry, have_rtree_keys, have_dlopen; SHOW_COMP_OPTION have_geometry, have_rtree_keys, have_dlopen;
SHOW_COMP_OPTION have_crypt, have_compress; SHOW_COMP_OPTION have_crypt, have_compress;
@ -3017,12 +3017,12 @@ static void init_ssl()
if (!ssl_acceptor_fd) if (!ssl_acceptor_fd)
{ {
opt_use_ssl = 0; opt_use_ssl = 0;
have_openssl= SHOW_OPTION_DISABLED; have_ssl= SHOW_OPTION_DISABLED;
} }
} }
else else
{ {
have_openssl= SHOW_OPTION_DISABLED; have_ssl= SHOW_OPTION_DISABLED;
} }
if (des_key_file) if (des_key_file)
load_des_key_file(des_key_file); load_des_key_file(des_key_file);
@ -6591,9 +6591,9 @@ static void mysql_init_variables(void)
have_raid=SHOW_OPTION_NO; have_raid=SHOW_OPTION_NO;
#endif #endif
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
have_openssl=SHOW_OPTION_YES; have_ssl=SHOW_OPTION_YES;
#else #else
have_openssl=SHOW_OPTION_NO; have_ssl=SHOW_OPTION_NO;
#endif #endif
#ifdef HAVE_BROKEN_REALPATH #ifdef HAVE_BROKEN_REALPATH
have_symlink=SHOW_OPTION_NO; have_symlink=SHOW_OPTION_NO;

4
sql/set_var.cc
View File

@ -874,7 +874,9 @@ struct show_var_st init_vars[]= {
{"have_isam", (char*) &have_isam, SHOW_HAVE}, {"have_isam", (char*) &have_isam, SHOW_HAVE},
{"have_merge_engine", (char*) &have_merge_db, SHOW_HAVE}, {"have_merge_engine", (char*) &have_merge_db, SHOW_HAVE},
{"have_ndbcluster", (char*) &have_ndbcluster, SHOW_HAVE}, {"have_ndbcluster", (char*) &have_ndbcluster, SHOW_HAVE},
{"have_openssl", (char*) &have_openssl, SHOW_HAVE}, /* have_openssl is just and alias for have_ssl */
{"have_openssl", (char*) &have_ssl, SHOW_HAVE},
{"have_ssl", (char*) &have_ssl, SHOW_HAVE},
{"have_query_cache", (char*) &have_query_cache, SHOW_HAVE}, {"have_query_cache", (char*) &have_query_cache, SHOW_HAVE},
{"have_raid", (char*) &have_raid, SHOW_HAVE}, {"have_raid", (char*) &have_raid, SHOW_HAVE},
{"have_rtree_keys", (char*) &have_rtree_keys, SHOW_HAVE}, {"have_rtree_keys", (char*) &have_rtree_keys, SHOW_HAVE},