diff options
| author | unknown <guilhem@mysql.com> | 2003-09-27 17:16:19 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-09-27 17:16:19 +0200 |
| commit | 52d80b769e6d599aab6848c087506362970d5124 (patch) | |
| tree | d0e00f76af312015cec7b9e1b9bc434b475c75a0 /sql/mini_client.cc | |
| parent | 8cc642d721cf63ae3c784bec9893a3a04732bf31 (diff) | |
| download | mariadb-git-52d80b769e6d599aab6848c087506362970d5124.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).
sql/mini_client.cc:
backport of a fix made in 4.0 to make replication work in 64-bit binaries.
Diffstat (limited to 'sql/mini_client.cc')
| -rw-r--r-- | sql/mini_client.cc | 2 |
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; |