diff options
| author | unknown <monty@mysql.com> | 2004-12-06 17:16:35 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-12-06 17:16:35 +0200 |
| commit | 19a95482195a158425c66ac629d07da53e4fc1b6 (patch) | |
| tree | 5cfc0009e76810724a4db2904e75e2db2506bd46 /mysql-test/r/have_openssl_1.require | |
| parent | a4a69f73126d247a519a50f5ba21357ce13839fe (diff) | |
| parent | a1fba2daccee3c7c5d46cded39fda7ee7f0d6eae (diff) | |
| download | mariadb-git-19a95482195a158425c66ac629d07da53e4fc1b6.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/have_openssl_1.require')
| -rw-r--r-- | mysql-test/r/have_openssl_1.require | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/have_openssl_1.require b/mysql-test/r/have_openssl_1.require index 032b60d544a..b33a1d2854f 100644 --- a/mysql-test/r/have_openssl_1.require +++ b/mysql-test/r/have_openssl_1.require @@ -1,2 +1,2 @@ Variable_name Value -Ssl_cipher EDH-RSA-DES-CBC3-SHA +Ssl_cipher DHE-RSA-AES256-SHA |