Merge 10.5 into 10.6

5 files changed, 18 insertions, 18 deletions

diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h
index ca54785feed..6a4948256a0 100644
--- a/storage/innobase/handler/ha_innodb.h
+++ b/storage/innobase/handler/ha_innodb.h
@@ -465,7 +465,7 @@ protected:
 	/* @return true if it's necessary to switch current statement log
 	format from STATEMENT to ROW if binary log format is MIXED and
 	autoincrement values are changed in the statement */
-	bool autoinc_lock_mode_stmt_unsafe() const;
+	bool autoinc_lock_mode_stmt_unsafe() const override;
 	dict_index_t* innobase_get_index(uint keynr);
 
 #ifdef WITH_WSREP
diff --git a/storage/maria/ma_check.h b/storage/maria/ma_check.h
index 1c2a971098d..fa78ada6d38 100644
--- a/storage/maria/ma_check.h
+++ b/storage/maria/ma_check.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019 MariaDB Corporation AB
+/* Copyright (C) 2019, 2022, MariaDB Corporation AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,17 +20,17 @@
   in myisamchk.h
 */
 
-typedef struct st_sort_key_blocks		/* Used when sorting */
+struct st_sort_key_blocks		/* Used when sorting */
 {
   uchar *buff, *end_pos;
   uchar lastkey[MARIA_MAX_POSSIBLE_KEY_BUFF];
   uint last_length;
   int inited;
-} MA_SORT_KEY_BLOCKS;
+};
 
-typedef struct st_sort_ftbuf
+struct st_sort_ftbuf
 {
   uchar *buf, *end;
   int count;
   uchar lastkey[MARIA_MAX_KEY_BUFF];
-} MA_SORT_FT_BUF;
+};
diff --git a/storage/maria/maria_def.h b/storage/maria/maria_def.h
index d6bdffa0f7e..4479b244ddf 100644
--- a/storage/maria/maria_def.h
+++ b/storage/maria/maria_def.h
@@ -150,21 +150,21 @@ struct st_maria_share;
 struct st_maria_handler;                        /* For referense */
 struct st_maria_keydef;
 
-typedef struct st_maria_key                 /* Internal info about a key */
+struct st_maria_key                 /* Internal info about a key */
 {
   uchar *data;                              /* Data for key */
   struct st_maria_keydef *keyinfo;          /* Definition for key */
   uint data_length;                         /* Length of key data */
   uint ref_length;                          /* record ref + transid */
   uint32 flag;                               /* 0 or SEARCH_PART_KEY */
-} MARIA_KEY;
+};
 
-typedef struct st_maria_decode_tree     /* Decode huff-table */
+struct st_maria_decode_tree     /* Decode huff-table */
 {
   uint16 *table;
   uint quick_table_bits;
   uchar *intervalls;
-} MARIA_DECODE_TREE;
+};
 
 
 typedef struct s3_info S3_INFO;
diff --git a/storage/maria/s3_func.h b/storage/maria/s3_func.h
index bd5275494bc..a062131d5a5 100644
--- a/storage/maria/s3_func.h
+++ b/storage/maria/s3_func.h
@@ -1,6 +1,6 @@
 #ifndef S3_FUNC_INCLUDED
 #define S3_FUNC_INCLUDED
-/* Copyright (C) 2019, 2020 MariaDB Corporation Ab
+/* Copyright (C) 2019, 2022, MariaDB Corporation Ab
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ extern TYPELIB s3_protocol_typelib;
 
 /* Store information about a s3 connection */
 
-typedef struct s3_info
+struct s3_info
 {
   /* Connection strings */
   LEX_CSTRING access_key, secret_key, region, bucket, host_name;
@@ -63,7 +63,7 @@ typedef struct s3_info
 
   /* Protocol for the list bucket API call. 1 for Amazon, 2 for some others */
   uint8_t protocol_version;
-} S3_INFO;
+};
 
 
 /* flag + length is stored in this header */
diff --git a/storage/myisam/myisamdef.h b/storage/myisam/myisamdef.h
index f48d1078000..c90d989c975 100644
--- a/storage/myisam/myisamdef.h
+++ b/storage/myisam/myisamdef.h
@@ -1,6 +1,6 @@
 /*
    Copyright (c) 2000, 2012, Oracle and/or its affiliates.
-   Copyright (c) 2017, MariaDB Corporation.
+   Copyright (c) 2017, 2022, MariaDB Corporation.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -613,21 +613,21 @@ typedef struct st_mi_block_info         /* Parameter to _mi_get_block_info */
 } MI_BLOCK_INFO;
 
 
-typedef struct st_sort_key_blocks		/* Used when sorting */
+struct st_sort_key_blocks		/* Used when sorting */
 {
   uchar *buff, *end_pos;
   uchar lastkey[HA_MAX_POSSIBLE_KEY_BUFF];
   uint last_length;
   int inited;
-} SORT_KEY_BLOCKS;
+};
 
 
-typedef struct st_sort_ftbuf
+struct st_sort_ftbuf
 {
   uchar *buf, *end;
   int count;
   uchar lastkey[HA_MAX_KEY_BUFF];
-} SORT_FT_BUF;
+};
 
 /* bits in return from _mi_get_block_info */