diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-01 13:15:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-01 13:15:29 +0200 |
| commit | 416d0aebbfaaa00802d00105a0bd2faedb8b8f04 (patch) | |
| tree | 5244b83a9f22d4d5899154c9a64a316111bbe6b6 /mysql-test/include/have_openssl.inc | |
| parent | adf6e145f77d2f7b049b977ee55ed12d05b96eac (diff) | |
| download | mariadb-git-416d0aebbfaaa00802d00105a0bd2faedb8b8f04.tar.gz | |
more fixes for test cases
mysql-test/suite/innodb/include/restart_and_reinit.inc:
drop and recreate mysql.innodb* tables when deleting innodb table spaces
mysql-test/t/ssl_8k_key-master.opt:
with loose- prefix ssl errors are ignored
sql-common/client.c:
compiler warnings
sql/field.cc:
use the new function
sql/item.cc:
don't convert time to double or decimal via longlong,
this loses sub-second part.
Use dedicated functions.
sql/item.h:
incorrect cast_to_int type for params
sql/item_strfunc.cc:
use the new function
sql/lex.h:
unused
sql/my_decimal.h:
helper macro
sql/sql_plugin.cc:
workaround for a compiler warning
sql/sql_yacc.yy:
unused
sql/transaction.cc:
fix the merge for SERVER_STATUS_IN_TRANS_READONLY protocol flag
storage/sphinx/CMakeLists.txt:
compiler warnings
Diffstat (limited to 'mysql-test/include/have_openssl.inc')
| -rw-r--r-- | mysql-test/include/have_openssl.inc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mysql-test/include/have_openssl.inc b/mysql-test/include/have_openssl.inc index e240d935cb2..c9260123f9d 100644 --- a/mysql-test/include/have_openssl.inc +++ b/mysql-test/include/have_openssl.inc @@ -1,4 +1,7 @@ --- require r/openssl.require -disable_query_log; -show variables like "have_openssl"; -enable_query_log; +-- source include/have_ssl_communication.inc +let $crllen=`select length(trim(coalesce(@@ssl_crl, ''))) + length(trim(coalesce(@@ssl_crlpath, '')))`; +if (!$crllen) +{ + skip Needs OpenSSL; +} + |