← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_iocache.cc

Merged in latest plugin-slot-reorg.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_iocache.cc
501
501
  {
502
502
    if (Count)
503
503
    {
504
 
      info->error= left_length;         /* We only got this many char */
 
504
      info->error= static_cast<int>(left_length);       /* We only got this many char */
505
505
      return(1);
506
506
    }
507
507
    length=0;                           /* Didn't read any chars */
1183
1183
    info->append_read_pos += copy_len;
1184
1184
    Count -= copy_len;
1185
1185
    if (Count)
1186
 
      info->error = save_count - Count;
 
1186
      info->error = static_cast<int>(save_count - Count);
1187
1187
 
1188
1188
    /* Fill read buffer with data from write buffer */
1189
1189
    memcpy(info->buffer, info->append_read_pos,