diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-04-12 01:01:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-12 01:01:18 +0200 |
| commit | ce926c90accc6ca36c62f0b954e651d89db66da8 (patch) | |
| tree | 737c9571a90e6e1f07be30d8bdc64c2f06d6fbf3 /sql/multi_range_read.cc | |
| parent | 5ae72bb73cceafe5062be3827dbe3b4f488a7a73 (diff) | |
| parent | ea4a417a8d456e8e09b6b4306f22c7c20b3e594c (diff) | |
| download | mariadb-git-ce926c90accc6ca36c62f0b954e651d89db66da8.tar.gz | |
5.3 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 800602fe9e1..175405790b5 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; |