mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Two small patches proposed by Paul DuBois
include/sslopt-usage.h: Paul's patch for --ssl-xxx options for the --help message scripts/mysqlhotcopy.sh: Paul's patch for --port option BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
This commit is contained in:
@ -25,3 +25,4 @@ zak@balfor.local
|
|||||||
monty@narttu.
|
monty@narttu.
|
||||||
monty@mashka.mysql.fi
|
monty@mashka.mysql.fi
|
||||||
bar@bar.udmsearch.izhnet.ru
|
bar@bar.udmsearch.izhnet.ru
|
||||||
|
salle@geopard.online.bg
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
||||||
MA 02111-1307, USA */
|
MA 02111-1307, USA */
|
||||||
|
|
||||||
#ifdef OPEN_SSL
|
#ifdef HAVE_OPENSSL
|
||||||
puts("\
|
puts("\
|
||||||
--ssl Use SSL for connection (automatically set with other flags\n\
|
--ssl Use SSL for connection (automatically set with other flags\n\
|
||||||
--ssl-key X509 key in PEM format (implies --ssl)\n\
|
--ssl-key X509 key in PEM format (implies --ssl)\n\
|
||||||
|
@ -156,6 +156,7 @@ $opt{allowold} = 1 if $opt{keepold};
|
|||||||
|
|
||||||
# --- connect to the database ---
|
# --- connect to the database ---
|
||||||
my $dsn = ";host=localhost";
|
my $dsn = ";host=localhost";
|
||||||
|
$dsn = ";host=127.0.0.1" if $opt{port}; # use TCP/IP if port was given
|
||||||
$dsn .= ";port=$opt{port}" if $opt{port};
|
$dsn .= ";port=$opt{port}" if $opt{port};
|
||||||
$dsn .= ";mysql_socket=$opt{socket}" if $opt{socket};
|
$dsn .= ";mysql_socket=$opt{socket}" if $opt{socket};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user