diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-11 21:31:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-11 21:31:03 +0300 |
| commit | 1bf3e8ab43e982953d7534db902020d321364afb (patch) | |
| tree | 7de4aaac9f947d4302cd4edbb5677da8917ade71 /storage/myisam | |
| parent | f5bebaf1d6a0ff2fca9b342ed5910b9d34a276bb (diff) | |
| parent | 4901f31c13f91e130f077f2f77b32c40b0036e32 (diff) | |
| download | mariadb-git-1bf3e8ab43e982953d7534db902020d321364afb.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mi_check.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index c638dcbe3e8..f6929438ac0 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -111,7 +111,7 @@ int chk_status(HA_CHECK *param, register MI_INFO *info) if (share->state.open_count != (uint) (info->s->global_changed ? 1 : 0)) { /* Don't count this as a real warning, as check can correct this ! */ - uint save=param->warning_printed; + my_bool save=param->warning_printed; mi_check_print_warning(param, share->state.open_count==1 ? "%d client is using or hasn't closed the table properly" : @@ -526,7 +526,7 @@ int chk_key(HA_CHECK *param, register MI_INFO *info) (key_part_map)1, HA_READ_KEY_EXACT)) { /* Don't count this as a real warning, as myisamchk can't correct it */ - uint save=param->warning_printed; + my_bool save=param->warning_printed; mi_check_print_warning(param, "Found row where the auto_increment " "column has the value 0"); param->warning_printed=save; @@ -1515,7 +1515,8 @@ int mi_repair(HA_CHECK *param, register MI_INFO *info, new_file= -1; sort_param.sort_info=&sort_info; param->retry_repair= 0; - param->warning_printed= param->error_printed= param->note_printed= 0; + param->warning_printed= param->note_printed= 0; + param->error_printed= 0; if (!(param->testflag & T_SILENT)) { @@ -2210,7 +2211,8 @@ int mi_repair_by_sort(HA_CHECK *param, register MI_INFO *info, } param->testflag|=T_REP_BY_SORT; /* for easy checking */ param->retry_repair= 0; - param->warning_printed= param->error_printed= param->note_printed= 0; + param->warning_printed= param->note_printed= 0; + param->error_printed= 0; if (info->s->options & (HA_OPTION_CHECKSUM | HA_OPTION_COMPRESS_RECORD)) param->testflag|=T_CALC_CHECKSUM; |