Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

client/mysql.cc

@@ -40,7 +40,7 @@
 #include <signal.h>
 #include <violite.h>
 
-const char *VER= "12.17";
+const char *VER= "12.18";
 
 /* Don't try to make a nice table if the data is too big */
 #define MAX_COLUMN_LENGTH	     1024
@@ -2647,7 +2647,10 @@ static const char* construct_prompt()
 	    ! mysql.unix_socket)
 	  add_int_to_prompt(mysql.port);
 	else
-	  processed_prompt.append(strrchr(mysql.unix_socket,'/')+1);
+	{
+	  char *pos=strrchr(mysql.unix_socket,'/');
+	  processed_prompt.append(pos ? pos+1 : mysql.unix_socket);
+	}
 	break;
       case 'U':
 	if (!full_username)

sql/mysqld.cc

@@ -2371,9 +2371,9 @@ The server will not act as a slave.");
       sql_print_error("Warning: Can't create thread to manage maintenance");
   }
 
-  if (unix_sock == INVALID_SOCKET)
-    mysql_unix_port[0]= 0;
-  printf(ER(ER_READY),my_progname,server_version, mysql_unix_port, mysql_port);
+  printf(ER(ER_READY),my_progname,server_version,
+	 ((unix_sock == INVALID_SOCKET) ? (char*) "" : mysql_unix_port),
+	 mysql_port);
   fflush(stdout);
 
 #ifdef __NT__