mirror of
https://github.com/MariaDB/server.git
synced 2025-10-30 04:26:45 +03:00
416d0aebbf
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
42 lines
1.7 KiB
Plaintext
42 lines
1.7 KiB
Plaintext
# This test should work in embedded server after we fix mysqltest
|
|
-- source include/not_embedded.inc
|
|
-- source include/have_openssl.inc
|
|
|
|
--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;
|
|
let $ssl_crl = $ssl_base --ssl-crl=$MYSQL_TEST_DIR/std_data/crl-client-revoked.crl;
|
|
let $ssl_crlpath = $ssl_base --ssl-crlpath=$MYSQL_TEST_DIR/std_data/crldir;
|
|
|
|
|
|
--echo ############ Test mysql ##############
|
|
|
|
--echo # Test mysql connecting to a server with a certificate revoked by -crl
|
|
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
|
--error 1
|
|
--exec $MYSQL $ssl_crl test -e "SHOW VARIABLES like '%ssl%';"
|
|
|
|
--echo # Test mysql connecting to a server with a certificate revoked by -crlpath
|
|
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
|
|
--error 1
|
|
--exec $MYSQL $ssl_crlpath test -e "SHOW VARIABLES like '%ssl%';"
|
|
|
|
|
|
--echo ############ Test mysqladmin ##############
|
|
let $admin_prefix = --no-defaults;
|
|
let $admin_suffix = --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping;
|
|
|
|
--echo # Test mysqladmin connecting to a server with a certificate revoked by -crl
|
|
--disable_result_log
|
|
--replace_regex /.*mysqladmin.*: connect/mysqladmin: connect/
|
|
--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 2
|
|
--exec $MYSQLADMIN $admin_prefix $ssl_crlpath $admin_suffix 2>&1
|
|
--enable_result_log
|