Commit c38929e1 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781 

into  pilot.blaudden:/home/msvensson/mysql/bug21781/my51-bug21781


BitKeeper/deleted/.del-ssl_des.test:
  Auto merged
parents f2a95f79 de3e6da6

mysql-test/r/ssl_des.result

deleted100644 → 0
+0 −2159

File deleted.

Preview size limit exceeded, changes collapsed.

mysql-test/t/ssl_des.test

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
# Tell the server to use a DES-encrypted cert

# then turn on ssl between the client and server

# and run a number of standard tests



-- source include/have_ssl.inc



# Connect by ip to avoid turning on "ssl-verify-server-cert"

connect (ssl_con,127.0.0.1,root,,,,$MASTER_MYPORT,SSL);



# Check ssl turned on

SHOW STATUS LIKE 'Ssl_cipher';



# Source select test case

-- source include/common-tests.inc



# Check ssl turned on

SHOW STATUS LIKE 'Ssl_cipher';