summaryrefslogtreecommitdiff
path: root/sql/opt_range_mrr.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-02-25 20:15:27 +0200
committerMichael Widenius <monty@askmonty.org>2011-02-25 20:15:27 +0200
commit52b64be318d642149933da958d518ad9ee7fed20 (patch)
tree0aeb7ec43f03be21a874c67ffbeb1e52d8e78dba /sql/opt_range_mrr.cc
parent6c610ed97964a6370e7082ca1fd1f11c4d6720ba (diff)
downloadmariadb-git-52b64be318d642149933da958d518ad9ee7fed20.tar.gz
Fixed compiler warnings
client/readline.cc: Initialize not used variable (to kill wrong compiler warning) mysql-test/suite/handler/aria.result: Updated test result mysql-test/suite/handler/handler.inc: Changed index to ensure rows are in a fixed order mysql-test/suite/handler/heap.result: Updated test result mysql-test/suite/handler/innodb.result: Updated test result mysql-test/suite/handler/myisam.result: Updated test result plugin/handler_socket/handlersocket/Makefile.am: Use CXX flags to compile sql/filesort.cc: Initialize variable that may be used sql/log.cc: Initialize not used variable (to kill wrong compiler warning) sql/opt_range_mrr.cc: Fixed cast to avoid compiler warning storage/xtradb/fil/fil0fil.c: Added cast to avoid compiler warning
Diffstat (limited to 'sql/opt_range_mrr.cc')
-rw-r--r--sql/opt_range_mrr.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_range_mrr.cc b/sql/opt_range_mrr.cc
index 2047f6f250c..da6086d6cdc 100644
--- a/sql/opt_range_mrr.cc
+++ b/sql/opt_range_mrr.cc
@@ -225,7 +225,7 @@ walk_up_n_right:
RANGE_SEQ_ENTRY *cur= &seq->stack[seq->i];
uint min_key_length= cur->min_key - seq->param->min_key;
- range->ptr= (char*)(int)(key_tree->part);
+ range->ptr= (char*)(intptr)(key_tree->part);
if (cur->min_key_flag & GEOM_FLAG)
{
range->range_flag= cur->min_key_flag;