From 5375f0b495b69dbd6e1d5558ace6ce0fcd9cc636 Mon Sep 17 00:00:00 2001
From: Nayuta Yanagisawa <nayuta.yanagisawa@hey.com>
Date: Wed, 22 Jun 2022 00:56:16 +0900
Subject: [PATCH 1/7] MDEV-21310 AUTO_INCREMENT column throws range error on
 INSERT in partitioned table | Assertion `part_share->auto_inc_initialized ||
 !can_use_for_auto_inc_init()' failed.

The bug is caused by a similar mechanism as MDEV-21027.

The function, check_insert_or_replace_autoincrement, failed to open
all the partitions on INSERT SELECT statements and it results in the
assertion error.
---
 .../parts/inc/partition_auto_increment.inc    | 17 +++++++++++---
 .../partition_auto_increment_blackhole.result | 23 +++++++++++++++++++
 .../r/partition_auto_increment_innodb.result  | 12 ++++++++--
 .../r/partition_auto_increment_maria.result   | 12 ++++++++--
 .../r/partition_auto_increment_memory.result  | 12 ++++++++--
 .../r/partition_auto_increment_myisam.result  | 12 ++++++++--
 sql/ha_partition.h                            |  3 ++-
 .../r/partition_auto_increment_tokudb.result  | 12 ++++++++--
 8 files changed, 89 insertions(+), 14 deletions(-)

diff --git a/mysql-test/suite/parts/inc/partition_auto_increment.inc b/mysql-test/suite/parts/inc/partition_auto_increment.inc
index 2997dd9de4f..fcfd5bce746 100644
--- a/mysql-test/suite/parts/inc/partition_auto_increment.inc
+++ b/mysql-test/suite/parts/inc/partition_auto_increment.inc
@@ -860,6 +860,8 @@ SELECT LAST_INSERT_ID();
 SELECT * FROM t1;
 DROP TABLE t1;
 }
+--echo ##############################################################################
+}
 
 if (!$skip_update)
 {
@@ -867,13 +869,13 @@ if (!$skip_update)
 --echo # MDEV-19622 Assertion failures in
 --echo # ha_partition::set_auto_increment_if_higher upon UPDATE on Aria table
 --echo #
-CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE=myisam PARTITION BY HASH(a);
+eval CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE=$engine PARTITION BY HASH(a);
 INSERT INTO t1 VALUES (1,1),(2,2);
 UPDATE t1 SET pk = 0;
 DROP TABLE t1;
 }
 
-if (!$skip_update)
+if (!$skip_delete)
 {
 --echo #
 --echo # MDEV-21027 Assertion `part_share->auto_inc_initialized || !can_use_for_auto_inc_init()'
@@ -884,5 +886,14 @@ REPLACE INTO t1 PARTITION (p0) VALUES (3);
 DROP TABLE t1;
 }
 
---echo ##############################################################################
+if (!$skip_truncate)
+{
+--echo #
+--echo # MDEV-21310 AUTO_INCREMENT column throws range error on INSERT in  partitioned table |
+--echo # Assertion `part_share->auto_inc_initialized || !can_use_for_auto_inc_init()' failed.
+--echo #
+eval CREATE TABLE t1 (c INT AUTO_INCREMENT KEY) ENGINE=$engine PARTITION BY LIST (c) (PARTITION p1 VALUES IN (1), PARTITION p2 VALUES IN (2));
+ALTER TABLE t1 TRUNCATE PARTITION p1;
+INSERT INTO t1 PARTITION (p1) (c) SELECT 1;
+DROP TABLE t1;
 }
diff --git a/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result b/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
index 0276385dc29..c017aadcbab 100644
--- a/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
+++ b/mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
@@ -695,3 +695,26 @@ PARTITIONS 2
 SELECT * FROM t1 ORDER BY c1;
 c1
 DROP TABLE t1;
+#
+# MDEV-19622 Assertion failures in
+# ha_partition::set_auto_increment_if_higher upon UPDATE on Aria table
+#
+CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE='Blackhole' PARTITION BY HASH(a);
+INSERT INTO t1 VALUES (1,1),(2,2);
+UPDATE t1 SET pk = 0;
+DROP TABLE t1;
+#
+# MDEV-21027 Assertion `part_share->auto_inc_initialized || !can_use_for_auto_inc_init()'
+# ha_partition::set_auto_increment_if_higher
+#
+CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY) ENGINE='Blackhole' PARTITION BY HASH (a) PARTITIONS 3;
+REPLACE INTO t1 PARTITION (p0) VALUES (3);
+DROP TABLE t1;
+#
+# MDEV-21310 AUTO_INCREMENT column throws range error on INSERT in  partitioned table |
+# Assertion `part_share->auto_inc_initialized || !can_use_for_auto_inc_init()' failed.
+#
+CREATE TABLE t1 (c INT AUTO_INCREMENT KEY) ENGINE='Blackhole' PARTITION BY LIST (c) (PARTITION p1 VALUES IN (1), PARTITION p2 VALUES IN (2));
+ALTER TABLE t1 TRUNCATE PARTITION p1;
+INSERT INTO t1 PARTITION (p1) (c) SELECT 1;
+DROP TABLE t1;
diff --git a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result
index e5414c81616..1b558b619d9 100644
--- a/mysql-test/suite/parts/r/partition_auto_increment_innodb.result
+++ b/mysql-test/suite/parts/r/partition_auto_increment_innodb.result
@@ -1101,11 +1101,12 @@ SELECT * FROM t1;
 a
 0
 DROP TABLE t1;
+##############################################################################
 #
 # MDEV-19622 Assertion failures in
 # ha_partition::set_auto_increment_if_higher upon UPDATE on Aria table
 #
-CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE=myisam PARTITION BY HASH(a);
+CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE='InnoDB' PARTITION BY HASH(a);
 INSERT INTO t1 VALUES (1,1),(2,2);
 UPDATE t1 SET pk = 0;
 DROP TABLE t1;
@@ -1116,4 +1117,11 @@ DROP TABLE t1;
 CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY) ENGINE='InnoDB' PARTITION BY HASH (a) PARTITIONS 3;
 REPLACE INTO t1 PARTITION (p0) VALUES (3);
 DROP TABLE t1;
-##############################################################################
+#
+# MDEV-21310 AUTO_INCREMENT column throws range error on INSERT in  partitioned table |
+# Assertion `part_share->auto_inc_initialized || !can_use_for_auto_inc_init()' failed.
+#
+CREATE TABLE t1 (c INT AUTO_INCREMENT KEY) ENGINE='InnoDB' PARTITION BY LIST (c) (PARTITION p1 VALUES IN (1), PARTITION p2 VALUES IN (2));
+ALTER TABLE t1 TRUNCATE PARTITION p1;
+INSERT INTO t1 PARTITION (p1) (c) SELECT 1;
+DROP TABLE t1;
diff --git a/mysql-test/suite/parts/r/partition_auto_increment_maria.result b/mysql-test/suite/parts/r/partition_auto_increment_maria.result
index ad041735ebb..8c063958b27 100644
--- a/mysql-test/suite/parts/r/partition_auto_increment_maria.result
+++ b/mysql-test/suite/parts/r/partition_auto_increment_maria.result
@@ -1148,11 +1148,12 @@ SELECT * FROM t1;
 a
 0
 DROP TABLE t1;
