diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-06-06 16:53:46 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-06-06 16:53:46 +0300 |
| commit | 1dcd90b80b105422052a130937131f149d61e583 (patch) | |
| tree | 6f31262b2aae660a5536bb962c312d14b320ed47 /sql/sql_partition.cc | |
| parent | dd7e8529e0901d8ac69fef7cb0ad7c003d20a7ed (diff) | |
| parent | b502a64bba3143a77632042f02876086ab7dff7b (diff) | |
| download | mariadb-git-1dcd90b80b105422052a130937131f149d61e583.tar.gz | |
merge of mysql-5.1->mysql-5.1-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 30bfa9eb35f..0b103dcbda9 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -6571,7 +6571,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 |