diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | include/sslopt-usage.h | 2 | ||||
| -rw-r--r-- | scripts/mysqlhotcopy.sh | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 16db163b051..2eaef09868f 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -25,3 +25,4 @@ zak@balfor.local monty@narttu. monty@mashka.mysql.fi bar@bar.udmsearch.izhnet.ru +salle@geopard.online.bg diff --git a/include/sslopt-usage.h b/include/sslopt-usage.h index 5b2b4a88709..406d94572b8 100644 --- a/include/sslopt-usage.h +++ b/include/sslopt-usage.h @@ -15,7 +15,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#ifdef OPEN_SSL +#ifdef HAVE_OPENSSL puts("\ --ssl Use SSL for connection (automatically set with other flags\n\ --ssl-key X509 key in PEM format (implies --ssl)\n\ diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh index 45f1f1ed24a..707b4fc481c 100644 --- a/scripts/mysqlhotcopy.sh +++ b/scripts/mysqlhotcopy.sh @@ -156,6 +156,7 @@ $opt{allowold} = 1 if $opt{keepold}; # --- connect to the database --- 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 .= ";mysql_socket=$opt{socket}" if $opt{socket}; |