database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code 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
parent 5fe8e9f244 490d2a4267
commit 421bbdcf10
8 changed files with 17 additions and 11 deletions
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 %'`) {
--skip Needs a debug_sync enabled
if (`SELECT COUNT(*) = 0 FROM information_schema.session_variables WHERE
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