summaryrefslogtreecommitdiff
path: root/mysql-test/r/ssl.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-30 16:38:05 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-30 16:38:05 +0200
commit932646b1ff6a8f5815a961340a9e1ee4702f5b44 (patch)
tree5bc42ace8ae1f7e4d00baffd468bdb7564e851f1 /mysql-test/r/ssl.result
parent0bb30f3603b519780eaf3fe0527b1c6af285229a (diff)
parent33492ec8d4e2077cf8e07d0628a959d8729bd1f9 (diff)
downloadmariadb-git-932646b1ff6a8f5815a961340a9e1ee4702f5b44.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/r/ssl.result')
-rw-r--r--mysql-test/r/ssl.result5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result
index c36b5c666cb..7cd18fbf539 100644
--- a/mysql-test/r/ssl.result
+++ b/mysql-test/r/ssl.result
@@ -2175,3 +2175,8 @@ still connected?
still connected?
connection default;
disconnect ssl_con;
+create user mysqltest_1@localhost;
+grant usage on mysqltest.* to mysqltest_1@localhost require cipher "EDH-RSA-DES-CBC3-SHA";
+Variable_name Value
+Ssl_cipher EDH-RSA-DES-CBC3-SHA
+drop user mysqltest_1@localhost;