Commit 8c3b98fe authored by Daniel Black's avatar Daniel Black Committed by Sergey Vojtovich

Whitespace correction to avoid compile warning

Introduced 2f63e2e2

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 950abd52

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: default avatarDaniel Black <daniel.black@au.ibm.com>
parent 2d948ebd
...@@ -3479,7 +3479,7 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref) ...@@ -3479,7 +3479,7 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref)
args[i]->fix_fields(thd, args + i)) || args[i]->fix_fields(thd, args + i)) ||
args[i]->check_cols(1)) args[i]->check_cols(1))
return TRUE; return TRUE;
with_subselect|= args[i]->with_subselect; with_subselect|= args[i]->with_subselect;
} }
/* skip charset aggregation for order columns */ /* skip charset aggregation for order columns */
......
...@@ -2894,8 +2894,8 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr, ...@@ -2894,8 +2894,8 @@ log_event_print_value(IO_CACHE *file, const uchar *ptr,
case 2: case 2:
{ {
strmake(typestr, "ENUM(2 bytes)", typestr_length); strmake(typestr, "ENUM(2 bytes)", typestr_length);
if (!ptr) if (!ptr)
goto return_null; goto return_null;
int32 i32= uint2korr(ptr); int32 i32= uint2korr(ptr);
my_b_printf(file, "%d", i32); my_b_printf(file, "%d", i32);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment