summaryrefslogtreecommitdiff
path: root/vio
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2003-12-01 13:13:16 +0200
committerunknown <monty@mysql.com>2003-12-01 13:13:16 +0200
commit91de6fdbce2a5c545532acf1124f35378a75ea0c (patch)
treea43b68a9738d463b72e030ee578bf714eb7c9dc6 /vio
parent046b80bbeb074aeea3158c8108d93e6e6215d2e2 (diff)
downloadmariadb-git-91de6fdbce2a5c545532acf1124f35378a75ea0c.tar.gz
Portability fixes (for binary build)
Added --protocol to mysqlbinlog client/mysql.cc: Indentation cleanup client/mysqlbinlog.cc: Added protocol option mysql-test/r/rpl_until.result: Update results mysql-test/t/rpl_until.test: If --sleep option was given then the salve could do many retries, which affected the size of the binary log. This is fixed by not comparing the binary log size/position sql/mysqld.cc: More debugging with set_maximum_open_files() vio/viosocket.c: Portability fix.
Diffstat (limited to 'vio')
-rw-r--r--vio/viosocket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c
index 31941a64102..9d5c7c0d890 100644
--- a/vio/viosocket.c
+++ b/vio/viosocket.c
@@ -249,8 +249,8 @@ my_bool vio_peer_addr(Vio * vio, char *buf, uint16 *port)
}
else
{
- size_socket addrLen = sizeof(struct sockaddr);
- if (getpeername(vio->sd, (struct sockaddr *) (& (vio->remote)),
+ size_socket addrLen = sizeof(vio->remote);
+ if (getpeername(vio->sd, (struct sockaddr *) (&vio->remote),
&addrLen) != 0)
{
DBUG_PRINT("exit", ("getpeername gave error: %d", socket_errno));