From c37b62b79fb1a0cd3881f2d01e2abe4cb5adc98e Mon Sep 17 00:00:00 2001
From: "bell@sanja.is.com.ua" <>
Date: Thu, 27 Feb 2003 21:29:56 +0200
Subject: [PATCH] postmerging fix (SCRUM)

---
 include/violite.h   | 4 ++--
 libmysqld/lib_vio.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/violite.h b/include/violite.h
index f99bb521e23..a328e51253a 100644
--- a/include/violite.h
+++ b/include/violite.h
@@ -95,7 +95,7 @@ my_socket vio_fd(Vio*vio);
 /*
  * Remote peer's address and name in text form.
  */
-my_bool vio_peer_addr(Vio* vio, char *buf, u_int16_t *port);
+my_bool vio_peer_addr(Vio* vio, char *buf, uint16 *port);
 
 /* Remotes in_addr */
 
@@ -224,7 +224,7 @@ struct st_vio
   my_bool (*is_blocking)(Vio*);
   int     (*viokeepalive)(Vio*, my_bool);
   int     (*fastsend)(Vio*);
-  my_bool (*peer_addr)(Vio*, gptr);
+  my_bool (*peer_addr)(Vio*, gptr, uint16*);
   void    (*in_addr)(Vio*, struct in_addr*);
   my_bool (*should_retry)(Vio*);
   int     (*vioclose)(Vio*);
diff --git a/libmysqld/lib_vio.c b/libmysqld/lib_vio.c
index 428df972372..821923fe667 100644
--- a/libmysqld/lib_vio.c
+++ b/libmysqld/lib_vio.c
@@ -204,7 +204,7 @@ my_socket vio_fd(Vio* vio)
 }
 
 
-my_bool vio_peer_addr(Vio * vio, char *buf, u_int16_t *port)
+my_bool vio_peer_addr(Vio * vio, char *buf, uint16 *port)
 {
   return(0);
 }