summaryrefslogtreecommitdiff
path: root/mysql-test/t/ssl_compress.test
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2016-04-25 15:37:24 +0300
committerMonty <monty@mariadb.org>2016-04-25 15:37:24 +0300
commitf6cc7f1bdc56e57cf441f99f2c88ca92aeeebc11 (patch)
tree56663353897e6146894fa064bd00c318f803f7cf /mysql-test/t/ssl_compress.test
parentce38adddfa91949b30956abd0e4cab201effcdef (diff)
downloadmariadb-git-f6cc7f1bdc56e57cf441f99f2c88ca92aeeebc11.tar.gz
Fixed failing test cases and compiler warnings
- Fixed wait condition in kill_processlist-6619 - Updated Ssl_chiper for openssl tests - Added supression for valgrinds when using libcrypto - Fixed wrong argument to pthread_mutex in server_audit.c when compiling with debug - Adding missing debug_sync_update() to debug_sync.h - Added initializers to some variables and fixed error handling in jsonudf.cpp - Fixed cluster_filter_unpack_varchar which doesn't have a stable index type. - Updated compiler_warnings.supp
Diffstat (limited to 'mysql-test/t/ssl_compress.test')
-rw-r--r--mysql-test/t/ssl_compress.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/ssl_compress.test b/mysql-test/t/ssl_compress.test
index 5e45e3824a2..28f3453c23e 100644
--- a/mysql-test/t/ssl_compress.test
+++ b/mysql-test/t/ssl_compress.test
@@ -11,7 +11,7 @@
connect (ssl_compress_con,localhost,root,,,,,SSL COMPRESS);
# Check ssl turned on
---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
+--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
SHOW STATUS LIKE 'Ssl_cipher';
# Check compression turned on
@@ -21,7 +21,7 @@ SHOW STATUS LIKE 'Compression';
-- source include/common-tests.inc
# Check ssl turned on
---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
+--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
SHOW STATUS LIKE 'Ssl_cipher';
# Check compression turned on