diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-14 10:04:07 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-14 10:04:07 +0200 |
| commit | f57ecb7786177e0af3b1e3ec94302720b2e0f967 (patch) | |
| tree | fcbed357c5bcdb373830413086d4f58ff9ba2998 /sql/multi_range_read.cc | |
| parent | 9bfbe7fbce86eab5a8a5de7e401772f058872716 (diff) | |
| parent | d364e64ae28c5588ea0ad013738a8dfe18412292 (diff) | |
| download | mariadb-git-f57ecb7786177e0af3b1e3ec94302720b2e0f967.tar.gz | |
5.5 merge
Diffstat (limited to 'sql/multi_range_read.cc')
| -rw-r--r-- | sql/multi_range_read.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc index b9f49a83b4b..e3719600dff 100644 --- a/sql/multi_range_read.cc +++ b/sql/multi_range_read.cc @@ -1648,7 +1648,7 @@ int DsMrr_impl::dsmrr_explain_info(uint mrr_mode, char *str, size_t size) uint used_str_len= strlen(used_str); uint copy_len= min(used_str_len, size); - memcpy(str, used_str, size); + memcpy(str, used_str, copy_len); return copy_len; } return 0; |