diff options
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/archive_reader.c | 3 | ||||
| -rw-r--r-- | storage/archive/ha_archive.cc | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/storage/archive/archive_reader.c b/storage/archive/archive_reader.c index 1b15fa16ce4..e87bc70ade4 100644 --- a/storage/archive/archive_reader.c +++ b/storage/archive/archive_reader.c @@ -408,8 +408,7 @@ static void print_version(void) static void get_options(int *argc, char ***argv) { - if (load_defaults("my", load_default_groups, argc, argv)) - exit(1); + load_defaults_or_exit("my", load_default_groups, argc, argv); default_argv= *argv; handle_options(argc, argv, my_long_options, get_one_option); diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index fd0a6b7d4fb..d70757e8142 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1376,8 +1376,6 @@ int ha_archive::rnd_next(uchar *buf) current_position= aztell(&archive); rc= get_row(&archive, buf); - table->status=rc ? STATUS_NOT_FOUND: 0; - end: DBUG_RETURN(rc); } @@ -1874,7 +1872,7 @@ void ha_archive::destroy_record_buffer(archive_record_buffer *r) frm image in the ARZ file. And this cannot be done in-place, it requires ARZ file to be recreated from scratch */ -bool ha_archive::check_if_incompatible_data(HA_CREATE_INFO *info, +bool ha_archive::check_if_incompatible_data(HA_CREATE_INFO *info_arg, uint table_changes) { return COMPATIBLE_DATA_NO; |