Skip to content

Commit a849f59

Browse files
committed
Minor post-commit fixes (WL#7199):
* sql/item_func.cc: initialize Item_func::args with tmp_args if arg_count == 0 to make valgrind happy when it traces "for(... = args + arg_count...)" in Item::walk(); * sql/parse_tree_nodes.h: remove the trailing comma in the emum definition to make some C++ compilers happy.
1 parent d39d9ad commit a849f59

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

sql/item_func.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@ Item_func::Item_func(const POS &pos, PT_item_list *opt_list)
118118
: super(pos), allowed_arg_cols(1)
119119
{
120120
if (opt_list == NULL)
121+
{
122+
args= tmp_arg;
121123
arg_count= 0;
124+
}
122125
else
123126
set_arguments(opt_list->value, true);
124127
}

sql/parse_tree_nodes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ enum PT_join_table_type
273273
JTT_RIGHT = 0x10,
274274

275275
JTT_NATURAL_LEFT = JTT_NATURAL | JTT_LEFT,
276-
JTT_NATURAL_RIGHT = JTT_NATURAL | JTT_RIGHT,
276+
JTT_NATURAL_RIGHT = JTT_NATURAL | JTT_RIGHT
277277
};
278278

279279

0 commit comments

Comments
 (0)