File tree 2 files changed +22
-0
lines changed
2 files changed +22
-0
lines changed Original file line number Diff line number Diff line change @@ -40,6 +40,7 @@ mariadb-client-library/mariadb_client/include/my_config.h:
40
40
cd mariadb-client-library && tar -zxf mariadb-connector-c-2.1.0-src.tar.gz
41
41
cd mariadb-client-library/mariadb_client && cmake .
42
42
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
43
44
cd mariadb-client-library/mariadb_client && patch include/mysql.h < ../mysql.h.patch
44
45
cd mariadb-client-library/mariadb_client && CC=${CC} CXX=${CXX} ${MAKE}
45
46
# cd mariadb-client-library/mariadb_client/include && make my_config.h
Original file line number Diff line number Diff line change
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;
You can’t perform that action at this time.
0 commit comments