diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-06-06 16:17:58 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-06-06 16:17:58 +0300 |
| commit | 54729bbc60045fa86d0a2a2bcc0119fb9da204f5 (patch) | |
| tree | e7595cefaa0afdcedf56e8168738706d0b83f841 /sql/sql_partition.cc | |
| parent | dfd4dd67c5e27865035702ddce998eaebf285381 (diff) | |
| parent | ec8b38b7bd6762164c268f84489dc7ea538feb77 (diff) | |
| download | mariadb-git-54729bbc60045fa86d0a2a2bcc0119fb9da204f5.tar.gz | |
merged mysql-5.5->mysql-5.5-security
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 52d6757b03a..354548cbda4 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -7025,7 +7025,7 @@ void set_key_field_ptr(KEY *key_info, const uchar *new_buf, void mem_alloc_error(size_t size) { - my_error(ER_OUTOFMEMORY, MYF(0), size); + my_error(ER_OUTOFMEMORY, MYF(0), static_cast<int>(size)); } #ifdef WITH_PARTITION_STORAGE_ENGINE |