diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-06-11 22:35:30 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-06-11 22:35:30 +0300 |
| commit | 8c67ffffe827ce07fbe55ba0fb89b82cdd9152dc (patch) | |
| tree | 9e164262c9d5ec839e46be8492aad7b8187325bf /sql/log.cc | |
| parent | e835881c474ec1c43ab3c24a9d4a6e2615fb3398 (diff) | |
| parent | de20091f5cee6c018da37a6f4c2c57653d369ad6 (diff) | |
| download | mariadb-git-8c67ffffe827ce07fbe55ba0fb89b82cdd9152dc.tar.gz | |
Merge branch '10.1' into 10.2
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 c50dc4f6344..9865357a4d2 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -2417,7 +2417,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; @@ -2443,7 +2443,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); |