summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguilhem@mysql.com <>2003-09-27 17:16:19 +0200
committerguilhem@mysql.com <>2003-09-27 17:16:19 +0200
commitbf5be93a133c5c55f8ae4533d5df53e01ffd0f36 (patch)
treed0e00f76af312015cec7b9e1b9bc434b475c75a0
parent40a88045cb4e60028f9e548deeb89b1d412adf3c (diff)
downloadmariadb-git-bf5be93a133c5c55f8ae4533d5df53e01ffd0f36.tar.gz
backport of a fix made in 4.0 to make replication work in 64-bit binaries.
The 4.0 changeset was: ChangeSet@1.1579.3.1, 2003-09-26 23:43:22+02:00, guilhem@mysql.com Fix for 64-bit machines. I am almost sure this is the cause for BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries? BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version (Solaris) The reason why I think it's wrong is that the normal client code has uint32 ip_addr. (of course on 32-bit machines it does not matter, but on 64-bit it does).
-rw-r--r--sql/mini_client.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mini_client.cc b/sql/mini_client.cc
index 2c74eb96bf9..c7beeea37b8 100644
--- a/sql/mini_client.cc
+++ b/sql/mini_client.cc
@@ -496,7 +496,7 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user,
{
char buff[100],*end,*host_info;
my_socket sock;
- ulong ip_addr;
+ uint32 ip_addr;
struct sockaddr_in sock_addr;
uint pkt_length;
NET *net= &mysql->net;