diff options
| author | unknown <hf@deer.(none)> | 2004-07-21 18:23:13 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-07-21 18:23:13 +0500 |
| commit | e217b2fd51cf9c8f559995077c06b73e93e48a82 (patch) | |
| tree | 16a98900f75dc2ec272848b43f9769ec7ff0b377 /libmysqld | |
| parent | b940ae1012b00e74e2155c4e35ca7872bed278e3 (diff) | |
| download | mariadb-git-e217b2fd51cf9c8f559995077c06b73e93e48a82.tar.gz | |
Fix for bug #4531(64bit embedded server crashes)
There is some 'ulong'<->'uint' mess in libmysqld.c
libmysqld/libmysqld.c:
Several local variables made 'ulong' from 'uint'
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/libmysqld.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 6f60e4c4fbc..9c79536b2e0 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -412,8 +412,8 @@ mysql_free_result(MYSQL_RES *result) DBUG_PRINT("warning",("Not all rows in set were read; Ignoring rows")); for (;;) { - uint pkt_len; - if ((pkt_len=(uint) net_safe_read(result->handle)) == packet_error) + ulong pkt_len; + if ((pkt_len=net_safe_read(result->handle)) == packet_error) break; if (pkt_len == 1 && result->handle->net.read_pos[0] == 254) break; /* End of data */ @@ -611,7 +611,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; @@ -620,7 +621,7 @@ static MYSQL_DATA *read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields, NET *net = &mysql->net; DBUG_ENTER("read_rows"); - if ((pkt_len=(uint) net_safe_read(mysql)) == packet_error) + if ((pkt_len= net_safe_read(mysql)) == packet_error) DBUG_RETURN(0); if (!(result=(MYSQL_DATA*) my_malloc(sizeof(MYSQL_DATA), MYF(MY_WME | MY_ZEROFILL)))) @@ -805,7 +806,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, uint port, const char *unix_socket,uint client_flag) { char buff[100],charset_name_buff[16],*end,*host_info, *charset_name; - uint pkt_length; + ulong pkt_length; ulong max_allowed_packet; NET *net= &mysql->net; DBUG_ENTER("mysql_real_connect"); @@ -1153,7 +1154,7 @@ mysql_read_query_result(MYSQL *mysql) uchar *pos; ulong field_count; MYSQL_DATA *fields; - uint length; + ulong length; DBUG_ENTER("mysql_read_query_result"); if ((length=net_safe_read(mysql)) == packet_error) |