Merge akeremidarski@work.mysql.com:/home/bk/mysql

into geopard.online.bg:/storage/bk/mysql-3.23

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

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\

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};