mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 07:35:32 +02:00
Merge with 4.0
vio/viosocket.c: Auto merged mysql-test/t/group_by.test: Use local file sql/sql_parse.cc: Merge with 4.0 to get bug fix for reconnect problem
This commit is contained in:
commit
e1099fac1f
2 changed files with 17 additions and 4 deletions
|
|
@ -272,6 +272,18 @@ my_bool vio_peer_addr(Vio * vio, char *buf, uint16 *port)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
Get in_addr for a TCP/IP connection
|
||||
|
||||
SYNOPSIS
|
||||
vio_in_addr()
|
||||
vio vio handle
|
||||
in put in_addr here
|
||||
|
||||
NOTES
|
||||
one must call vio_peer_addr() before calling this one
|
||||
*/
|
||||
|
||||
void vio_in_addr(Vio *vio, struct in_addr *in)
|
||||
{
|
||||
DBUG_ENTER("vio_in_addr");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue