From 8722d4b8d219f687509b95d952fb46dff684ba00 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 18 Feb 2017 10:20:15 +0100 Subject: [PATCH] cleanup: remove 16-year-old "TODO" --- storage/maria/ma_check.c | 6 +++--- storage/maria/ma_open.c | 10 +++------- storage/maria/maria_chk.c | 2 +- storage/maria/maria_def.h | 3 +-- storage/myisam/mi_check.c | 6 +++--- storage/myisam/mi_open.c | 10 +++------- storage/myisam/myisamchk.c | 2 +- storage/myisam/myisamdef.h | 3 +-- 8 files changed, 16 insertions(+), 26 deletions(-) diff --git a/storage/maria/ma_check.c b/storage/maria/ma_check.c index ecdc512ef6924..571cb532a1c60 100644 --- a/storage/maria/ma_check.c +++ b/storage/maria/ma_check.c @@ -2839,7 +2839,7 @@ int maria_repair(HA_CHECK *param, register MARIA_HA *info, (param->testflag & T_BACKUP_DATA ? MYF(MY_REDEL_MAKE_BACKUP): MYF(0)) | sync_dir) || - _ma_open_datafile(info, share, NullS, -1)) + _ma_open_datafile(info, share, NullS)) { goto err; } @@ -3990,7 +3990,7 @@ int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info, (param->testflag & T_BACKUP_DATA ? MYF(MY_REDEL_MAKE_BACKUP): MYF(0)) | sync_dir) || - _ma_open_datafile(info, share, NullS, -1)) + _ma_open_datafile(info, share, NullS)) { _ma_check_print_error(param, "Couldn't change to new data file"); goto err; @@ -4622,7 +4622,7 @@ int maria_repair_parallel(HA_CHECK *param, register MARIA_HA *info, MYF((param->testflag & T_BACKUP_DATA ? MY_REDEL_MAKE_BACKUP : 0) | sync_dir)) || - _ma_open_datafile(info,share, NullS, -1)) + _ma_open_datafile(info,share, NullS)) got_error=1; } } diff --git a/storage/maria/ma_open.c b/storage/maria/ma_open.c index 83d37a17483c2..bc1e5ac9a8ba4 100644 --- a/storage/maria/ma_open.c +++ b/storage/maria/ma_open.c @@ -104,7 +104,7 @@ static MARIA_HA *maria_clone_internal(MARIA_SHARE *share, const char *name, } if (data_file >= 0) info.dfile.file= data_file; - else if (_ma_open_datafile(&info, share, name, -1)) + else if (_ma_open_datafile(&info, share, name)) goto err; errpos= 5; @@ -820,7 +820,7 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags) if ((share->data_file_type == BLOCK_RECORD || share->data_file_type == COMPRESSED_RECORD)) { - if (_ma_open_datafile(&info, share, name, -1)) + if (_ma_open_datafile(&info, share, name)) goto err; data_file= info.dfile.file; } @@ -1863,13 +1863,9 @@ void _ma_set_index_pagecache_callbacks(PAGECACHE_FILE *file, Open data file We can't use dup() here as the data file descriptors need to have different active seek-positions. - - The argument file_to_dup is here for the future if there would on some OS - exist a dup()-like call that would give us two different file descriptors. *************************************************************************/ -int _ma_open_datafile(MARIA_HA *info, MARIA_SHARE *share, const char *org_name, - File file_to_dup __attribute__((unused))) +int _ma_open_datafile(MARIA_HA *info, MARIA_SHARE *share, const char *org_name) { char *data_name= share->data_file_name.str; char real_data_name[FN_REFLEN]; diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index cfc8a604118ba..61d0b1f66c0da 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -1242,7 +1242,7 @@ static int maria_chk(HA_CHECK *param, char *filename) mysql_file_close(info->dfile.file, MYF(MY_WME)); /* Close new file */ error|=maria_change_to_newfile(filename,MARIA_NAME_DEXT,DATA_TMP_EXT, 0, MYF(0)); - if (_ma_open_datafile(info,info->s, NullS, -1)) + if (_ma_open_datafile(info,info->s, NullS)) error=1; param->out_flag&= ~O_NEW_DATA; /* We are using new datafile */ param->read_cache.file= info->dfile.file; diff --git a/storage/maria/maria_def.h b/storage/maria/maria_def.h index 473cddee190a4..11cf8c8612e64 100644 --- a/storage/maria/maria_def.h +++ b/storage/maria/maria_def.h @@ -1302,8 +1302,7 @@ int _ma_def_scan_restore_pos(MARIA_HA *info, MARIA_RECORD_POS lastpos); extern MARIA_HA *_ma_test_if_reopen(const char *filename); my_bool _ma_check_table_is_closed(const char *name, const char *where); -int _ma_open_datafile(MARIA_HA *info, MARIA_SHARE *share, const char *org_name, - File file_to_dup); +int _ma_open_datafile(MARIA_HA *info, MARIA_SHARE *share, const char *org_name); int _ma_open_keyfile(MARIA_SHARE *share); void _ma_setup_functions(register MARIA_SHARE *share); my_bool _ma_dynmap_file(MARIA_HA *info, my_off_t size); diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index ff9ea4b82cb55..42e67147db232 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -2538,7 +2538,7 @@ int mi_repair_by_sort(HA_CHECK *param, register MI_INFO *info, (void) mysql_file_delete(mi_key_file_datatmp, param->temp_filename, MYF(MY_WME)); if (info->dfile == new_file) /* Retry with key cache */ - if (unlikely(mi_open_datafile(info, share, name, -1))) + if (unlikely(mi_open_datafile(info, share, name))) param->retry_repair= 0; /* Safety */ } mi_mark_crashed_on_repair(info); @@ -3072,7 +3072,7 @@ int mi_repair_parallel(HA_CHECK *param, register MI_INFO *info, (void) mysql_file_delete(mi_key_file_datatmp, param->temp_filename, MYF(MY_WME)); if (info->dfile == new_file) /* Retry with key cache */ - if (unlikely(mi_open_datafile(info, share, name, -1))) + if (unlikely(mi_open_datafile(info, share, name))) param->retry_repair= 0; /* Safety */ } mi_mark_crashed_on_repair(info); @@ -4785,7 +4785,7 @@ static int replace_data_file(HA_CHECK *param, MI_INFO *info, DATA_TMP_EXT, param->backup_time, (param->testflag & T_BACKUP_DATA ? MYF(MY_REDEL_MAKE_BACKUP): MYF(0))) || - mi_open_datafile(info, share, name, -1)) + mi_open_datafile(info, share, name)) return 1; return 0; } diff --git a/storage/myisam/mi_open.c b/storage/myisam/mi_open.c index 7efed26a52bd6..eaee7b8f20030 100644 --- a/storage/myisam/mi_open.c +++ b/storage/myisam/mi_open.c @@ -480,7 +480,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) lock_error=1; /* Database unlocked */ } - if (mi_open_datafile(&info, share, name, -1)) + if (mi_open_datafile(&info, share, name)) goto err; errpos=5; @@ -561,7 +561,7 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) my_errno=EACCES; /* Can't open in write mode */ goto err; } - if (mi_open_datafile(&info, share, name, old_info->dfile)) + if (mi_open_datafile(&info, share, name)) goto err; errpos=5; have_rtree= old_info->rtree_recursion_state != NULL; @@ -1229,13 +1229,9 @@ uchar *mi_recinfo_read(uchar *ptr, MI_COLUMNDEF *recinfo) Open data file. We can't use dup() here as the data file descriptors need to have different active seek-positions. - -The argument file_to_dup is here for the future if there would on some OS -exist a dup()-like call that would give us two different file descriptors. *************************************************************************/ -int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share, const char *org_name, - File file_to_dup __attribute__((unused))) +int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share, const char *org_name) { char *data_name= share->data_file_name; char real_data_name[FN_REFLEN]; diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c index 917893f58a923..cfd58418c871e 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -1012,7 +1012,7 @@ static int myisamchk(HA_CHECK *param, char * filename) MYF(MY_WME)); /* Close new file */ error|=change_to_newfile(filename, MI_NAME_DEXT, DATA_TMP_EXT, 0, MYF(0)); - if (mi_open_datafile(info,info->s, NULL, -1)) + if (mi_open_datafile(info,info->s, NULL)) error=1; param->out_flag&= ~O_NEW_DATA; /* We are using new datafile */ param->read_cache.file=info->dfile; diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h index 221d6e36aea3b..751aa9b6235c8 100644 --- a/storage/myisam/myisamdef.h +++ b/storage/myisam/myisamdef.h @@ -708,8 +708,7 @@ void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows); extern MI_INFO *test_if_reopen(char *filename); my_bool check_table_is_closed(const char *name, const char *where); -int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share, const char *orn_name, - File file_to_dup); +int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share, const char *orn_name); int mi_open_keyfile(MYISAM_SHARE *share); void mi_setup_functions(register MYISAM_SHARE *share);