diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-04-27 13:58:21 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-04-27 13:58:21 +0400 |
| commit | e642701c325e7b557d1a16d98f110581c26c2f28 (patch) | |
| tree | 6fc830df498046ca29b2381fb809726faeb04f52 /mysql-test/t/ssl.test | |
| parent | a0f8951963443db308d072dbc0794bb93d2fcf45 (diff) | |
| parent | b6dcd0ecbee17787297e882ed63cf4e13d981943 (diff) | |
| download | mariadb-git-e642701c325e7b557d1a16d98f110581c26c2f28.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
Diffstat (limited to 'mysql-test/t/ssl.test')
| -rw-r--r-- | mysql-test/t/ssl.test | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/ssl.test b/mysql-test/t/ssl.test index 936652eaa3d..2526a52bec6 100644 --- a/mysql-test/t/ssl.test +++ b/mysql-test/t/ssl.test @@ -1,7 +1,7 @@ # Turn on ssl between the client and server # and run a number of tests --- source include/have_ssl.inc +-- source include/have_ssl_communication.inc # Save the initial number of concurrent sessions --source include/count_sessions.inc @@ -23,3 +23,5 @@ disconnect ssl_con; # Wait till all disconnects are completed --source include/wait_until_count_sessions.inc +## This test file is for testing encrypted communication only, not other +## encryption routines that the SSL library happens to provide! |