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/ha_myisam.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/ha_myisam.cc')
| -rw-r--r-- | sql/ha_myisam.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 7a8585975cc..fa130c59a88 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -130,7 +130,7 @@ int ha_myisam::net_read_dump(NET* net) my_seek(data_fd, 0L, MY_SEEK_SET, MYF(MY_WME)); for(;;) { - uint packet_len = my_net_read(net); + ulong packet_len = my_net_read(net); if (!packet_len) break ; // end of file if (packet_len == packet_error) @@ -139,7 +139,7 @@ int ha_myisam::net_read_dump(NET* net) error= -1; goto err; } - if (my_write(data_fd, (byte*)net->read_pos, packet_len, + if (my_write(data_fd, (byte*)net->read_pos, (uint) packet_len, MYF(MY_WME|MY_FNABP))) { error = errno; |