Skip to content

Commit 8c3b98f

Browse files
grooverdansvoj
authored andcommitted
Whitespace correction to avoid compile warning
Introduced 2f63e2e Compiler error was: sql/log_event.cc: In function ‘size_t log_event_print_value(IO_CACHE*, const uchar*, uint, uint, char*, size_t)’: sql/log_event.cc:2897:7: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation] if (!ptr) ^~ sql/log_event.cc:2900:9: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’ int32 i32= uint2korr(ptr); ^~~~~ Added in 950abd5 Error was: sql/item_sum.cc:3478:5: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation] if ((!args[i]->fixed && ^~ /sql/item_sum.cc:3482:7: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’ with_subselect|= args[i]->with_subselect; ^~~~~~~~~~~~~~ Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
1 parent 2d948eb commit 8c3b98f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

sql/item_sum.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3479,7 +3479,7 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref)
34793479
args[i]->fix_fields(thd, args + i)) ||
34803480
args[i]->check_cols(1))
34813481
return TRUE;
3482-
with_subselect|= args[i]->with_subselect;
3482+
with_subselect|= args[i]->with_subselect;
34833483
}
34843484

34853485
/* skip charset aggregation for order columns */

sql/log_event.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2894,8 +2894,8 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
28942894
case 2:
28952895
{
28962896
strmake(typestr, "ENUM(2 bytes)", typestr_length);
2897-
if (!ptr)
2898-
goto return_null;
2897+
if (!ptr)
2898+
goto return_null;
28992899

29002900
int32 i32= uint2korr(ptr);
29012901
my_b_printf(file, "%d", i32);

0 commit comments

Comments
 (0)