diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-02 05:13:09 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-02 05:13:09 +0200 |
| commit | 9ae3202e21a143c61904c2be96c70d0904988350 (patch) | |
| tree | 26739b72304f595a013bbe69f5fc4c317670935a /sql | |
| parent | 9c356bf43c65c3ec5a89d1dfa0a03aca693864d1 (diff) | |
| download | mariadb-git-9ae3202e21a143c61904c2be96c70d0904988350.tar.gz | |
Fixed core dump bug in 'mysql' when using \p in prompt on Windows.
Fixed error when mysql_unix_port pointed to const string (not uncommon on windows)
client/mysql.cc:
Fixed core dump bug when using \p in prompt on Windows.
sql/mysqld.cc:
Fixed error when mysql_unix_port pointed to const string.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 81aeec05e4d..c26b450cbfe 100644 --- a/sql/mysqld.cc +++ b/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__ |