database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix valgrind warnings

Browse Source
This commit is contained in:
Sergey Petrunya
2011-02-20 11:35:26 +03:00
parent e7aa18fb9c
commit 9ccce9f100
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/opt_range.cc
View File

@ -341,8 +341,9 @@ public:
SEL_ARG(Field *field, uint8 part, uchar *min_value, uchar *max_value, SEL_ARG(Field *field, uint8 part, uchar *min_value, uchar *max_value,
uint8 min_flag, uint8 max_flag, uint8 maybe_flag); uint8 min_flag, uint8 max_flag, uint8 maybe_flag);
SEL_ARG(enum Type type_arg) SEL_ARG(enum Type type_arg)
:min_flag(0),elements(1),use_count(1),left(0),right(0),next_key_part(0), :min_flag(0), max_part_no(0) /* first key part means 1. 0 mean 'no parts'*/,
color(BLACK), type(type_arg) elements(1),use_count(1),left(0),right(0),
next_key_part(0), color(BLACK), type(type_arg)
{} {}
inline bool is_same(SEL_ARG *arg) inline bool is_same(SEL_ARG *arg)
{ {

5
sql/sql_select.cc
View File

@ -8521,7 +8521,7 @@ make_join_readinfo(JOIN *join, ulonglong options, uint no_jbuf_after)
//for (i=join->const_tables ; i < join->tables ; i++) //for (i=join->const_tables ; i < join->tables ; i++)
for (tab= first_linear_tab(join, TRUE), i= join->const_tables; for (tab= first_linear_tab(join, TRUE), i= join->const_tables;
tab; tab;
tab= next_linear_tab(join, tab, TRUE), i++) tab= next_linear_tab(join, tab, TRUE))
{ {
/* /*
The approximation below for partial join cardinality is not good because The approximation below for partial join cardinality is not good because
@ -8533,8 +8533,11 @@ make_join_readinfo(JOIN *join, ulonglong options, uint no_jbuf_after)
if ((tab->bush_root_tab && tab->bush_root_tab->bush_children->start == tab) || if ((tab->bush_root_tab && tab->bush_root_tab->bush_children->start == tab) ||
(tab == join->join_tab + join->const_tables)) (tab == join->join_tab + join->const_tables))
prev_tab= NULL; prev_tab= NULL;
DBUG_ASSERT(tab->bush_children || tab->table == join->best_positions[i].table->table);
tab->partial_join_cardinality= join->best_positions[i].records_read * tab->partial_join_cardinality= join->best_positions[i].records_read *
(prev_tab? prev_tab->partial_join_cardinality : 1); (prev_tab? prev_tab->partial_join_cardinality : 1);
if (!tab->bush_children)
i++;
} }
check_join_cache_usage_for_tables(join, options, no_jbuf_after); check_join_cache_usage_for_tables(join, options, no_jbuf_after);