summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-07-31 13:51:28 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-07-31 13:51:28 +0300
commit66ec3a770f7854f500ece66c78f3c87c9cd6da15 (patch)
tree0777df9a8dc587b70851c1edc0cfe96895928717 /sql-common
parent6053eb1ce278ac1f566cd74498506bf457d6d048 (diff)
parentf35d1721039f8f115fc55e8f4b4d2bb4012161d1 (diff)
downloadmariadb-git-66ec3a770f7854f500ece66c78f3c87c9cd6da15.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 6bf29f056a2..66c68e5952d 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -721,6 +721,8 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
set_mysql_error(mysql, CR_NET_PACKET_TOO_LARGE, unknown_sqlstate);
goto end;
}
+ if (net->last_errno == ER_NET_ERROR_ON_WRITE && command == COM_BINLOG_DUMP)
+ goto end;
end_server(mysql);
if (mysql_reconnect(mysql) || stmt_skip)
goto end;