diff options
| author | Magnus Svensson <msvensson@mysql.com> | 2008-08-08 20:10:43 +0200 |
|---|---|---|
| committer | Magnus Svensson <msvensson@mysql.com> | 2008-08-08 20:10:43 +0200 |
| commit | d7f846be94176b3f13734fbdc360336fb79c5104 (patch) | |
| tree | dbbade1e26954cd7d96983156e6d392fda247207 /libmysqld | |
| parent | bfcefa1bd8d60c5816a257bd27cac0c14cdea90d (diff) | |
| parent | 1d5e2c8dc41e7261e9cc4d2a6548509c10945d3d (diff) | |
| download | mariadb-git-d7f846be94176b3f13734fbdc360336fb79c5104.tar.gz | |
Merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/emb_qcache.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc index fdd7f8ed776..b4eddf39c1f 100644 --- a/libmysqld/emb_qcache.cc +++ b/libmysqld/emb_qcache.cc @@ -447,7 +447,8 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src) if (thd->protocol == &thd->protocol_binary) { uint length; - row= (MYSQL_ROWS *)alloc_root(&data->alloc, rows * sizeof(MYSQL_ROWS)); + row= (MYSQL_ROWS *)alloc_root(&data->alloc, + (size_t) (rows * sizeof(MYSQL_ROWS))); end_row= row + rows; data->data= row; |