client/mysql.cc:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/r/rpl_openssl.result:
  manual merge