diff options
| author | monty@hundin.mysql.fi <> | 2001-12-05 13:03:00 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-12-05 13:03:00 +0200 |
| commit | 1de4fff5ba80982cbed3a524488528c83ed8f945 (patch) | |
| tree | 739c2cfffa69408c6460ba4c419a59d5b594cbb1 /sql/mf_iocache.cc | |
| parent | 1d26537da53fee228b2f9d974d4806a06b76e33e (diff) | |
| download | mariadb-git-1de4fff5ba80982cbed3a524488528c83ed8f945.tar.gz | |
Update of query cache code.
Changed some sql_alloc() -> thd->alloc()
Removed a lot of compiler warnings on Linux Alpha (64 bit)
Fixed some core dumps on 64 bit systems (wrong type for packet_len)
Diffstat (limited to 'sql/mf_iocache.cc')
| -rw-r--r-- | sql/mf_iocache.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mf_iocache.cc b/sql/mf_iocache.cc index 2a7b25eab2f..860318d5a79 100644 --- a/sql/mf_iocache.cc +++ b/sql/mf_iocache.cc @@ -50,14 +50,14 @@ extern "C" { int _my_b_net_read(register IO_CACHE *info, byte *Buffer, uint Count __attribute__((unused))) { - int read_length; + ulong read_length; NET *net= &(current_thd)->net; DBUG_ENTER("_my_b_net_read"); if (!info->end_of_file) DBUG_RETURN(1); /* because my_b_get (no _) takes 1 byte at a time */ read_length=my_net_read(net); - if (read_length == (int) packet_error) + if (read_length == packet_error) { info->error= -1; DBUG_RETURN(1); |