summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorvinchen <vinchen13@gmail.com>2016-10-21 16:02:51 +0800
committerKristian Nielsen <knielsen@knielsen-hq.org>2016-10-21 13:37:48 +0200
commit07f09df92bc2ab7d18833dd6ce149a6681ae8a32 (patch)
tree3c6d144af08f493c1f664ee4f7482d96bc25916a /sql-common
parent0fa39ffba7ce56ebe9972a3b2067e365632d02aa (diff)
downloadmariadb-git-07f09df92bc2ab7d18833dd6ce149a6681ae8a32.tar.gz
fix the ABI and stop slave hang problem
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 858e9ec4b5b..fc76fa976e0 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -569,16 +569,22 @@ err:
Error message is set.
@retval
*/
-
ulong
cli_safe_read(MYSQL *mysql)
{
+ ulong reallen = 0;
+ return cli_safe_read_reallen(mysql, &reallen);
+}
+
+ulong
+cli_safe_read_reallen(MYSQL *mysql, ulong* reallen)
+{
NET *net= &mysql->net;
ulong len=0;
restart:
if (net->vio != 0)
- len= my_net_read_packet(net, 0);
+ len= my_net_read_packet_reallen(net, 0, reallen);
if (len == packet_error || len == 0)
{