← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/load_file.cc

  • Committer: Monty Taylor
  • Date: 2009-02-21 01:15:13 UTC
  • mto: (892.1.5 devel)
  • mto: This revision was merged to the branch mainline in revision 898.
  • Revision ID: mordred@inaugust.com-20090221011513-c3jq8dfaiboc64cl
More solaris warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/load_file.cc
60
60
                        func_name(), current_session->variables.max_allowed_packet);
61
61
    goto err;
62
62
  }
63
 
  if (tmp_value.alloc(stat_info.st_size))
 
63
  if (tmp_value.alloc((size_t)stat_info.st_size))
64
64
    goto err;
65
65
  if ((file = my_open(file_name->c_ptr(), O_RDONLY, MYF(0))) < 0)
66
66
    goto err;
67
 
  if (my_read(file, (unsigned char*) tmp_value.ptr(), stat_info.st_size, MYF(MY_NABP)))
 
67
  if (my_read(file, (unsigned char*) tmp_value.ptr(), (size_t)stat_info.st_size, MYF(MY_NABP)))
68
68
  {
69
69
    my_close(file, MYF(0));
70
70
    goto err;
71
71
  }
72
 
  tmp_value.length(stat_info.st_size);
 
72
  tmp_value.length((size_t)stat_info.st_size);
73
73
  my_close(file, MYF(0));
74
74
  null_value = 0;
75
75
  return(&tmp_value);