diff options
| author | unknown <guilhem@mysql.com> | 2003-10-18 16:28:40 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-10-18 16:28:40 +0200 |
| commit | 54b9f2d8ff0b1b14f531f2b16fc57ac51d332cc1 (patch) | |
| tree | 7a49f0a2eb1b1931aa8482f3e07f099c00eae2f1 /sql | |
| parent | b30a4f31a280c296d6cdb4dd07846d8096ac7c72 (diff) | |
| parent | 52d80b769e6d599aab6848c087506362970d5124 (diff) | |
| download | mariadb-git-54b9f2d8ff0b1b14f531f2b16fc57ac51d332cc1.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23
into mysql.com:/home/mysql_src/mysql-3.23
Diffstat (limited to 'sql')
| -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; |