diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-07-05 21:46:53 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-07-05 21:46:53 +0200 |
| commit | f9cb1467b84aba6cdc3178617def27c2993f016d (patch) | |
| tree | b415e273aafc2a6f0612b1f6cc55dbb0b0a06827 /sql/item_strfunc.cc | |
| parent | 9e95a54793920ade348399a74a1e39ea3a27b635 (diff) | |
| parent | b48dc8306f2b729bef09f9cdf30d7897726b873e (diff) | |
| download | mariadb-git-f9cb1467b84aba6cdc3178617def27c2993f016d.tar.gz | |
merge Windows performance patches into 5.3
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 453773478d8..a2f600d8473 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -3026,16 +3026,16 @@ String *Item_load_file::val_str(String *str) func_name(), current_thd->variables.max_allowed_packet); goto err; } - if (tmp_value.alloc(stat_info.st_size)) + if (tmp_value.alloc((size_t)stat_info.st_size)) goto err; if ((file = my_open(file_name->ptr(), O_RDONLY, MYF(0))) < 0) goto err; - if (my_read(file, (uchar*) tmp_value.ptr(), stat_info.st_size, MYF(MY_NABP))) + if (my_read(file, (uchar*) tmp_value.ptr(), (size_t)stat_info.st_size, MYF(MY_NABP))) { my_close(file, MYF(0)); goto err; } - tmp_value.length(stat_info.st_size); + tmp_value.length((uint32)stat_info.st_size); my_close(file, MYF(0)); null_value = 0; DBUG_RETURN(&tmp_value); |