database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed core dump bug in 'mysql' when using \p in prompt on Windows.

Browse Source 
Fixed error when mysql_unix_port pointed to const string (not uncommon on windows)
This commit is contained in:
monty@mashka.mysql.fi
2003-02-02 05:13:09 +02:00
parent 8611ac7a9c
commit a9ee051a4d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/mysql.cc
View File

@ -40,7 +40,7 @@
#include <signal.h> #include <signal.h>
#include <violite.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 */ /* Don't try to make a nice table if the data is too big */
#define MAX_COLUMN_LENGTH 1024 #define MAX_COLUMN_LENGTH 1024
@ -2647,7 +2647,10 @@ static const char* construct_prompt()
! mysql.unix_socket) ! mysql.unix_socket)
add_int_to_prompt(mysql.port); add_int_to_prompt(mysql.port);
else 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; break;
case 'U': case 'U':
if (!full_username) if (!full_username)

6
sql/mysqld.cc
View File

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