summaryrefslogtreecommitdiff
path: root/sql/multi_range_read.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-08-29 18:50:38 -0700
committerIgor Babaev <igor@askmonty.org>2012-08-29 18:50:38 -0700
commit98f239a8494104743b4a7f2df5b8d7f310975689 (patch)
tree4beee747e184ab6b7d873d936e244397e4f8b49d /sql/multi_range_read.cc
parentd0ad93fbc7eca575364e46f67c4613efb0807047 (diff)
parentb45c551ee32d0d5260f4958abf93efab1a4614a2 (diff)
downloadmariadb-git-98f239a8494104743b4a7f2df5b8d7f310975689.tar.gz
Merge 5.5->5.5-mwl248.
Diffstat (limited to 'sql/multi_range_read.cc')
-rw-r--r--sql/multi_range_read.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc
index 036775cdf3e..1361d5822c9 100644
--- a/sql/multi_range_read.cc
+++ b/sql/multi_range_read.cc
@@ -1404,7 +1404,7 @@ ha_rows DsMrr_impl::dsmrr_info(uint keyno, uint n_ranges, uint rows,
uint key_parts,
uint *bufsz, uint *flags, COST_VECT *cost)
{
- ha_rows res;
+ ha_rows res __attribute__((unused));
uint def_flags= *flags;
uint def_bufsz= *bufsz;