Skip to content

Commit 0214115

Browse files
committed
trivial cleanup
1 parent 03dec1a commit 0214115

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

sql/sys_vars.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3025,14 +3025,16 @@ static bool check_log_path(sys_var *self, THD *thd, set_var *var)
30253025
if (!var->save_result.string_value.str)
30263026
return true;
30273027

3028-
if (var->save_result.string_value.length > FN_REFLEN)
3028+
LEX_STRING *val= &var->save_result.string_value;
3029+
3030+
if (val->length > FN_REFLEN)
30293031
{ // path is too long
30303032
my_error(ER_PATH_LENGTH, MYF(0), self->name.str);
30313033
return true;
30323034
}
30333035

30343036
char path[FN_REFLEN];
3035-
size_t path_length= unpack_filename(path, var->save_result.string_value.str);
3037+
size_t path_length= unpack_filename(path, val->str);
30363038

30373039
if (!path_length)
30383040
return true;
@@ -3046,9 +3048,9 @@ static bool check_log_path(sys_var *self, THD *thd, set_var *var)
30463048
return false;
30473049
}
30483050

3049-
(void) dirname_part(path, var->save_result.string_value.str, &path_length);
3051+
(void) dirname_part(path, val->str, &path_length);
30503052

3051-
if (var->save_result.string_value.length - path_length >= FN_LEN)
3053+
if (val->length - path_length >= FN_LEN)
30523054
{ // filename is too long
30533055
my_error(ER_PATH_LENGTH, MYF(0), self->name.str);
30543056
return true;

0 commit comments

Comments
 (0)