database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-27 08:21:15 +03:00
Code Activity

Revert "Merge pull request #1046 from drrtuy/MCOL-3769"

Browse Source 
This has an uninit'd var warning from the compiler.  It fixes one test
and breaks 2 others in test001.

This reverts commit cf668897ef, reversing
changes made to 25084d0020.
This commit is contained in:
Patrick LeBlanc
2020-02-14 18:23:54 -05:00
parent eb60168cba
commit ae515a36b8
3 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dbcon/mysql/ha_mcs_opt_rewrites.cpp
View File

@@ -18,7 +18,7 @@
// Search simplify_joins() function in the server's code for detail
COND *
simplify_joins_cs(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top,
simplify_joins_(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top,
bool in_sj)
{
TABLE_LIST *table;
@@ -26,7 +26,7 @@ simplify_joins_cs(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top
TABLE_LIST *prev_table= 0;
List_iterator<TABLE_LIST> li(*join_list);
bool straight_join= MY_TEST(join->select_options & SELECT_STRAIGHT_JOIN);
DBUG_ENTER("simplify_joins_cs");
DBUG_ENTER("simplify_joins");
/*
Try to simplify join operations from join_list.
@@ -54,7 +54,7 @@ simplify_joins_cs(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top
the outer join is converted to an inner join and
the corresponding on expression is added to E.
*/
expr= simplify_joins_cs(join, &nested_join->join_list,
expr= simplify_joins_(join, &nested_join->join_list,
expr, FALSE, in_sj || table->sj_on_expr);
if (!table->prep_on_expr || expr != table->on_expr)
@@ -67,7 +67,7 @@ simplify_joins_cs(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top
}
nested_join->used_tables= (table_map) 0;
nested_join->not_null_tables=(table_map) 0;
conds= simplify_joins_cs(join, &nested_join->join_list, conds, top,
conds= simplify_joins_(join, &nested_join->join_list, conds, top,
in_sj || table->sj_on_expr);
used_tables= nested_join->used_tables;
not_null_tables= nested_join->not_null_tables;
@@ -241,5 +241,5 @@ simplify_joins_cs(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top
li.replace(repl_list);
}
}
DBUG_RETURN(conds);
DBUG_RETURN(conds);
}