fix clang build

3 files changed, 18 insertions, 17 deletions

diff --git a/storage/maria/aria_s3_copy.cc b/storage/maria/aria_s3_copy.cc
index 981aa052415..2eac95ab9de 100644
--- a/storage/maria/aria_s3_copy.cc
+++ b/storage/maria/aria_s3_copy.cc
@@ -155,7 +155,7 @@ extern "C" my_bool get_one_option(const struct my_option *opt
 }
 
 
-static void get_options(register int *argc,register char ***argv)
+static void get_options(int *argc, char ***argv)
 {
   int ho_error;
 
diff --git a/storage/maria/ha_s3.h b/storage/maria/ha_s3.h
index 57fdeb03e6b..0777debc8d8 100644
--- a/storage/maria/ha_s3.h
+++ b/storage/maria/ha_s3.h
@@ -30,52 +30,53 @@ public:
   ha_s3(handlerton *hton, TABLE_SHARE * table_arg);
   ~ha_s3() {}
 
-  int create(const char *name, TABLE *table_arg, HA_CREATE_INFO *ha_create_info);
-  int open(const char *name, int mode, uint open_flags);
-  int write_row(const uchar *buf);
-  int update_row(const uchar * old_data, const uchar * new_data)
+  int create(const char *name, TABLE *table_arg,
+             HA_CREATE_INFO *ha_create_info) final;
+  int open(const char *name, int mode, uint open_flags) final;
+  int write_row(const uchar *buf) final;
+  int update_row(const uchar * old_data, const uchar * new_data) final
   {
     DBUG_ENTER("update_row");
     DBUG_RETURN(HA_ERR_WRONG_COMMAND);
   }
-  int delete_row(const uchar * buf)
+  int delete_row(const uchar * buf) final
   {
     DBUG_ENTER("delete_row");
     DBUG_RETURN(HA_ERR_WRONG_COMMAND);
   }
-  int check(THD * thd, HA_CHECK_OPT * check_opt)
+  int check(THD * thd, HA_CHECK_OPT * check_opt) final
   {
     DBUG_ENTER("delete_row");
     DBUG_RETURN(HA_ERR_WRONG_COMMAND);
   }
-  int analyze(THD * thd, HA_CHECK_OPT * check_opt)
+  int analyze(THD * thd, HA_CHECK_OPT * check_opt) final
   {
     DBUG_ENTER("analyze");
     DBUG_RETURN(HA_ERR_WRONG_COMMAND);
   }
-  int repair(THD * thd, HA_CHECK_OPT * check_opt)
+  int repair(THD * thd, HA_CHECK_OPT * check_opt) final
   {
     DBUG_ENTER("repair");
     DBUG_RETURN(HA_ERR_WRONG_COMMAND);
   }
-  int preload_keys(THD * thd, HA_CHECK_OPT * check_opt)
+  int preload_keys(THD * thd, HA_CHECK_OPT * check_opt) final
   {
     DBUG_ENTER("preload_keys");
     DBUG_RETURN(HA_ERR_WRONG_COMMAND);
   }
-  int external_lock(THD * thd, int lock_type);
+  int external_lock(THD * thd, int lock_type) final;
   /*
     drop_table() is only used for internal temporary tables,
     not applicable for s3
   */
-  void drop_table(const char *name)
+  void drop_table(const char *name) final
   {
   }
-  int delete_table(const char *name);
-  int rename_table(const char *from, const char *to);
+  int delete_table(const char *name) final;
+  int rename_table(const char *from, const char *to) final;
   int discover_check_version() override;
   int rebind();
-  S3_INFO *s3_open_args() { return open_args; }
-  void register_handler(MARIA_HA *file);
+  S3_INFO *s3_open_args() final { return open_args; }
+  void register_handler(MARIA_HA *file) final;
 };
 #endif /* HA_S3_INCLUDED */
diff --git a/storage/maria/s3_func.c b/storage/maria/s3_func.c
index 410958ff295..bbaf048d534 100644
--- a/storage/maria/s3_func.c
+++ b/storage/maria/s3_func.c
@@ -1067,7 +1067,7 @@ int s3_delete_object(ms3_st *s3_client, const char *aws_bucket,
                          const char *name, myf error_flags)
 {
   uint8_t error;
-  int result;
+  int result= 0;
   DBUG_ENTER("s3_delete_object");
   DBUG_PRINT("enter", ("name: %s", name));