diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-11-12 19:56:29 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-11-12 19:56:29 +0400 |
| commit | 7c7269d3723a4044816b1f80424af0ff2bc56f3f (patch) | |
| tree | 877f14dd7dcbe276aa07dc26cbe63541bc893aff /sql/parse_file.cc | |
| parent | 45bb808c7ec0a77bb51038ff370753f8ed5c7ddf (diff) | |
| parent | db0aed93482759844af7b39c9bf6e7fe141f28f6 (diff) | |
| download | mariadb-git-7c7269d3723a4044816b1f80424af0ff2bc56f3f.tar.gz | |
merging.
Diffstat (limited to 'sql/parse_file.cc')
| -rw-r--r-- | sql/parse_file.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/parse_file.cc b/sql/parse_file.cc index 5bc16e55ec0..3ccbfba5aff 100644 --- a/sql/parse_file.cc +++ b/sql/parse_file.cc @@ -381,7 +381,7 @@ sql_parse_prepare(const LEX_STRING *file_name, MEM_ROOT *mem_root, DBUG_RETURN(0); } - if (!(parser->buff= (char*) alloc_root(mem_root, stat_info.st_size+1))) + if (!(parser->buff= (char*) alloc_root(mem_root, (size_t)(stat_info.st_size+1)))) { DBUG_RETURN(0); } @@ -392,7 +392,7 @@ sql_parse_prepare(const LEX_STRING *file_name, MEM_ROOT *mem_root, } if ((len= my_read(file, (uchar *)parser->buff, - stat_info.st_size, MYF(MY_WME))) == + (size_t) stat_info.st_size, MYF(MY_WME))) == MY_FILE_ERROR) { my_close(file, MYF(MY_WME)); |