summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2003-09-26 23:43:22 +0200
committerunknown <guilhem@mysql.com>2003-09-26 23:43:22 +0200
commite7f4749fb631aa64d5d1ce97bb40fdf3ab8d4604 (patch)
tree999dd68d9a107df5be7a9391cc03a816e8c0bdcb
parent8090030700bf51f8598c0f7ac61c4d7bec1ddf28 (diff)
downloadmariadb-git-e7f4749fb631aa64d5d1ce97bb40fdf3ab8d4604.tar.gz
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 9993951d8e9..f204c38c18c 100644
--- a/sql/mini_client.cc
+++ b/sql/mini_client.cc
@@ -547,7 +547,7 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user,
{
char buff[NAME_LEN+USERNAME_LENGTH+100],*end,*host_info;
my_socket sock;
- ulong ip_addr;
+ uint32 ip_addr;
struct sockaddr_in sock_addr;
ulong pkt_length;
NET *net= &mysql->net;