Skip to content

Commit 5917fec

Browse files
committed
Should fix bug #459
Closes #459
1 parent 518cae6 commit 5917fec

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

deps/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ mariadb-client-library/mariadb_client/include/my_config.h:
4040
cd mariadb-client-library && tar -zxf mariadb-connector-c-2.1.0-src.tar.gz
4141
cd mariadb-client-library/mariadb_client && cmake .
4242
cd mariadb-client-library/mariadb_client && patch libmariadb/libmariadb.c < ../libmariadb.c.patch
43+
cd mariadb-client-library/mariadb_client && patch libmariadb/net.c < ../net.c.patch
4344
cd mariadb-client-library/mariadb_client && patch include/mysql.h < ../mysql.h.patch
4445
cd mariadb-client-library/mariadb_client && CC=${CC} CXX=${CXX} ${MAKE}
4546
# cd mariadb-client-library/mariadb_client/include && make my_config.h
+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
@@ -224,16 +224,16 @@
2+
/* see conc-71: we need to check the socket status first:
3+
if the socket is dead we set net->error, so net_flush
4+
will report an error */
5+
- while (net_check_socket_status(net->vio->sd))
6+
- {
7+
+// while (net_check_socket_status(net->vio->sd))
8+
+// {
9+
/* vio_read returns size_t. so casting to long is required to check for -1 */
10+
- if ((long)vio_read(net->vio, (gptr)net->buff, (size_t) net->max_packet) <= 0)
11+
+/* if ((long)vio_read(net->vio, (gptr)net->buff, (size_t) net->max_packet) <= 0)
12+
{
13+
net->error= 2;
14+
DBUG_PRINT("info", ("socket disconnected"));
15+
DBUG_VOID_RETURN;
16+
}
17+
- }
18+
+ } */
19+
net->compress_pkt_nr= net->pkt_nr=0; /* Ready for new command */
20+
net->write_pos=net->buff;
21+
DBUG_VOID_RETURN;

0 commit comments

Comments
 (0)