summaryrefslogtreecommitdiff
path: root/sql/ha_archive.cc
diff options
context:
space:
mode:
authorIgnacio Galarza <iggy@mysql.com>2009-02-10 17:47:54 -0500
committerIgnacio Galarza <iggy@mysql.com>2009-02-10 17:47:54 -0500
commit54fbbf9591e21cda9f7b26c2d795d88f51827f07 (patch)
tree6d7f0073845344099159d82b6dfe2e017670b700 /sql/ha_archive.cc
parent4568152518d075ec543bcc55b77241e4a5bf7c17 (diff)
downloadmariadb-git-54fbbf9591e21cda9f7b26c2d795d88f51827f07.tar.gz
Bug#29125 Windows Server X64: so many compiler warnings
- Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length
Diffstat (limited to 'sql/ha_archive.cc')
-rw-r--r--sql/ha_archive.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_archive.cc b/sql/ha_archive.cc
index 0c558bf2515..04dbe678d4d 100644
--- a/sql/ha_archive.cc
+++ b/sql/ha_archive.cc
@@ -851,7 +851,7 @@ int ha_archive::get_row(gzFile file_to_read, byte *buf)
total_blob_length += ((Field_blob*) table->field[*ptr])->get_length();
/* Adjust our row buffer if we need be */
- buffer.alloc(total_blob_length);
+ buffer.alloc((uint) total_blob_length);
last= (char *)buffer.ptr();
/* Loop through our blobs and read them */
@@ -862,10 +862,10 @@ int ha_archive::get_row(gzFile file_to_read, byte *buf)
size_t size= ((Field_blob*) table->field[*ptr])->get_length();
if (size)
{
- read= gzread(file_to_read, last, size);
+ read= gzread(file_to_read, last, (uint) size);
if ((size_t) read != size)
DBUG_RETURN(HA_ERR_END_OF_FILE);
- ((Field_blob*) table->field[*ptr])->set_ptr(size, last);
+ ((Field_blob*) table->field[*ptr])->set_ptr((uint) size, last);
last += size;
}
}