diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-13 15:11:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-13 15:11:43 +0300 |
| commit | d83a4432503d199f6aed8e378563b08471d090dc (patch) | |
| tree | 4982259fb773f1d1e627e010fba0f58a10e82a13 /sql/log.cc | |
| parent | 6c30bc2181328ea619d1ab61a464feb0514bf12a (diff) | |
| parent | b68f1d847f1fc00eed795e20162effc8fbc4119b (diff) | |
| download | mariadb-git-d83a4432503d199f6aed8e378563b08471d090dc.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index d212ebb4dc3..4459f6121f3 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -2457,7 +2457,7 @@ static int find_uniq_filename(char *name, ulong next_log_number) char buff[FN_REFLEN], ext_buf[FN_REFLEN]; struct st_my_dir *dir_info; struct fileinfo *file_info; - ulong max_found, next, UNINIT_VAR(number); + ulong max_found= 0, next= 0, number= 0; size_t buf_length, length; char *start, *end; int error= 0; @@ -2484,7 +2484,7 @@ static int find_uniq_filename(char *name, ulong next_log_number) if (strncmp(file_info->name, start, length) == 0 && test_if_number(file_info->name+length, &number,0)) { - set_if_bigger(max_found,(ulong) number); + set_if_bigger(max_found, number); } } my_dirend(dir_info); |