diff options
| author | Monty <monty@mariadb.org> | 2016-04-25 15:37:24 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-04-25 15:37:24 +0300 |
| commit | f6cc7f1bdc56e57cf441f99f2c88ca92aeeebc11 (patch) | |
| tree | 56663353897e6146894fa064bd00c318f803f7cf /mysql-test/t/ssl_timeout.test | |
| parent | ce38adddfa91949b30956abd0e4cab201effcdef (diff) | |
| download | mariadb-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_timeout.test')
| -rw-r--r-- | mysql-test/t/ssl_timeout.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/ssl_timeout.test b/mysql-test/t/ssl_timeout.test index 0d96b3f6601..806b928aca0 100644 --- a/mysql-test/t/ssl_timeout.test +++ b/mysql-test/t/ssl_timeout.test @@ -7,7 +7,7 @@ connect (ssl_con,localhost,root,,,,,SSL read_timeout=5); --echo # 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'; # --error CR_SERVER_LOST |