+##############################################################################
 #
 # MDEV-19622 Assertion failures in
 # ha_partition::set_auto_increment_if_higher upon UPDATE on Aria table
 #
-CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE=myisam PARTITION BY HASH(a);
+CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE='Aria' PARTITION BY HASH(a);
 INSERT INTO t1 VALUES (1,1),(2,2);
 UPDATE t1 SET pk = 0;
 DROP TABLE t1;
@@ -1163,4 +1164,11 @@ DROP TABLE t1;
 CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY) ENGINE='Aria' PARTITION BY HASH (a) PARTITIONS 3;
 REPLACE INTO t1 PARTITION (p0) VALUES (3);
 DROP TABLE t1;
-##############################################################################
+#
+# MDEV-21310 AUTO_INCREMENT column throws range error on INSERT in  partitioned table |
+# Assertion `part_share->auto_inc_initialized || !can_use_for_auto_inc_init()' failed.
+#
+CREATE TABLE t1 (c INT AUTO_INCREMENT KEY) ENGINE='Aria' PARTITION BY LIST (c) (PARTITION p1 VALUES IN (1), PARTITION p2 VALUES IN (2));
+ALTER TABLE t1 TRUNCATE PARTITION p1;
+INSERT INTO t1 PARTITION (p1) (c) SELECT 1;
+DROP TABLE t1;
diff --git a/mysql-test/suite/parts/r/partition_auto_increment_memory.result b/mysql-test/suite/parts/r/partition_auto_increment_memory.result
index d2d1fb6831c..3461f8b13c5 100644
--- a/mysql-test/suite/parts/r/partition_auto_increment_memory.result
+++ b/mysql-test/suite/parts/r/partition_auto_increment_memory.result
@@ -1129,11 +1129,12 @@ SELECT * FROM t1;
 a
 0
 DROP TABLE t1;
+##############################################################################
 #
 # MDEV-19622 Assertion failures in
 # ha_partition::set_auto_increment_if_higher upon UPDATE on Aria table
 #
-CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE=myisam PARTITION BY HASH(a);
+CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE='Memory' PARTITION BY HASH(a);
 INSERT INTO t1 VALUES (1,1),(2,2);
 UPDATE t1 SET pk = 0;
 DROP TABLE t1;
@@ -1144,4 +1145,11 @@ DROP TABLE t1;
 CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY) ENGINE='Memory' PARTITION BY HASH (a) PARTITIONS 3;
 REPLACE INTO t1 PARTITION (p0) VALUES (3);
 DROP TABLE t1;
-##############################################################################
+#
+# MDEV-21310 AUTO_INCREMENT column throws range error on INSERT in  partitioned table |
+# Assertion `part_share->auto_inc_initialized || !can_use_for_auto_inc_init()' failed.
+#
+CREATE TABLE t1 (c INT AUTO_INCREMENT KEY) ENGINE='Memory' PARTITION BY LIST (c) (PARTITION p1 VALUES IN (1), PARTITION p2 VALUES IN (2));
+ALTER TABLE t1 TRUNCATE PARTITION p1;
+INSERT INTO t1 PARTITION (p1) (c) SELECT 1;
+DROP TABLE t1;
diff --git a/mysql-test/suite/parts/r/partition_auto_increment_myisam.result b/mysql-test/suite/parts/r/partition_auto_increment_myisam.result
index f92a6ed18c6..525f47bdbd7 100644
--- a/mysql-test/suite/parts/r/partition_auto_increment_myisam.result
+++ b/mysql-test/suite/parts/r/partition_auto_increment_myisam.result
@@ -1148,11 +1148,12 @@ SELECT * FROM t1;
 a
 0
 DROP TABLE t1;
+##############################################################################
 #
 # MDEV-19622 Assertion failures in
 # ha_partition::set_auto_increment_if_higher upon UPDATE on Aria table
 #
-CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE=myisam PARTITION BY HASH(a);
+CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE='MyISAM' PARTITION BY HASH(a);
 INSERT INTO t1 VALUES (1,1),(2,2);
 UPDATE t1 SET pk = 0;
 DROP TABLE t1;
@@ -1163,4 +1164,11 @@ DROP TABLE t1;
 CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY) ENGINE='MyISAM' PARTITION BY HASH (a) PARTITIONS 3;
 REPLACE INTO t1 PARTITION (p0) VALUES (3);
 DROP TABLE t1;
-##############################################################################
+#
+# MDEV-21310 AUTO_INCREMENT column throws range error on INSERT in  partitioned table |
+# Assertion `part_share->auto_inc_initialized || !can_use_for_auto_inc_init()' failed.
+#
+CREATE TABLE t1 (c INT AUTO_INCREMENT KEY) ENGINE='MyISAM' PARTITION BY LIST (c) (PARTITION p1 VALUES IN (1), PARTITION p2 VALUES IN (2));
+ALTER TABLE t1 TRUNCATE PARTITION p1;
+INSERT INTO t1 PARTITION (p1) (c) SELECT 1;
+DROP TABLE t1;
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 6c0e4ef6cf2..c2a71e143c5 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -1408,7 +1408,8 @@ private:
       unless we already did it.
     */
     if (!part_share->auto_inc_initialized &&
-        (ha_thd()->lex->sql_command == SQLCOM_INSERT || 
+        (ha_thd()->lex->sql_command == SQLCOM_INSERT ||
+         ha_thd()->lex->sql_command == SQLCOM_INSERT_SELECT ||
          ha_thd()->lex->sql_command == SQLCOM_REPLACE) &&
         table->found_next_number_field)
       bitmap_set_all(&m_part_info->read_partitions);
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_auto_increment_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_auto_increment_tokudb.result
index 9b79cc21875..249a27ce274 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_auto_increment_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_auto_increment_tokudb.result
@@ -1115,11 +1115,12 @@ SELECT * FROM t1;
 a
 0
 DROP TABLE t1;
+##############################################################################
 #
 # MDEV-19622 Assertion failures in
 # ha_partition::set_auto_increment_if_higher upon UPDATE on Aria table
 #
-CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE=myisam PARTITION BY HASH(a);
+CREATE OR REPLACE TABLE t1 (pk INT AUTO_INCREMENT, a INT, KEY(pk)) ENGINE='TokuDB' PARTITION BY HASH(a);
 INSERT INTO t1 VALUES (1,1),(2,2);
 UPDATE t1 SET pk = 0;
 DROP TABLE t1;
@@ -1130,5 +1131,12 @@ DROP TABLE t1;
 CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY) ENGINE='TokuDB' PARTITION BY HASH (a) PARTITIONS 3;
 REPLACE INTO t1 PARTITION (p0) VALUES (3);
 DROP TABLE t1;
