Skip to content

Commit

Permalink
cleanup: remove 16-year-old "TODO"
Browse files Browse the repository at this point in the history
  • Loading branch information
@vuvova
vuvova committed Feb 27, 2017
1 parent c826ac9 commit 8722d4b
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 26 deletions.
6 changes: 3 additions & 3 deletions storage/maria/ma_check.c
View file
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand Down
10 changes: 3 additions & 7 deletions storage/maria/ma_open.c
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion storage/maria/maria_chk.c
View file
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions storage/maria/maria_def.h
View file
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions storage/myisam/mi_check.c
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
10 changes: 3 additions & 7 deletions storage/myisam/mi_open.c
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion storage/myisam/myisamchk.c
View file
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions storage/myisam/myisamdef.h
View file
Expand Up @@ -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);
Expand Down

0 comments on commit 8722d4b

Please sign in to comment.