mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
post-merge fixes, including slave-skip-errors backport
fixed too quick timeout in mysql-test-run which caused a race with the new server getting started before the old one completely finished shutdown. This should fix the pid warning we've been getting as well as inconsistent results when running tests with the manager
This commit is contained in:
@ -1155,7 +1155,7 @@ static int client_msg_raw(NET* net, int err_code, int pre, const char* fmt,
|
||||
p=buf_end - 2;
|
||||
*p++='\r';
|
||||
*p++='\n';
|
||||
|
||||
log_debug("message to client: %-.*s",p-buf-2,buf);
|
||||
if (my_net_write(net,buf,(uint)(p-buf)) || net_flush(net))
|
||||
{
|
||||
p[-2]=0;
|
||||
|
Reference in New Issue
Block a user