-##############################################################################
+#
+# MDEV-21310 AUTO_INCREMENT column throws range error on INSERT in  partitioned table |
+# Assertion `part_share->auto_inc_initialized || !can_use_for_auto_inc_init()' failed.
+#
+CREATE TABLE t1 (c INT AUTO_INCREMENT KEY) ENGINE='TokuDB' PARTITION BY LIST (c) (PARTITION p1 VALUES IN (1), PARTITION p2 VALUES IN (2));
+ALTER TABLE t1 TRUNCATE PARTITION p1;
+INSERT INTO t1 PARTITION (p1) (c) SELECT 1;
+DROP TABLE t1;
 SET GLOBAL tokudb_prelock_empty = @tokudb_prelock_empty_saved;

From efdbb3cf31cab1961666a3eb5467680aec2d60f5 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.com>
Date: Tue, 28 Jun 2022 11:38:27 +0400
Subject: [PATCH 2/7] A cleanup for MDEV-25243 ASAN heap-use-after-free in
 Item_func_sp::execute_impl upon concurrent view DDL and I_S query with view
 and function

The test was reported to fail sporadicaly with this diff:

--- mysql-test/main/information_schema_tables.result
+++ mysql-test/main/information_schema_tables.reject
@@ -21,6 +21,8 @@
 disconnect con1;
 connection default;
 DROP VIEW IF EXISTS vv;
+Warnings:
+Note	4092	Unknown VIEW: 'test.vv'

in the "The originally reported non-deterministic test" part.
Disabling warnings around the DROP VIEW statement.
---
 mysql-test/main/information_schema_tables.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/main/information_schema_tables.test b/mysql-test/main/information_schema_tables.test
index bc4f269a3fb..ee277276b52 100644
--- a/mysql-test/main/information_schema_tables.test
+++ b/mysql-test/main/information_schema_tables.test
@@ -37,7 +37,9 @@ SELECT v.* FROM v JOIN INFORMATION_SCHEMA.TABLES WHERE DATA_LENGTH = -1;
 --eval KILL $conid
 --disconnect con1
 --connection default
+--disable_warnings
 DROP VIEW IF EXISTS vv;
+--enable_warnings
 DROP VIEW v;
 DROP FUNCTION f;
 DROP TABLE t;

From e34f8781397ed451a84c1a3fdc5766c5b1e28d41 Mon Sep 17 00:00:00 2001
From: Thirunarayanan Balathandayuthapani <thiru@mariadb.com>
Date: Tue, 7 Jun 2022 18:24:02 +0530
Subject: [PATCH 3/7] MDEV-28706	Redundant InnoDB table fails during alter

- Redundant InnoDB table fails to set the flags2 while loading
the table. It leads to "Upgrade index name failure" during alter
operation. InnoDB should set the flags2 to FTS_AUX_HEX_NAME when
fts is being loaded
---
 .../suite/innodb_fts/r/crash_recovery.result      | 12 ++++++++++++
 mysql-test/suite/innodb_fts/t/crash_recovery.test | 15 +++++++++++++++
 storage/innobase/dict/dict0load.cc                |  1 +
 3 files changed, 28 insertions(+)

diff --git a/mysql-test/suite/innodb_fts/r/crash_recovery.result b/mysql-test/suite/innodb_fts/r/crash_recovery.result
index 44d3521df98..0dd092ecfa6 100644
--- a/mysql-test/suite/innodb_fts/r/crash_recovery.result
+++ b/mysql-test/suite/innodb_fts/r/crash_recovery.result
@@ -134,3 +134,15 @@ id	title	body
 1	MySQL Tutorial	DBMS stands for Database...
 2	MariaDB Tutorial	DB means Database ...
 DROP TABLE mdev19073, mdev19073_2;
+#
+# MDEV-28706  Redundant InnoDB table fails during alter
+#
+SET @@global.innodb_file_per_table = 0;
+CREATE TABLE t1 (
+col_int INTEGER, col_text TEXT,
+col_text_1 TEXT
+) ENGINE = InnoDB ROW_FORMAT = Redundant ;
+ALTER TABLE t1 ADD FULLTEXT KEY `ftidx` ( col_text ) ;
+INSERT INTO t1 VALUES ( 1255, "mariadb", "InnoDB");
+ALTER TABLE t1 ADD FULLTEXT(col_text_1);
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb_fts/t/crash_recovery.test b/mysql-test/suite/innodb_fts/t/crash_recovery.test
index 1b321af236a..0e32608a81a 100644
--- a/mysql-test/suite/innodb_fts/t/crash_recovery.test
+++ b/mysql-test/suite/innodb_fts/t/crash_recovery.test
@@ -193,3 +193,18 @@ AGAINST ('Database' IN NATURAL LANGUAGE MODE);
 SELECT * FROM mdev19073_2 WHERE MATCH (title, body)
 AGAINST ('Database' IN NATURAL LANGUAGE MODE);
 DROP TABLE mdev19073, mdev19073_2;
