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/t/ssl_crl_clients.test | |
| 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/t/ssl_crl_clients.test')
| -rw-r--r-- | mysql-test/t/ssl_crl_clients.test | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/mysql-test/t/ssl_crl_clients.test b/mysql-test/t/ssl_crl_clients.test index 56f43b2425e..7c05f498fbe 100644 --- a/mysql-test/t/ssl_crl_clients.test +++ b/mysql-test/t/ssl_crl_clients.test @@ -1,14 +1,7 @@ # This test should work in embedded server after we fix mysqltest -- source include/not_embedded.inc --- source include/have_ssl_communication.inc -- source include/have_openssl.inc -let $crllen=`select length(trim(coalesce(@@ssl_crl, ''))) + length(trim(coalesce(@@ssl_crlpath, '')))`; -if (!$crllen) -{ - skip Needs OpenSSL; -} - --echo # Test clients with and without CRL lists let $ssl_base = --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-server-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-server-cert.pem; @@ -36,13 +29,13 @@ let $admin_suffix = --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_ --echo # Test mysqladmin connecting to a server with a certificate revoked by -crl --disable_result_log --replace_regex /.*mysqladmin.*: connect/mysqladmin: connect/ ---error 1 +--error 2 --exec $MYSQLADMIN $admin_prefix $ssl_crl $admin_suffix 2>&1 --enable_result_log --disable_result_log --echo # Test mysqladmin connecting to a server with a certificate revoked by -crlpath --replace_regex /.*mysqladmin.*: connect/mysqladmin: connect/ ---error 1 +--error 2 --exec $MYSQLADMIN $admin_prefix $ssl_crlpath $admin_suffix 2>&1 --enable_result_log |