summaryrefslogtreecommitdiff
path: root/sql/opt_range.cc
diff options
context:
space:
mode:
authorunknown <serg@janus.mylan>2007-04-16 18:16:17 +0200
committerunknown <serg@janus.mylan>2007-04-16 18:16:17 +0200
commitdcef028f713d84135013d6b9edd7c007818ad3fc (patch)
tree45078bb08a9d29ab98b50746b333b59e2f1f43af /sql/opt_range.cc
parent7cb8a33b1af33dcd8806ec6021655a39f375d904 (diff)
downloadmariadb-git-dcef028f713d84135013d6b9edd7c007818ad3fc.tar.gz
wl#2936 post-merge fixes
client/mysqltest.c: warnings extra/comp_err.c: warnings sql/event_queue.cc: warnings sql/handler.h: warnings sql/opt_range.cc: warnings sql/opt_range.h: warnings sql/rpl_mi.cc: warnings sql/sql_class.cc: wl#2936 post-merge fixes, warnings
Diffstat (limited to 'sql/opt_range.cc')
-rw-r--r--sql/opt_range.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index f5cf79bd609..96ae6174fdb 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -1552,8 +1552,8 @@ QUICK_ROR_UNION_SELECT::~QUICK_ROR_UNION_SELECT()
QUICK_RANGE::QUICK_RANGE()
:min_key(0),max_key(0),min_length(0),max_length(0),
- min_keypart_map(0), max_keypart_map(0),
- flag(NO_MIN_RANGE | NO_MAX_RANGE)
+ flag(NO_MIN_RANGE | NO_MAX_RANGE),
+ min_keypart_map(0), max_keypart_map(0)
{}
SEL_ARG::SEL_ARG(SEL_ARG &arg) :Sql_alloc()
@@ -10008,11 +10008,12 @@ QUICK_GROUP_MIN_MAX_SELECT(TABLE *table, JOIN *join_arg, bool have_min_arg,
ha_rows records_arg, uint key_infix_len_arg,
byte *key_infix_arg, MEM_ROOT *parent_alloc)
:join(join_arg), index_info(index_info_arg),
- group_prefix_len(group_prefix_len_arg), have_min(have_min_arg),
+ group_prefix_len(group_prefix_len_arg),
+ group_key_parts(group_key_parts_arg), have_min(have_min_arg),
have_max(have_max_arg), seen_first_key(FALSE),
min_max_arg_part(min_max_arg_part_arg), key_infix(key_infix_arg),
key_infix_len(key_infix_len_arg), min_functions_it(NULL),
- max_functions_it(NULL), group_key_parts(group_key_parts_arg)
+ max_functions_it(NULL)
{
head= table;
file= head->file;