mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
Fix after merge
This commit is contained in:
parent
d825808a72
commit
4dfe327a06
2 changed files with 1 additions and 2 deletions
|
@ -303,7 +303,7 @@ innobase_mysql_print_thd(
|
||||||
buf[0]='\n';
|
buf[0]='\n';
|
||||||
buf[1]=0;
|
buf[1]=0;
|
||||||
|
|
||||||
ut_a(strlen(old_buf) < 400);
|
ut_a(strlen(buf) < 400);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -617,7 +617,6 @@ void close_server_sock()
|
||||||
{
|
{
|
||||||
DBUG_PRINT("info",("calling shutdown on unix socket"));
|
DBUG_PRINT("info",("calling shutdown on unix socket"));
|
||||||
VOID(shutdown(unix_sock,2));
|
VOID(shutdown(unix_sock,2));
|
||||||
DBUG_PRINT("info",("calling closesocket on unix socket"));
|
|
||||||
VOID(unlink(mysql_unix_port));
|
VOID(unlink(mysql_unix_port));
|
||||||
unix_sock=INVALID_SOCKET;
|
unix_sock=INVALID_SOCKET;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue