diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-06 18:52:18 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-06 18:52:18 +0100 |
| commit | 0cab1b1494abde07cf16350919e369f753f0cfd3 (patch) | |
| tree | 8f0db28f853b0543a04db3b0056e8b91d23efe11 /mysql-test/t | |
| parent | 38ae09760b8fdfc93ffba0c8e9f8a84787bf71be (diff) | |
| parent | 5ccb23ae89d6892dba40402d6e0f97cd9ca74f92 (diff) | |
| download | mariadb-git-0cab1b1494abde07cf16350919e369f753f0cfd3.tar.gz | |
Merge 192.168.0.10:mysql/yassL-import/my50-yassL-import
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
vio/viosslfactories.c:
Auto merged
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/openssl_1.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/openssl_1.test b/mysql-test/t/openssl_1.test index 49f8fc4d7d4..3d614514de3 100644 --- a/mysql-test/t/openssl_1.test +++ b/mysql-test/t/openssl_1.test @@ -10,8 +10,8 @@ insert into t1 values (5); grant select on test.* to ssl_user1@localhost require SSL; grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA"; -grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; -grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; +grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com"; +grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB"; grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx"; flush privileges; |