Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.

This commit is contained in:
Davi Arnaut 2010-11-30 21:20:32 -02:00
commit 64c357d078

View File

@ -84,8 +84,11 @@ static int safe_print_str(const char *addr, int max_len)
if ((fd= open(buf, O_RDONLY)) < 0)
return -1;
/* Ensure that off_t can hold a pointer. */
compile_time_assert(sizeof(off_t) >= sizeof(intptr));
total= max_len;
offset= (off_t) addr;
offset= (intptr) addr;
/* Read up to the maximum number of bytes. */
while (total)