diff options
| author | unknown <guilhem@mysql.com> | 2005-01-10 13:52:32 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-01-10 13:52:32 +0100 |
| commit | d8d9f79e09dfe822586742a62928ce37c44aaa90 (patch) | |
| tree | 86fbf8fc984c99c0e470d83ae1edd73eebf2715a /sql | |
| parent | 04498c2a4f1eb9e3f33ec4f66fe0cd85c41380a4 (diff) | |
| download | mariadb-git-d8d9f79e09dfe822586742a62928ce37c44aaa90.tar.gz | |
Fix for BUG#7658 "optimize crashes slave thread (1 in 1000)]":
mysql_admin_table() attempted to write to a vio which was 0. I could have fixed mysql_admin_table()
but fixing my_net_write() looked more future-proof.
sql/net_serv.cc:
If no VIO, no write.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/net_serv.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index e5cb4d1e815..cad1f041005 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -227,6 +227,8 @@ int my_net_write(NET *net,const char *packet,ulong len) { uchar buff[NET_HEADER_SIZE]; + if (unlikely(!net->vio)) // nowhere to write + return 0; /* Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH length. The last packet is always a packet that is < MAX_PACKET_LENGTH. |