diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-11 22:08:00 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-11 22:08:00 +0200 |
| commit | 48098cddb121136b456c3392bdb8f470559942ac (patch) | |
| tree | 0354d286782236689632c88acc5bf22d96be0222 /mysql-test/r/openssl_1.result | |
| parent | 0f299acb7c0e693dc3aa2a98cba5453bcc07d0dd (diff) | |
| parent | d25a540dca1814d5a905544a88d93f936bc61137 (diff) | |
| download | mariadb-git-48098cddb121136b456c3392bdb8f470559942ac.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
sql/mysqld.cc:
Auto merged
vio/viosslfactories.c:
Auto merged
mysql-test/r/openssl_1.result:
Manual merge
mysql-test/t/openssl_1.test:
Manual merge
Diffstat (limited to 'mysql-test/r/openssl_1.result')
| -rw-r--r-- | mysql-test/r/openssl_1.result | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result index c6e077b2857..267ee83a56a 100644 --- a/mysql-test/r/openssl_1.result +++ b/mysql-test/r/openssl_1.result @@ -51,6 +51,9 @@ SSL error: Unable to get private key from '' mysqltest: Could not open connection 'default': 2026 SSL connection error SSL error: Unable to get certificate from '' mysqltest: Could not open connection 'default': 2026 SSL connection error +SHOW STATUS LIKE 'Ssl_cipher'; +Variable_name Value +Ssl_cipher DHE-RSA-AES256-SHA Variable_name Value Ssl_cipher DHE-RSA-AES256-SHA End of 5.0 tests @@ -75,3 +78,10 @@ SSL_CALLBACK_CACHE_HITS 0.0000000 DROP TABLE thread_status; SET GLOBAL event_scheduler=0; End of 5.1 tests +SHOW STATUS LIKE 'Ssl_cipher'; +Variable_name Value +Ssl_cipher AES128-SHA +SHOW STATUS LIKE 'Ssl_cipher'; +Variable_name Value +Ssl_cipher AES128-SHA +mysqltest: Could not open connection 'default': 2026 SSL connection error |