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

Merge a couple more fixes from 10.0-base to 10.0

Browse Source
This commit is contained in:
unknown 2012-12-18 22:13:14 +01:00
commit 421bbdcf10
8 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/include/have_debug_sync.inc
View File

@ -1,3 +1,4 @@
if (`select @@debug_sync not like 'ON %'`) { if (`SELECT COUNT(*) = 0 FROM information_schema.session_variables WHERE
--skip Needs a debug_sync enabled variable_name = 'debug_sync' AND variable_value LIKE 'ON %'`) {
--skip Needs debug_sync enabled
} }

4
mysql-test/include/not_openssl.inc
View File

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

4
mysql-test/include/not_ssl.inc Normal file
View File

@ -0,0 +1,4 @@
if (`select @@have_ssl = 'YES'`)
{
skip only without SSL;
}

2
mysql-test/r/not_openssl.require
View File

@ -1,2 +0,0 @@
Variable_name Value
have_openssl NO

2
mysql-test/t/func_encrypt_nossl.test
View File

@ -1,4 +1,4 @@
-- source include/not_openssl.inc -- source include/not_ssl.inc
# #
# Test output from des_encrypt and des_decrypt when server is # Test output from des_encrypt and des_decrypt when server is

8
sql/mysqld.cc
View File

@ -660,6 +660,7 @@ SHOW_COMP_OPTION have_ssl, have_symlink, have_dlopen, have_query_cache;
SHOW_COMP_OPTION have_geometry, have_rtree_keys; SHOW_COMP_OPTION have_geometry, have_rtree_keys;
SHOW_COMP_OPTION have_crypt, have_compress; SHOW_COMP_OPTION have_crypt, have_compress;
SHOW_COMP_OPTION have_profiling; SHOW_COMP_OPTION have_profiling;
SHOW_COMP_OPTION have_openssl;
/* Thread specific variables */ /* Thread specific variables */
@ -7600,8 +7601,13 @@ static int mysql_init_variables(void)
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
have_ssl=SHOW_OPTION_YES; have_ssl=SHOW_OPTION_YES;
#if HAVE_YASSL
have_openssl= SHOW_OPTION_NO;
#else #else
have_ssl=SHOW_OPTION_NO; have_openssl= SHOW_OPTION_YES;
#endif
#else
have_openssl= 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;

1
sql/set_var.h
View File

@ -299,6 +299,7 @@ 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;
extern SHOW_COMP_OPTION have_compress; extern SHOW_COMP_OPTION have_compress;
extern SHOW_COMP_OPTION have_openssl;
/* /*
Prototypes for helper functions Prototypes for helper functions

2
sql/sys_vars.cc
View File

@ -3326,7 +3326,7 @@ static Sys_var_have Sys_have_geometry(
static Sys_var_have Sys_have_openssl( static Sys_var_have Sys_have_openssl(
"have_openssl", "have_openssl", "have_openssl", "have_openssl",
READ_ONLY GLOBAL_VAR(have_ssl), NO_CMD_LINE); READ_ONLY GLOBAL_VAR(have_openssl), NO_CMD_LINE);
static Sys_var_have Sys_have_profiling( static Sys_var_have Sys_have_profiling(
"have_profiling", "have_profiling", "have_profiling", "have_profiling",