+
+--echo #
+--echo # MDEV-28706  Redundant InnoDB table fails during alter
+--echo #
+
+SET @@global.innodb_file_per_table = 0;
+CREATE TABLE t1 (
+   col_int INTEGER, col_text TEXT,
+   col_text_1 TEXT
+) ENGINE = InnoDB ROW_FORMAT = Redundant ;
+ALTER TABLE t1 ADD FULLTEXT KEY `ftidx` ( col_text ) ;
+INSERT INTO t1 VALUES ( 1255, "mariadb", "InnoDB");
+--source include/restart_mysqld.inc
+ALTER TABLE t1 ADD FULLTEXT(col_text_1);
+DROP TABLE t1;
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc
index dade0c5b19e..b02b480f407 100644
--- a/storage/innobase/dict/dict0load.cc
+++ b/storage/innobase/dict/dict0load.cc
@@ -1852,6 +1852,7 @@ dict_load_columns(
 			if (table->fts == NULL) {
 				table->fts = fts_create(table);
 				table->fts->cache = fts_cache_create(table);
+				DICT_TF2_FLAG_SET(table, DICT_TF2_FTS_AUX_HEX_NAME);
 				fts_optimize_add_table(table);
 			}
 

From 6dc1bc3a5822007cdb2d5b79f0a37b4d6b9b65c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Fri, 1 Jul 2022 09:34:31 +0300
Subject: [PATCH 4/7] Fix clang-15 -Wdeprecated-non-prototype

K&R style function definitions are deprecated in all versions of C
and not supported in C2x.
---
 dbug/my_main.c  |  4 +---
 extra/replace.c | 19 ++++++-------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/dbug/my_main.c b/dbug/my_main.c
index 2b3e92b53cc..80db4d82e06 100644
--- a/dbug/my_main.c
+++ b/dbug/my_main.c
@@ -7,9 +7,7 @@
 #include <my_sys.h>
 #include <my_pthread.h>
 
-int main (argc, argv)
-int argc;
-char *argv[];
+int main (int argc, char **argv)
 {
   register int result, ix;
   extern int factorial(int);
diff --git a/extra/replace.c b/extra/replace.c
index 717bc92d0c4..a5c470b0b68 100644
--- a/extra/replace.c
+++ b/extra/replace.c
@@ -148,9 +148,7 @@ int main(int argc, char *argv[])
 	/* reads options */
 	/* Initiates DEBUG - but no debugging here ! */
 
-static int static_get_options(argc,argv)
-register int *argc;
-register char **argv[];
+static int static_get_options(int *argc, char***argv)
 {
   int help,version;
   char *pos;
@@ -218,10 +216,9 @@ register char **argv[];
 } /* static_get_options */
 
 
-static int get_replace_strings(argc,argv,from_array,to_array)
-register int *argc;
-register char **argv[];
-POINTER_ARRAY *from_array,*to_array;
+static int get_replace_strings(int *argc, char ***argv,
+                               POINTER_ARRAY *from_array,
+                               POINTER_ARRAY *to_array)
 {
   char *pos;
 
@@ -965,9 +962,7 @@ static void free_buffer()
   bytes read from disk.
 */
 
-static int fill_buffer_retaining(fd,n)
-File fd;
-int n;
+static int fill_buffer_retaining(File fd, int n)
 {
   int i;
 
@@ -1010,9 +1005,7 @@ int n;
 	/* Return 0 if convert is ok */
 	/* Global variable update is set if something was changed */
 
-static int convert_pipe(rep,in,out)
-REPLACE *rep;
-FILE *in,*out;
+static int convert_pipe(REPLACE *rep, FILE *in, FILE *out)
 {
   int retain,error;
   uint length;

From 045771c05099cf75fea036fdc89308eb3c06549a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Fri, 1 Jul 2022 09:48:36 +0300
Subject: [PATCH 5/7] Fix most clang-15 -Wunused-but-set-variable

Also, refactor trx_i_s_common_fill_table() to remove dead code.

Warnings about yynerrs in Bison-generated yyparse() will remain for now.
---
 client/mysql.cc                   |   9 +-
 client/mysqlcheck.c               |   5 +-
 client/mysqlslap.c                |  12 +-
 libmariadb                        |   2 +-
 scripts/comp_sql.c                |   6 +-
 sql/field.cc                      |   5 +-
 sql/ha_partition.cc               |   3 -
 sql/partition_info.cc             |  13 +-
 sql/sql_lex.cc                    |   2 -
 sql/sql_statistics.cc             |   4 +-
 sql/sql_table.cc                  |   3 +-
 storage/innobase/btr/btr0bulk.cc  |   2 -
 storage/innobase/handler/i_s.cc   | 219 +++++++++++-------------------
 storage/innobase/row/row0merge.cc |   2 -
 14 files changed, 98 insertions(+), 189 deletions(-)

diff --git a/client/mysql.cc b/client/mysql.cc
index ea92c84e1d1..28311defc81 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1,6 +1,6 @@
 /*
    Copyright (c) 2000, 2018, Oracle and/or its affiliates.
-   Copyright (c) 2009, 2021, MariaDB Corporation.
+   Copyright (c) 2009, 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
@@ -3591,7 +3591,6 @@ print_table_data(MYSQL_RES *result)
 {
   String separator(256);
   MYSQL_ROW	cur;
-  MYSQL_FIELD	*field;
   bool		*num_flag;
 
   num_flag=(bool*) my_alloca(sizeof(bool)*mysql_num_fields(result));
@@ -3603,7 +3602,7 @@ print_table_data(MYSQL_RES *result)
     mysql_field_seek(result,0);
   }
   separator.copy("+",1,charset_info);
-  while ((field = mysql_fetch_field(result)))
+  while (MYSQL_FIELD *field= mysql_fetch_field(result))
   {
     uint length= column_names ? field->name_length : 0;
     if (quick)
@@ -3625,7 +3624,7 @@ print_table_data(MYSQL_RES *result)
   {
     mysql_field_seek(result,0);
     (void) tee_fputs("|", PAGER);
-    for (uint off=0; (field = mysql_fetch_field(result)) ; off++)
+    while (MYSQL_FIELD *field= mysql_fetch_field(result))
     {
       size_t name_length= (uint) strlen(field->name);
       size_t numcells= charset_info->cset->numcells(charset_info,
@@ -3668,7 +3667,7 @@ print_table_data(MYSQL_RES *result)
         data_length= (uint) lengths[off];
       }
 
-      field= mysql_fetch_field(result);
+      MYSQL_FIELD *field= mysql_fetch_field(result);
       field_max_length= field->max_length;
 
       /* 
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index aaf77dbb743..27ccff2a840 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -1,6 +1,6 @@
 /*
    Copyright (c) 2001, 2013, Oracle and/or its affiliates.
-   Copyright (c) 2010, 2017, MariaDB
+   Copyright (c) 2010, 2012, MariaDB
 
    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
@@ -1006,7 +1006,6 @@ static void print_result()
   char prev[(NAME_LEN+9)*3+2];
   char prev_alter[MAX_ALTER_STR_SIZE];
   size_t length_of_db= strlen(sock->db);
-  uint i;
   my_bool found_error=0, table_rebuild=0;
   DYNAMIC_ARRAY *array4repair= &tables4repair;
   DBUG_ENTER("print_result");
@@ -1015,7 +1014,7 @@ static void print_result()
 
   prev[0] = '\0';
   prev_alter[0]= 0;
-  for (i = 0; (row = mysql_fetch_row(res)); i++)
+  while ((row = mysql_fetch_row(res)))
   {
     int changed = strcmp(prev, row[0]);
     my_bool status = !strcmp(row[2], "status");
diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index 19544384670..0a3a7cd8582 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -1,6 +1,6 @@
 /*
    Copyright (c) 2005, 2015, Oracle and/or its affiliates.
-   Copyright (c) 2010, 2017, MariaDB
+   Copyright (c) 2010, 2022, MariaDB
 
    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
@@ -1846,12 +1846,11 @@ run_scheduler(stats *sptr, statement *stmts, uint concur, ulonglong limit)
 
 pthread_handler_t run_task(void *p)
 {
-  ulonglong counter= 0, queries;
+  ulonglong queries;
   ulonglong detach_counter;
   unsigned int commit_counter;
   MYSQL *mysql;
   MYSQL_RES *result;
-  MYSQL_ROW row;
   statement *ptr;
   thread_context *con= (thread_context *)p;
 
@@ -1972,8 +1971,7 @@ limit_not_met:
                     my_progname, mysql_errno(mysql), mysql_error(mysql));
           else
           {
-            while ((row= mysql_fetch_row(result)))
-              counter++;
+            while (mysql_fetch_row(result)) {}
             mysql_free_result(result);
           }
         }
@@ -1983,7 +1981,7 @@ limit_not_met:
       if (commit_rate && (++commit_counter == commit_rate))
       {
         commit_counter= 0;
-        run_query(mysql, "COMMIT", strlen("COMMIT"));
+        run_query(mysql, C_STRING_WITH_LEN("COMMIT"));
       }
 
       if (con->limit && queries == con->limit)
@@ -1995,7 +1993,7 @@ limit_not_met:
 
 end:
   if (commit_rate)
-    run_query(mysql, "COMMIT", strlen("COMMIT"));
+    run_query(mysql, C_STRING_WITH_LEN("COMMIT"));
 
   mysql_close(mysql);
 
diff --git a/libmariadb b/libmariadb
index ab7a81e79e4..d12fd88b6c0 160000
--- a/libmariadb
+++ b/libmariadb
@@ -1 +1 @@
-Subproject commit ab7a81e79e4be4324a2d09d19d4f5249801ef665
+Subproject commit d12fd88b6c0fafbf25f59e7fecd639cb2b38f157
diff --git a/scripts/comp_sql.c b/scripts/comp_sql.c
index 748b2320f2a..abd59e85bb5 100644
--- a/scripts/comp_sql.c
+++ b/scripts/comp_sql.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004, 2010, Oracle and/or its affiliates. 
-   Copyright (c) 2012, 2014, Monty Program Ab
+   Copyright (c) 2012, 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
@@ -77,7 +77,6 @@ char *fgets_fn(char *buffer, size_t size, fgets_input_t input, int *error)
 static void print_query(FILE *out, const char *query)
 {
   const char *ptr= query;
-  int column= 0;
 
   fprintf(out, "\"");
   while (*ptr)
@@ -90,21 +89,18 @@ static void print_query(FILE *out, const char *query)
         and wrap to the next line, tabulated.
       */
       fprintf(out, "\\n\"\n  \"");
-      column= 2;
       break;
     case '\r':
       /* Skipped */
       break;
     case '\"':
       fprintf(out, "\\\"");
-      column++;
       break;
     case '\\':
       fprintf(out, "\\\\");
       break;
     default:
       putc(*ptr, out);
-      column++;
       break;
     }
     ptr++;
diff --git a/sql/field.cc b/sql/field.cc
index 57cf3deed35..3878d261f94 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1,6 +1,6 @@
 /*
    Copyright (c) 2000, 2017, Oracle and/or its affiliates.
-   Copyright (c) 2008, 2021, MariaDB
+   Copyright (c) 2008, 2022, MariaDB
 
    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
@@ -9990,7 +9990,7 @@ int Field_bit::cmp_prefix(const uchar *a, const uchar *b, size_t prefix_len)
 }
 
 
-int Field_bit::key_cmp(const uchar *str, uint length)
+int Field_bit::key_cmp(const uchar *str, uint)
 {
   if (bit_len)
   {
@@ -9999,7 +9999,6 @@ int Field_bit::key_cmp(const uchar *str, uint length)
     if ((flag= (int) (bits - *str)))
       return flag;
     str++;
-    length--;
   }
   return memcmp(ptr, str, bytes_in_rec);
 }
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 5c08c934dde..6d5a54ad8b0 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -2353,7 +2353,6 @@ uint ha_partition::del_ren_table(const char *from, const char *to)
   char *name_buffer_ptr;
   const char *from_path;
   const char *to_path= NULL;
-  uint i;
   handler **file, **abort_file;
   DBUG_ENTER("ha_partition::del_ren_table");
 
@@ -2382,7 +2381,6 @@ uint ha_partition::del_ren_table(const char *from, const char *to)
   from_path= get_canonical_filename(*file, from, from_lc_buff);
   if (to != NULL)
     to_path= get_canonical_filename(*file, to, to_lc_buff);
-  i= 0;
   do
   {
     if (unlikely((error= create_partition_name(from_buff, sizeof(from_buff),
@@ -2407,7 +2405,6 @@ uint ha_partition::del_ren_table(const char *from, const char *to)
     name_buffer_ptr= strend(name_buffer_ptr) + 1;
     if (unlikely(error))
       save_error= error;
-    i++;
   } while (*(++file));
   if (to != NULL)
   {
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index cf2536f3969..17a65ad8cd4 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -1,5 +1,5 @@
 /* Copyright (c) 2006, 2015, Oracle and/or its affiliates.
-   Copyright (c) 2010, 2018, MariaDB Corporation.
+   Copyright (c) 2010, 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
@@ -1583,7 +1583,6 @@ bool partition_info::set_up_charset_field_preps(THD *thd)
   uchar **char_ptrs;
   unsigned i;
   size_t size;
-  uint tot_fields= 0;
   uint tot_part_fields= 0;
   uint tot_subpart_fields= 0;
   DBUG_ENTER("set_up_charset_field_preps");
@@ -1595,13 +1594,8 @@ bool partition_info::set_up_charset_field_preps(THD *thd)
     ptr= part_field_array;
     /* Set up arrays and buffers for those fields */
     while ((field= *(ptr++)))
-    {
       if (field_is_partition_charset(field))
-      {
         tot_part_fields++;
-        tot_fields++;
-      }
-    }
     size= tot_part_fields * sizeof(char*);
     if (!(char_ptrs= (uchar**)thd->calloc(size)))
       goto error;
@@ -1635,13 +1629,8 @@ bool partition_info::set_up_charset_field_preps(THD *thd)
     /* Set up arrays and buffers for those fields */
     ptr= subpart_field_array;
     while ((field= *(ptr++)))
-    {
       if (field_is_partition_charset(field))
-      {
         tot_subpart_fields++;
-        tot_fields++;
-      }
-    }
     size= tot_subpart_fields * sizeof(char*);
     if (!(char_ptrs= (uchar**) thd->calloc(size)))
       goto error;
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 5a00518b806..e4c5b7cbd75 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -2191,7 +2191,6 @@ int Lex_input_stream::scan_ident_delimited(THD *thd,
                                            Lex_ident_cli_st *str)
 {
   CHARSET_INFO *const cs= thd->charset();
-  uint double_quotes= 0;
   uchar c, quote_char= m_tok_start[0];
   DBUG_ASSERT(m_ptr == m_tok_start + 1);
 
@@ -2216,7 +2215,6 @@ int Lex_input_stream::scan_ident_delimited(THD *thd,
         if (yyPeek() != quote_char)
           break;
         c= yyGet();
-        double_quotes++;
         continue;
       }
     }
diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc
index 721b2de75a3..5e31034847e 100644
--- a/sql/sql_statistics.cc
+++ b/sql/sql_statistics.cc
@@ -1,5 +1,5 @@
 /* Copyright (C) 2009 MySQL AB
-   Copyright (c) 2019, 2020, MariaDB Corporation.
+   Copyright (c) 2019, 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
@@ -2483,7 +2483,6 @@ int collect_statistics_for_index(THD *thd, TABLE *table, uint index)
 {
   int rc= 0;
   KEY *key_info= &table->key_info[index];
-  ha_rows rows= 0;
 
   DBUG_ENTER("collect_statistics_for_index");
 
@@ -2518,7 +2517,6 @@ int collect_statistics_for_index(THD *thd, TABLE *table, uint index)
 
     if (rc)
       break;
-    rows++;
     index_prefix_calc.add();
     rc= table->file->ha_index_next(table->record[0]);
   }
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 62b9cb22df0..cc9cb37ca15 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -3633,7 +3633,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
 
   List_iterator<Key> key_iterator(alter_info->key_list);
   List_iterator<Key> key_iterator2(alter_info->key_list);
-  uint key_parts=0, fk_key_count=0;
+  uint key_parts=0;
   bool primary_key=0,unique_key=0;
   Key *key, *key2;
   uint tmp, key_number;
@@ -3649,7 +3649,6 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
                         "(none)" , key->type));
     if (key->type == Key::FOREIGN_KEY)
     {
-      fk_key_count++;
       Foreign_key *fk_key= (Foreign_key*) key;
       if (fk_key->validate(alter_info->create_list))
         DBUG_RETURN(TRUE);
diff --git a/storage/innobase/btr/btr0bulk.cc b/storage/innobase/btr/btr0bulk.cc
index c05cf2a7b7a..fdeba1e375b 100644
--- a/storage/innobase/btr/btr0bulk.cc
+++ b/storage/innobase/btr/btr0bulk.cc
@@ -301,7 +301,6 @@ PageBulk::finish()
 #endif
 
 	ulint	count = 0;
-	ulint	n_recs = 0;
 	ulint	slot_index = 0;
 	rec_t*	insert_rec = page_rec_get_next(page_get_infimum_rec(m_page));
 	page_dir_slot_t* slot = NULL;
@@ -309,7 +308,6 @@ PageBulk::finish()
 	/* Set owner & dir. */
 	while (!page_rec_is_supremum(insert_rec)) {
 		count++;
-		n_recs++;
 
 		if (count == (PAGE_DIR_SLOT_MAX_N_OWNED + 1) / 2) {
 
diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
index ff0bb9b9129..20297ce1d61 100644
--- a/storage/innobase/handler/i_s.cc
+++ b/storage/innobase/handler/i_s.cc
@@ -59,6 +59,7 @@ Modified Dec 29, 2014 Jan Lindström (Added sys_semaphore_waits)
 #include "fil0crypt.h"
 #include "dict0crea.h"
 #include "fts0vlc.h"
+#include "log.h"
 
 /** The latest successfully looked up innodb_fts_aux_table */
 UNIV_INTERN table_id_t innodb_ft_aux_table_id;
@@ -190,19 +191,37 @@ sync_arr_fill_sys_semphore_waits_table(
 	TABLE_LIST*	tables,	/*!< in/out: tables to fill */
 	Item*		);	/*!< in: condition (not used) */
 
-/*******************************************************************//**
+/**
 Common function to fill any of the dynamic tables:
 INFORMATION_SCHEMA.innodb_trx
 INFORMATION_SCHEMA.innodb_locks
 INFORMATION_SCHEMA.innodb_lock_waits
-@return 0 on success */
-static
-int
-trx_i_s_common_fill_table(
-/*======================*/
-	THD*		thd,	/*!< in: thread */
-	TABLE_LIST*	tables,	/*!< in/out: tables to fill */
-	Item*		);	/*!< in: condition (not used) */
+@retval false if access to the table is blocked
+@retval true  if something should be filled in */
+static bool trx_i_s_common_fill_table(THD *thd, TABLE_LIST *tables)
+{
+  DBUG_ENTER("trx_i_s_common_fill_table");
+
+  /* deny access to non-superusers */
+  if (check_global_access(thd, PROCESS_ACL))
+    DBUG_RETURN(false);
+
+  RETURN_IF_INNODB_NOT_STARTED(tables->schema_table_name.str);
+
+  /* update the cache */
+  trx_i_s_cache_start_write(trx_i_s_cache);
+  trx_i_s_possibly_fetch_data_into_cache(trx_i_s_cache);
+  trx_i_s_cache_end_write(trx_i_s_cache);
+
+  if (trx_i_s_cache_is_truncated(trx_i_s_cache))
+    sql_print_warning("InnoDB: Data in %.*s truncated due to memory limit"
+                      " of %u bytes",
+                      int(tables->schema_table_name.length),
+                      tables->schema_table_name.str,
+                      TRX_I_S_MEM_LIMIT);
+
+  DBUG_RETURN(true);
+}
 
 /*******************************************************************//**
 Unbind a dynamic INFORMATION_SCHEMA table.
@@ -394,26 +413,29 @@ static ST_FIELD_INFO innodb_trx_fields_info[]=
 /*******************************************************************//**
 Read data from cache buffer and fill the INFORMATION_SCHEMA.innodb_trx
 table with it.
-@return 0 on success */
-static
-int
-fill_innodb_trx_from_cache(
-/*=======================*/
-	trx_i_s_cache_t*	cache,	/*!< in: cache to read from */
-	THD*			thd,	/*!< in: used to call
-					schema_table_store_record() */
-	TABLE*			table)	/*!< in/out: fill this table */
+@retval 0 on success
+@retval 1 on failure */
+static int fill_innodb_trx_from_cache(THD *thd, TABLE_LIST *tables, Item*)
 {
-	Field**	fields;
 	ulint	rows_num;
 	char	lock_id[TRX_I_S_LOCK_ID_MAX_LEN + 1];
 	ulint	i;
 
 	DBUG_ENTER("fill_innodb_trx_from_cache");
 
-	fields = table->field;
+	if (!trx_i_s_common_fill_table(thd, tables)) {
+		DBUG_RETURN(0);
+	}
 
-	rows_num = trx_i_s_cache_get_rows_used(cache,
+	struct cache
+	{
+		cache() { trx_i_s_cache_start_read(trx_i_s_cache); }
+		~cache() { trx_i_s_cache_end_read(trx_i_s_cache); }
+	} c;
+
+	Field** fields = tables->table->field;
+
+	rows_num = trx_i_s_cache_get_rows_used(trx_i_s_cache,
 					       I_S_INNODB_TRX);
 
 	for (i = 0; i < rows_num; i++) {
@@ -423,7 +445,7 @@ fill_innodb_trx_from_cache(
 
 		row = (i_s_trx_row_t*)
 			trx_i_s_cache_get_nth_row(
-				cache, I_S_INNODB_TRX, i);
+				trx_i_s_cache, I_S_INNODB_TRX, i);
 
 		/* trx_id */
 		snprintf(trx_id, sizeof(trx_id), TRX_ID_FMT, row->trx_id);
@@ -535,7 +557,7 @@ fill_innodb_trx_from_cache(
 			   (longlong) row->trx_is_autocommit_non_locking,
 			   true));
 
-		OK(schema_table_store_record(thd, table));
+		OK(schema_table_store_record(thd, tables->table));
 	}
 
 	DBUG_RETURN(0);
@@ -557,7 +579,7 @@ innodb_trx_init(
 	schema = (ST_SCHEMA_TABLE*) p;
 
 	schema->fields_info = innodb_trx_fields_info;
-	schema->fill_table = trx_i_s_common_fill_table;
+	schema->fill_table = fill_innodb_trx_from_cache;
 
 	DBUG_RETURN(0);
 }
@@ -672,20 +694,29 @@ static
 int
 fill_innodb_locks_from_cache(
 /*=========================*/
-	trx_i_s_cache_t*	cache,	/*!< in: cache to read from */
 	THD*			thd,	/*!< in: MySQL client connection */
-	TABLE*			table)	/*!< in/out: fill this table */
+	TABLE_LIST*		tables,	/*!< in/out: fill this table */
+	Item*)
 {
-	Field**	fields;
 	ulint	rows_num;
 	char	lock_id[TRX_I_S_LOCK_ID_MAX_LEN + 1];
 	ulint	i;
 
 	DBUG_ENTER("fill_innodb_locks_from_cache");
 
-	fields = table->field;
+	if (!trx_i_s_common_fill_table(thd, tables)) {
+		DBUG_RETURN(0);
+	}
 
-	rows_num = trx_i_s_cache_get_rows_used(cache,
+	struct cache
+	{
+		cache() { trx_i_s_cache_start_read(trx_i_s_cache); }
+		~cache() { trx_i_s_cache_end_read(trx_i_s_cache); }
+	} c;
+
+	Field** fields = tables->table->field;
+
+	rows_num = trx_i_s_cache_get_rows_used(trx_i_s_cache,
 					       I_S_INNODB_LOCKS);
 
 	for (i = 0; i < rows_num; i++) {
@@ -698,7 +729,7 @@ fill_innodb_locks_from_cache(
 
 		row = (i_s_locks_row_t*)
 			trx_i_s_cache_get_nth_row(
-				cache, I_S_INNODB_LOCKS, i);
+				trx_i_s_cache, I_S_INNODB_LOCKS, i);
 
 		/* lock_id */
 		trx_i_s_create_lock_id(row, lock_id, sizeof(lock_id));
@@ -746,7 +777,7 @@ fill_innodb_locks_from_cache(
 		OK(field_store_string(fields[IDX_LOCK_DATA],
 				      row->lock_data));
 
-		OK(schema_table_store_record(thd, table));
+		OK(schema_table_store_record(thd, tables->table));
 	}
 
 	DBUG_RETURN(0);
@@ -768,7 +799,7 @@ innodb_locks_init(
 	schema = (ST_SCHEMA_TABLE*) p;
 
 	schema->fields_info = innodb_locks_fields_info;
-	schema->fill_table = trx_i_s_common_fill_table;
+	schema->fill_table = fill_innodb_locks_from_cache;
 
 	DBUG_RETURN(0);
 }
@@ -852,12 +883,11 @@ static
 int
 fill_innodb_lock_waits_from_cache(
 /*==============================*/
-	trx_i_s_cache_t*	cache,	/*!< in: cache to read from */
 	THD*			thd,	/*!< in: used to call
 					schema_table_store_record() */
-	TABLE*			table)	/*!< in/out: fill this table */
+	TABLE_LIST*		tables,	/*!< in/out: fill this table */
+	Item*)
 {
-	Field**	fields;
 	ulint	rows_num;
 	char	requested_lock_id[TRX_I_S_LOCK_ID_MAX_LEN + 1];
 	char	blocking_lock_id[TRX_I_S_LOCK_ID_MAX_LEN + 1];
@@ -865,9 +895,19 @@ fill_innodb_lock_waits_from_cache(
 
 	DBUG_ENTER("fill_innodb_lock_waits_from_cache");
 
-	fields = table->field;
+	if (!trx_i_s_common_fill_table(thd, tables)) {
+		DBUG_RETURN(0);
+	}
 
-	rows_num = trx_i_s_cache_get_rows_used(cache,
+	struct cache
+	{
+		cache() { trx_i_s_cache_start_read(trx_i_s_cache); }
+		~cache() { trx_i_s_cache_end_read(trx_i_s_cache); }
+	} c;
+
+	Field** fields = tables->table->field;
+
+	rows_num = trx_i_s_cache_get_rows_used(trx_i_s_cache,
 					       I_S_INNODB_LOCK_WAITS);
 
 	for (i = 0; i < rows_num; i++) {
@@ -879,7 +919,7 @@ fill_innodb_lock_waits_from_cache(
 
 		row = (i_s_lock_waits_row_t*)
 			trx_i_s_cache_get_nth_row(
-				cache, I_S_INNODB_LOCK_WAITS, i);
+				trx_i_s_cache, I_S_INNODB_LOCK_WAITS, i);
 
 		/* requesting_trx_id */
 		snprintf(requesting_trx_id, sizeof(requesting_trx_id),
@@ -909,7 +949,7 @@ fill_innodb_lock_waits_from_cache(
 				   blocking_lock_id,
 				   sizeof(blocking_lock_id))));
 
-		OK(schema_table_store_record(thd, table));
+		OK(schema_table_store_record(thd, tables->table));
 	}
 
 	DBUG_RETURN(0);
@@ -931,7 +971,7 @@ innodb_lock_waits_init(
 	schema = (ST_SCHEMA_TABLE*) p;
 
 	schema->fields_info = innodb_lock_waits_fields_info;
-	schema->fill_table = trx_i_s_common_fill_table;
+	schema->fill_table = fill_innodb_lock_waits_from_cache;
 
 	DBUG_RETURN(0);
 }
@@ -985,105 +1025,6 @@ UNIV_INTERN struct st_maria_plugin	i_s_innodb_lock_waits =
         MariaDB_PLUGIN_MATURITY_STABLE,
 };
 
-/*******************************************************************//**
-Common function to fill any of the dynamic tables:
-INFORMATION_SCHEMA.innodb_trx
-INFORMATION_SCHEMA.innodb_locks
-INFORMATION_SCHEMA.innodb_lock_waits
-@return 0 on success */
-static
-int
-trx_i_s_common_fill_table(
-/*======================*/
-	THD*		thd,	/*!< in: thread */
-	TABLE_LIST*	tables,	/*!< in/out: tables to fill */
-	Item*		)	/*!< in: condition (not used) */
-{
-	LEX_CSTRING		table_name;
-	int			ret;
-	trx_i_s_cache_t*	cache;
-
-	DBUG_ENTER("trx_i_s_common_fill_table");
-
-	/* deny access to non-superusers */
-	if (check_global_access(thd, PROCESS_ACL)) {
-
-		DBUG_RETURN(0);
-	}
-
-	/* minimize the number of places where global variables are
-	referenced */
-	cache = trx_i_s_cache;
-
-	/* which table we have to fill? */
-	table_name = tables->schema_table_name;
-	/* or table_name = tables->schema_table->table_name; */
-
-	RETURN_IF_INNODB_NOT_STARTED(table_name.str);
-
-	/* update the cache */
-	trx_i_s_cache_start_write(cache);
-	trx_i_s_possibly_fetch_data_into_cache(cache);
-	trx_i_s_cache_end_write(cache);
-
-	if (trx_i_s_cache_is_truncated(cache)) {
-
-		ib::warn() << "Data in " << table_name.str << " truncated due to"
-			" memory limit of " << TRX_I_S_MEM_LIMIT << " bytes";
-	}
-
-	ret = 0;
-
-	trx_i_s_cache_start_read(cache);
-
-	if (innobase_strcasecmp(table_name.str, "innodb_trx") == 0) {
-
-		if (fill_innodb_trx_from_cache(
-			cache, thd, tables->table) != 0) {
-
-			ret = 1;
-		}
-
-	} else if (innobase_strcasecmp(table_name.str, "innodb_locks") == 0) {
-
-		if (fill_innodb_locks_from_cache(
-			cache, thd, tables->table) != 0) {
-
-			ret = 1;
-		}
-
-	} else if (innobase_strcasecmp(table_name.str, "innodb_lock_waits") == 0) {
-
-		if (fill_innodb_lock_waits_from_cache(
-			cache, thd, tables->table) != 0) {
-
-			ret = 1;
-		}
-
-	} else {
-		ib::error() << "trx_i_s_common_fill_table() was"
-			" called to fill unknown table: " << table_name.str << "."
-			" This function only knows how to fill"
-			" innodb_trx, innodb_locks and"
-			" innodb_lock_waits tables.";
-
-		ret = 1;
-	}
-
-	trx_i_s_cache_end_read(cache);
-
-#if 0
-	DBUG_RETURN(ret);
-#else
-	/* if this function returns something else than 0 then a
-	deadlock occurs between the mysqld server and mysql client,
-	see http://bugs.mysql.com/29900 ; when that bug is resolved
-	we can enable the DBUG_RETURN(ret) above */
-	ret++;  // silence a gcc46 warning
-	DBUG_RETURN(0);
-#endif
-}
-
 /* Fields of the dynamic table information_schema.innodb_cmp. */
 static ST_FIELD_INFO i_s_cmp_fields_info[]=
 {
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc
index 71df96c5be1..cb2f10b5546 100644
--- a/storage/innobase/row/row0merge.cc
+++ b/storage/innobase/row/row0merge.cc
@@ -126,7 +126,6 @@ public:
 		rec_offs*	ins_offsets = NULL;
 		dberr_t		error = DB_SUCCESS;
 		dtuple_t*	dtuple;
-		ulint		count = 0;
 		const ulint	flag = BTR_NO_UNDO_LOG_FLAG
 				       | BTR_NO_LOCKING_FLAG
 				       | BTR_KEEP_SYS_FLAG | BTR_CREATE_FLAG;
@@ -234,7 +233,6 @@ public:
 			mtr_commit(&mtr);
 
 			rtr_clean_rtr_info(&rtr_info, true);
-			count++;
 		}
 
 		m_dtuple_vec->clear();

From 7c35ad16e39591a044fe08cb692888a7f6502847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Fri, 1 Jul 2022 13:02:43 +0300
Subject: [PATCH 6/7] MDEV-28389 fixup: Fix pre-GCC 10 -Wconversion

Before version 10, GCC would think that a right shift of an
unsigned char returns int. Let us explicitly cast that back,
to silence a bogus -Wconversion warning.
---
 storage/innobase/buf/buf0buf.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index 6a859f3293a..90d0011b675 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -1247,7 +1247,10 @@ void buf_page_print(const byte *read_buf, const page_size_t &page_size)
     byte row[64];
 
     for (byte *r= row; r != &row[64]; r+= 2, read_buf++)
-      r[0]= hex_to_ascii(*read_buf >> 4), r[1]= hex_to_ascii(*read_buf & 15);
+    {
+      r[0]= hex_to_ascii(byte(*read_buf >> 4));
+      r[1]= hex_to_ascii(*read_buf & 15);
+    }
 
     sql_print_information("InnoDB: %.*s", 64, row);
   }

From 990cde800a4aafc5f5647eb06db3eec461fd172a Mon Sep 17 00:00:00 2001
From: Thirunarayanan Balathandayuthapani <thiru@mariadb.com>
Date: Fri, 1 Jul 2022 14:00:57 +0530
Subject: [PATCH 7/7] MDEV-28912   NON-UNIQUE FTS_DOC_ID index mistaken as
 FTS_DOC_ID_INDEX

- InnoDB mistakenly identifies the non-unique FTS_DOC_ID index as
FTS_DOC_ID_INDEX while loading the table. dict_load_indexes()
should check whether the index is unique before assigning
fts_doc_id_index
---
 mysql-test/suite/innodb_fts/r/fulltext2.result |  7 +++++++
 mysql-test/suite/innodb_fts/t/fulltext2.test   | 11 +++++++++++
 storage/innobase/dict/dict0load.cc             |  5 ++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/mysql-test/suite/innodb_fts/r/fulltext2.result b/mysql-test/suite/innodb_fts/r/fulltext2.result
index 8f8135b35cd..e9a089ab80d 100644
--- a/mysql-test/suite/innodb_fts/r/fulltext2.result
+++ b/mysql-test/suite/innodb_fts/r/fulltext2.result
@@ -271,3 +271,10 @@ fts_doc_id	first_name	last_name	score
 6	Ned	Flanders	0
 7	Nelson	Muntz	0
 DROP TABLE t1;
+CREATE TABLE t1(a INT, b TEXT, FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
+KEY FTS_DOC_ID_INDEX(FTS_DOC_ID))ENGINE=InnoDB;
+ALTER TABLE t1 ADD COLUMN c INT as (a) VIRTUAL;
+ALTER TABLE t1 ADD d INT NULL;
+ALTER TABLE t1 ADD FULLTEXT(b);
+ERROR HY000: Index 'FTS_DOC_ID_INDEX' is of wrong type for an InnoDB FULLTEXT index
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb_fts/t/fulltext2.test b/mysql-test/suite/innodb_fts/t/fulltext2.test
index 4dd2c78827f..1e3894644a0 100644
--- a/mysql-test/suite/innodb_fts/t/fulltext2.test
+++ b/mysql-test/suite/innodb_fts/t/fulltext2.test
@@ -257,3 +257,14 @@ INSERT INTO t1 (id, first_name, last_name) VALUES
 analyze table t1;
 SELECT fts_doc_id, first_name, last_name, MATCH(first_name) AGAINST('Homer' IN BOOLEAN MODE) AS score FROM t1;
 DROP TABLE t1;
+
+#
+# MDEV-28912  NON-UNIQUE FTS_DOC_ID mistaken as FTS_DOC_ID_INDEX
+#
+CREATE TABLE t1(a INT, b TEXT, FTS_DOC_ID BIGINT UNSIGNED NOT NULL,
+		KEY FTS_DOC_ID_INDEX(FTS_DOC_ID))ENGINE=InnoDB;
+ALTER TABLE t1 ADD COLUMN c INT as (a) VIRTUAL;
+ALTER TABLE t1 ADD d INT NULL;
+--error ER_INNODB_FT_WRONG_DOCID_INDEX
+ALTER TABLE t1 ADD FULLTEXT(b);
+DROP TABLE t1;
diff --git a/storage/innobase/dict/dict0load.cc b/storage/innobase/dict/dict0load.cc
index b02b480f407..6b34b89b4f4 100644
--- a/storage/innobase/dict/dict0load.cc
+++ b/storage/innobase/dict/dict0load.cc
@@ -2590,8 +2590,11 @@ next_rec:
 	ut_ad(table->fts_doc_id_index == NULL);
 
 	if (table->fts != NULL) {
-		table->fts_doc_id_index = dict_table_get_index_on_name(
+		dict_index_t *idx = dict_table_get_index_on_name(
 			table, FTS_DOC_ID_INDEX_NAME);
+		if (idx && dict_index_is_unique(idx)) {
+			table->fts_doc_id_index = idx;
+		}
 	}
 
 	/* If the table contains FTS indexes, populate table->fts->indexes */