diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-11 21:03:29 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-11 21:03:29 +0200 |
| commit | 2b6cd457340bbea6ac158eeb7be5af83ee3924de (patch) | |
| tree | 3e16a1d16742f09632a13ec2babc4a1a10e0a885 /mysql-test/r/openssl_1.result | |
| parent | d032b0e56c44538c57ae36145ebee2ef73071aaa (diff) | |
| parent | 8033d64e136cb9519d527c59062dc3d0f17adcac (diff) | |
| download | mariadb-git-2b6cd457340bbea6ac158eeb7be5af83ee3924de.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result index 0552ca0e8bb..d0a0253ba17 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 SHOW STATUS LIKE 'Ssl_cipher'; |