diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-13 09:28:35 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-13 09:28:35 -0600 |
| commit | 5c1dbfe6a7f42e368bfffb90974effbb8c6b9f6e (patch) | |
| tree | c4dd5da34820e3ec8484a4929bf1467d6492d92a /libmysql | |
| parent | a6c58676835f9424a5167a522497f1a20a5f03ee (diff) | |
| download | mariadb-git-5c1dbfe6a7f42e368bfffb90974effbb8c6b9f6e.tar.gz | |
64-bit portability fixes in network I/O
use $MAX_TABLES mysqltest variable to make join test portable
make test now works with the manager on IA64 Linux
client/mysqltest.c:
added MAX_TABLES variable
libmysql/libmysql.c:
portability fixes for 64-bit systems
mysql-test/mysql-test-run.sh:
fixed bug - wrong values of -display in xterm in gdb mode
mysql-test/r/join.result:
make test work on both 32-bit and 64-bit systems
mysql-test/t/join.test:
make test work on both 32-bit and 64-bit systems
sql/mini_client.cc:
64-bit portability fixes
sql/mini_client.h:
64-bit portability fixes
sql/slave.cc:
64-bit portability fixes
tools/mysqlmanager.c:
64-bit portability fixes
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index c08c93e2439..fc0d8055b6e 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -905,7 +905,8 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, static MYSQL_DATA *read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, uint fields) { - uint field,pkt_len; + uint field; + ulong pkt_len; ulong len; uchar *cp; char *to; @@ -991,7 +992,7 @@ read_one_row(MYSQL *mysql,uint fields,MYSQL_ROW row, ulong *lengths) ulong pkt_len,len; uchar *pos,*prev_pos; - if ((pkt_len=(uint) net_safe_read(mysql)) == packet_error) + if ((pkt_len=net_safe_read(mysql)) == packet_error) return -1; if (pkt_len == 1 && mysql->net.read_pos[0] == 254) return 1; /* End of data */ @@ -1453,7 +1454,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, my_socket sock; uint32 ip_addr; struct sockaddr_in sock_addr; - uint pkt_length; + ulong pkt_length; NET *net= &mysql->net; #ifdef __WIN__ HANDLE hPipe=INVALID_HANDLE_VALUE; @@ -2135,7 +2136,7 @@ int STDCALL mysql_read_query_result(MYSQL *mysql) uchar *pos; ulong field_count; MYSQL_DATA *fields; - uint length; + ulong length; DBUG_ENTER("mysql_read_query_result"); /* read from the connection which we actually used, which |