Commit f194e401 authored by tonu@x153.internalnet's avatar tonu@x153.internalnet
Browse files

OpenSSL work

parent 4194c075

Docs/manual.texi

+10 −0
Original line number Diff line number Diff line
@@ -23299,6 +23299,7 @@ GRANT priv_type [(column_list)] [, priv_type [(column_list)] ...] 
    ON @{tbl_name | * | *.* | db_name.*@}

    TO user_name [IDENTIFIED BY 'password']

        [, user_name [IDENTIFIED BY 'password'] ...]

    [REQUIRE @{SSL|X509@} [ISSUER issuer] [SUBJECT subject]]

    [WITH GRANT OPTION]















REVOKE priv_type [(column_list)] [, priv_type [(column_list)] ...]










@@ -29454,6 +29455,15 @@ The number of seconds the slave thread will sleep before retrying to













connect to the master in case the master goes down or the connection is















lost.  Default is 60.  (Example: @code{master-connect-retry=60})



























@item @code{master-ssl} @tab













Turn SSL on (Example: @code{master-ssl})

























@item @code{master-ssl-key} @tab













Master SSL keyfile name (Example: @code{master-ssl-key=SSL/master-key.pem})

























@item @code{master-ssl-cert} @tab













Master SSL certificate file name (Example: @code{master-ssl-key=SSL/master-cert.pem})



























@item @code{master-info-file=filename} @tab















The location of the file that remembers where we left off on the master















during the replication process. The default is master.info in the data

























SSL/run-client



+2
−1






























Original line number
Diff line number
Diff line








@@ -5,5 +5,6 @@ cmd () {













	$*















}





























client/mysql --port=4407 --socket=/tmp/test.mysql.sock --ssl-ca=SSL/cacert.pem --ssl-cert=SSL/client-cert.pem --ssl-key=SSL/client-key.pem --debug='d:t:O,/tmp/client.trace' -h 127.0.0.1 --execute="select version()"













client/mysql --port=4407 --socket=/tmp/test.mysql.sock --ssl-ca=SSL/cacert.pem --ssl-cert=SSL/client-cert.pem --ssl-key=SSL/client-key.pem --debug='d:t:O,/tmp/client.trace' -h 127.0.0.1 -u root













#--execute="select version();show status"







































SSL/run-server



+1
−1






























Original line number
Diff line number
Diff line








@@ -5,5 +5,5 @@ cmd () {













	$*















}





























cmd sql/mysqld --port=4407 --socket=/tmp/test.mysql.sock --ssl-ca=SSL/cacert.pem --ssl-cert=SSL/server-cert.pem --ssl-key=SSL/server-key.pem --skip-grant --debug='d:t:O,/tmp/mysqld.trace' >& /tmp/mysqld.output













cmd sql/mysqld --port=4407 --socket=/tmp/test.mysql.sock --ssl-ca=SSL/cacert.pem --ssl-cert=SSL/server-cert.pem --ssl-key=SSL/server-key.pem --debug='d:t:O,/tmp/mysqld.trace' -uroot >& /tmp/mysqld.output







































readline/callback.c



+1
−0






























Original line number
Diff line number
Diff line








@@ -29,6 +29,7 @@





























#if defined (READLINE_CALLBACKS)





























#include <stdlib.h>















#include <sys/types.h>















#include <stdio.h>

















































sql/mysqld.cc



+4
−4






























Original line number
Diff line number
Diff line








@@ -704,10 +704,10 @@ void clean_up(bool print_message)













  end_raid();















#endif















#ifdef HAVE_OPENSSL













  my_free(opt_ssl_key,MYF(0));













  my_free(opt_ssl_cert,MYF(0));













  my_free(opt_ssl_ca,MYF(0));













  my_free(opt_ssl_capath,MYF(0));













  my_free(opt_ssl_key,MYF(MY_ALLOW_ZERO_PTR));













  my_free(opt_ssl_cert,MYF(MY_ALLOW_ZERO_PTR));













  my_free(opt_ssl_ca,MYF(MY_ALLOW_ZERO_PTR));













  my_free(opt_ssl_capath,MYF(MY_ALLOW_ZERO_PTR));















  opt_ssl_key=opt_ssl_cert=opt_ssl_ca=opt_ssl_capath=0;















#endif /* HAVE_OPENSSL */















  free_defaults(defaults_argv);