diff options
| author | iggy@amd64.(none) <> | 2008-03-28 14:02:27 -0400 |
|---|---|---|
| committer | iggy@amd64.(none) <> | 2008-03-28 14:02:27 -0400 |
| commit | 79e434bc67abc695cd5c3a711a7f1732f91da155 (patch) | |
| tree | bd2b7d6f189d12c7958ade6c6684233a9fae3607 /sql/net_serv.cc | |
| parent | e09d9838259f831c27c546a2fea3a24e6b432733 (diff) | |
| download | mariadb-git-79e434bc67abc695cd5c3a711a7f1732f91da155.tar.gz | |
Bug#26243 mysql command line crash after control-c
- Backported the 5.1 DBUG to 5.0.
- Avoid memory cleanup race on Windows client for CTRL-C
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 017a2eb9ecd..a40764577fd 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -394,7 +394,7 @@ my_net_write(NET *net,const char *packet,ulong len) if (net_write_buff(net,(char*) buff,NET_HEADER_SIZE)) return 1; #ifndef DEBUG_DATA_PACKETS - DBUG_DUMP("packet_header",(char*) buff,NET_HEADER_SIZE); + DBUG_DUMP("packet_header", buff, NET_HEADER_SIZE); #endif return test(net_write_buff(net,packet,len)); } @@ -892,7 +892,7 @@ my_real_read(NET *net, ulong *complen) if (i == 0) { /* First parts is packet length */ ulong helping; - DBUG_DUMP("packet_header",(char*) net->buff+net->where_b, + DBUG_DUMP("packet_header", net->buff+net->where_b, NET_HEADER_SIZE); if (net->buff[net->where_b + 3] != (uchar) net->pkt_nr) { |