From 979ce5f392f0651833dea8f0332ee2a533a7da6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Tue, 28 Oct 2025 11:20:43 +0200
Subject: [PATCH 001/119] MDEV-37306: buf_zip_decompress() is noisy on all-zero
 page

When a page is being requested from buf_page_get_gen() with
mode=BUF_GET_POSSIBLY_FREED, it is very well possible that the page
had been marked as freed in the tablespace and had never been written
back to the tablespace.

buf_page_t::read_complete(): Validate the page identifier before
invoking buf_zip_decompress(), to avoid noisy messages or debug
assertion failures on an obviously invalid page.

Reviewed by: Thirunarayanan Balathandayuthapani
Tested by: Saahil Alam
---
 storage/innobase/buf/buf0buf.cc | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index 33dd8dc75cc..c053970b090 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -3699,19 +3699,6 @@ dberr_t buf_page_t::read_complete(const fil_node_t &node) noexcept
     goto database_corrupted;
   }
 
-  if (belongs_to_unzip_LRU())
-  {
-    buf_pool.n_pend_unzip++;
-    auto ok= buf_zip_decompress(reinterpret_cast<buf_block_t*>(this), false);
-    buf_pool.n_pend_unzip--;
-
-    if (!ok)
-    {
-      err= DB_PAGE_CORRUPTED;
-      goto database_corrupted_compressed;
-    }
-  }
-
   {
     const page_id_t read_id(mach_read_from_4(read_frame + FIL_PAGE_SPACE_ID),
                             mach_read_from_4(read_frame + FIL_PAGE_OFFSET));
@@ -3752,6 +3739,19 @@ dberr_t buf_page_t::read_complete(const fil_node_t &node) noexcept
     }
   }
 
+  if (belongs_to_unzip_LRU())
+  {
+    buf_pool.n_pend_unzip++;
+    auto ok= buf_zip_decompress(reinterpret_cast<buf_block_t*>(this), false);
+    buf_pool.n_pend_unzip--;
+
+    if (!ok)
+    {
+      err= DB_PAGE_CORRUPTED;
+      goto database_corrupted_compressed;
+    }
+  }
+
   err= buf_page_check_corrupt(this, node);
   if (UNIV_UNLIKELY(err != DB_SUCCESS))
   {

From e80998281aa1551f12a6b86cb3765796130d822d Mon Sep 17 00:00:00 2001
From: Thirunarayanan Balathandayuthapani <thiru@mariadb.com>
Date: Wed, 29 Oct 2025 12:08:45 +0530
Subject: [PATCH 002/119] MDEV-37558  Multi-batch recovery discards needed
 doublewrite pages

Problem:
=======
In multi-batch recovery, pages with LSN > recv_sys.scanned_lsn
are discarded from doublewrite buffer. Later when
reading a corrupted page from disk, corresponding dblwr page
is no longer available. This leads to failure of InnoDB recovery.

Solution:
=========
In buf_dblwr_t::recover(): Replace recv_sys.scanned_lsn
with max_lsn when checking if a page's LSN is within
the recovery range.
---
 storage/innobase/buf/buf0dblwr.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage/innobase/buf/buf0dblwr.cc b/storage/innobase/buf/buf0dblwr.cc
index dc8d5e506c5..3f26fe23cee 100644
--- a/storage/innobase/buf/buf0dblwr.cc
+++ b/storage/innobase/buf/buf0dblwr.cc
@@ -384,7 +384,7 @@ void buf_dblwr_t::recover() noexcept
     const page_t *const page= *i;
     const uint32_t page_no= page_get_page_no(page);
     const lsn_t lsn= mach_read_from_8(page + FIL_PAGE_LSN);
-    if (recv_sys.parse_start_lsn > lsn || lsn > recv_sys.scanned_lsn)
+    if (recv_sys.parse_start_lsn > lsn || lsn > max_lsn)
       /* Pages written before or after the recovery range are not usable. */
       continue;
     const uint32_t space_id= page_get_space_id(page);

From 66aa2501b15b7d75a4eb6bb3053c5234ffabe39f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Mon, 27 Oct 2025 15:56:15 +0200
Subject: [PATCH 003/119] MDEV-37935 : Assertion `0' failed in int
 wsrep::transaction::before_rollback()

Problem was executable comment in REPLACE that caused
consistency check that is not supported for RSU and
!InnoDB tables.

Fix is to check is Online Schema Upgrade (OSU) method
something else than TOI and if it is then table storage
engine must be InnoDB or error is produced and execution
returns and no consistency check is done.
---
 mysql-test/suite/galera/r/MDEV-37935.result | 40 +++++++++++++++++++++
 mysql-test/suite/galera/t/MDEV-37935.test   | 30 ++++++++++++++++
 sql/sql_parse.cc                            | 21 ++++++-----
 3 files changed, 83 insertions(+), 8 deletions(-)
 create mode 100644 mysql-test/suite/galera/r/MDEV-37935.result
 create mode 100644 mysql-test/suite/galera/t/MDEV-37935.test

diff --git a/mysql-test/suite/galera/r/MDEV-37935.result b/mysql-test/suite/galera/r/MDEV-37935.result
new file mode 100644
index 00000000000..ee7d000c1bd
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-37935.result
@@ -0,0 +1,40 @@
+connection node_2;
+connection node_1;
+SET sql_mode='';
+SET SESSION autocommit=0;
+SET SESSION enforce_storage_engine=Aria;
+SET WSREP_OSU_METHOD = RSU;
+CREATE TABLE t1 (a TEXT) ;
+Warnings:
+Note	1266	Using storage engine Aria for table 't1'
+Note	1266	Using storage engine Aria for table 't1'
+CREATE TABLE t2 (a TEXT) ;
+Warnings:
+Note	1266	Using storage engine Aria for table 't2'
+Note	1266	Using storage engine Aria for table 't2'
+SET SESSION autocommit=1;
+REPLACE INTO t2 (a) SELECT a from t1;
+ERROR 42000: This version of MariaDB doesn't yet support 'RSU on this table engine'
+REPLACE INTO t2 (a) SELECT /*!99997 */ a from t1;
+ERROR 42000: This version of MariaDB doesn't yet support 'RSU on this table engine'
+SET WSREP_OSU_METHOD = TOI;
+DROP TABLE t1,t2;
+SET sql_mode='';
+SET SESSION autocommit=0;
+SET SESSION enforce_storage_engine=MyISAM;
+SET WSREP_OSU_METHOD = RSU;
+CREATE TABLE t1 (a TEXT) ;
+Warnings:
+Note	1266	Using storage engine MyISAM for table 't1'
+Note	1266	Using storage engine MyISAM for table 't1'
+CREATE TABLE t2 (a TEXT) ;
+Warnings:
+Note	1266	Using storage engine MyISAM for table 't2'
+Note	1266	Using storage engine MyISAM for table 't2'
+SET SESSION autocommit=1;
+REPLACE INTO t2 (a) SELECT a from t1;
+ERROR 42000: This version of MariaDB doesn't yet support 'RSU on this table engine'
+REPLACE INTO t2 (a) SELECT /*!99997 */ a from t1;
+ERROR 42000: This version of MariaDB doesn't yet support 'RSU on this table engine'
+SET WSREP_OSU_METHOD = TOI;
+DROP TABLE t1,t2;
diff --git a/mysql-test/suite/galera/t/MDEV-37935.test b/mysql-test/suite/galera/t/MDEV-37935.test
new file mode 100644
index 00000000000..217a60c2492
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-37935.test
@@ -0,0 +1,30 @@
+--source include/galera_cluster.inc
+--source include/have_aria.inc
+
+SET sql_mode='';
+SET SESSION autocommit=0;
+SET SESSION enforce_storage_engine=Aria;
+SET WSREP_OSU_METHOD = RSU;
+CREATE TABLE t1 (a TEXT) ;
+CREATE TABLE t2 (a TEXT) ;
+SET SESSION autocommit=1;
+--error ER_NOT_SUPPORTED_YET
+REPLACE INTO t2 (a) SELECT a from t1;
+--error ER_NOT_SUPPORTED_YET
+REPLACE INTO t2 (a) SELECT /*!99997 */ a from t1;
+SET WSREP_OSU_METHOD = TOI;
+DROP TABLE t1,t2;
+
+SET sql_mode='';
+SET SESSION autocommit=0;
+SET SESSION enforce_storage_engine=MyISAM;
+SET WSREP_OSU_METHOD = RSU;
+CREATE TABLE t1 (a TEXT) ;
+CREATE TABLE t2 (a TEXT) ;
+SET SESSION autocommit=1;
+--error ER_NOT_SUPPORTED_YET
+REPLACE INTO t2 (a) SELECT a from t1;
+--error ER_NOT_SUPPORTED_YET
+REPLACE INTO t2 (a) SELECT /*!99997 */ a from t1;
+SET WSREP_OSU_METHOD = TOI;
+DROP TABLE t1,t2;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index a66e1ec83c1..a053ac3ccdb 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -4724,10 +4724,21 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
 #ifdef WITH_WSREP
       if (wsrep && !first_table->view)
       {
-        const legacy_db_type db_type= first_table->table->file->partition_ht()->db_type;
+        const handlerton *hton= first_table->table->file->partition_ht() ?
+          first_table->table->file->partition_ht() :
+          first_table->table->file->ht;
+
+        const legacy_db_type db_type= hton->db_type;
         // For InnoDB we don't need to worry about anything here:
         if (db_type != DB_TYPE_INNODB)
         {
+          /* Only TOI allowed to !InnoDB tables */
+          if (thd->variables.wsrep_OSU_method != WSREP_OSU_TOI)
+          {
+            my_error(ER_NOT_SUPPORTED_YET, MYF(0), "RSU on this table engine");
+            break;
+          }
+
           // For consistency check inserted table needs to be InnoDB
           if (thd->wsrep_consistency_check != NO_CONSISTENCY_CHECK)
           {
@@ -4737,16 +4748,10 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
                                 " for InnoDB tables.");
             thd->wsrep_consistency_check= NO_CONSISTENCY_CHECK;
           }
-          /* Only TOI allowed to !InnoDB tables */
-          if (wsrep_OSU_method_get(thd) != WSREP_OSU_TOI)
-          {
-            my_error(ER_NOT_SUPPORTED_YET, MYF(0), "RSU on this table engine");
-            break;
-          }
           // For !InnoDB we start TOI if it is not yet started and hope for the best
           if (!wsrep_toi)
           {
-            /* Currently we support TOI for MyISAM only. */
+            /* Currently we support TOI for MyISAM && Aria only. */
             if ((db_type == DB_TYPE_MYISAM && wsrep_check_mode(WSREP_MODE_REPLICATE_MYISAM)) ||
                 (db_type == DB_TYPE_ARIA   && wsrep_check_mode(WSREP_MODE_REPLICATE_ARIA)))
             {

From 6fea5712d12acb088f6708df2dea64df8612a333 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@gmail.com>
Date: Thu, 30 Oct 2025 15:50:24 +0100
Subject: [PATCH 004/119] MDEV-3799 Windows WITH_ZLIB=bundled build errors with
 hashicorp_key_management

We compile curl with vcpkg. vcpkg prefers dependencies of the vcpkg
package to come from vcpkg as well. We break its logic by setting
and ZLIB_LIBRARY in cmake/zlib.cmake to the static library that we
compile outselves. This vcpkg check is not critical or needed
when shared libraries are used.

As a workaround, set CMAKE_DISABLE_FIND_PACKAGE_ZLIB when compiling
hashicorp_key_management, in this case vcpkg skips the zlib check.
---
 plugin/hashicorp_key_management/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin/hashicorp_key_management/CMakeLists.txt b/plugin/hashicorp_key_management/CMakeLists.txt
index 809b480f6ac..0705760fc29 100644
--- a/plugin/hashicorp_key_management/CMakeLists.txt
+++ b/plugin/hashicorp_key_management/CMakeLists.txt
@@ -1,3 +1,6 @@
+IF(VCPKG_INSTALLED_DIR AND (WITH_ZLIB STREQUAL "bundled"))
+  SET(CMAKE_DISABLE_FIND_PACKAGE_ZLIB 1)
+ENDIF()
 FIND_PACKAGE(CURL)
 IF(NOT CURL_FOUND)
   # Can't build plugin

From 654e8440b51b1b8da09b6f72de80ba50dc0c24f9 Mon Sep 17 00:00:00 2001
From: Sergey Vojtovich <svojtovich@gmail.com>
Date: Thu, 30 Oct 2025 00:40:25 +0400
Subject: [PATCH 005/119] MDEV-19373 - main.old-mode failed in buildbot with
 wrong result

Test output was affected by incompletely closed preceding connections.

Wait for connections to leave I_S.PROCESSLIST before issuing
SHOW PROCESSLIST.
---
 mysql-test/main/old-mode.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mysql-test/main/old-mode.test b/mysql-test/main/old-mode.test
index 177e00edce8..3d720233c50 100644
--- a/mysql-test/main/old-mode.test
+++ b/mysql-test/main/old-mode.test
@@ -19,6 +19,8 @@ drop table t1,t2;
 #
 # Test that SHOW PROCESSLIST doesn't have the Progress column
 #
+let $count_sessions= 1;
+source include/wait_until_count_sessions.inc;
 
 --replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
 # Embedded server is hardcoded to show "Writing to net" as STATE.

From 814787f4c284637c7f1062215d0daca94c67824e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Thu, 30 Oct 2025 09:10:10 +0200
Subject: [PATCH 006/119] MDEV-34117 : Assertion `! thd->in_sub_stmt' failed in
 bool trans_rollback_stmt(THD*)

Problem was that user could drop streaming replication table
when streaming replication was used.

Fixed by not allowing user to drop streaming replication
table when galera is enabled. When it is not enabled
super can drop it (as any table in mysql database).
Added checks for wsrep_trx_fragment_unit and wsrep_trx_fragment_size
variables so that streaming replication can't be enabled
when streaming replication table does not exists.

Fixed also bug when user is trying to disable streaming
replication by wsrep_trx_fragment_size=0 when it was
not enabled.
---
 mysql-test/suite/galera/r/MDEV-34117.result   | 127 ++++++++++++++++++
 mysql-test/suite/galera/t/MDEV-34117.test     |  83 ++++++++++++
 .../r/galera_sr_unit_statements.result        |  48 ++++---
 .../t/galera_sr_unit_statements.test          |  30 +++--
 .../wsrep/r/wsrep_variables_wsrep_off.result  |   9 +-
 .../wsrep/t/wsrep_variables_wsrep_off.test    |   4 +-
 sql/sql_parse.cc                              |  32 ++++-
 sql/sys_vars.cc                               |   2 +-
 sql/wsrep_var.cc                              | 120 ++++++++++-------
 sql/wsrep_var.h                               |   3 +-
 10 files changed, 370 insertions(+), 88 deletions(-)
 create mode 100644 mysql-test/suite/galera/r/MDEV-34117.result
 create mode 100644 mysql-test/suite/galera/t/MDEV-34117.test

diff --git a/mysql-test/suite/galera/r/MDEV-34117.result b/mysql-test/suite/galera/r/MDEV-34117.result
new file mode 100644
index 00000000000..66eb65cf608
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-34117.result
@@ -0,0 +1,127 @@
+connection node_2;
+connection node_1;
+connection node_1;
+CREATE TABLE t1 (c INT);
+INSERT INTO t1 VALUES (0),(0);
+CREATE TABLE t2 (c INT);
+SET SESSION wsrep_trx_fragment_unit='STATEMENTS';
+SET SESSION wsrep_trx_fragment_size=2;
+DROP TABLE mysql.wsrep_streaming_log;
+ERROR 42000: DROP command denied to user 'root'@'localhost' for table `mysql`.`wsrep_streaming_log`
+CREATE TRIGGER tgr AFTER INSERT ON t2 FOR EACH ROW UPDATE t1 SET c=c+1;
+INSERT INTO t2 VALUES (1),(2);
+SELECT * FROM t1;
+c
+2
+2
+SELECT * FROM t2;
+c
+1
+2
+SET wsrep_trx_fragment_unit=DEFAULT;
+SET GLOBAL wsrep_trx_fragment_size=DEFAULT;
+DROP TRIGGER tgr;
+DROP TABLE t1, t2;
+connection node_2;
+SET GLOBAL wsrep_on=OFF;
+SET SESSION wsrep_trx_fragment_unit='STATEMENTS';
+ERROR 42000: Variable 'wsrep_trx_fragment_unit' can't be set to the value of 'STATEMENTS'
+SELECT @@wsrep_trx_fragment_unit;
+@@wsrep_trx_fragment_unit
+bytes
+SELECT @@wsrep_trx_fragment_size;
+@@wsrep_trx_fragment_size
+0
+SET SESSION wsrep_trx_fragment_size = 2;
+ERROR 42000: Variable 'wsrep_trx_fragment_size' can't be set to the value of '2'
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1231	Cannot set 'wsrep_trx_fragment_size' to a value other than 0 because wsrep is switched off.
+Error	1231	Variable 'wsrep_trx_fragment_size' can't be set to the value of '2'
+SELECT @@wsrep_trx_fragment_unit;
+@@wsrep_trx_fragment_unit
+bytes
+SELECT @@wsrep_trx_fragment_size;
+@@wsrep_trx_fragment_size
+0
+DROP TABLE mysql.wsrep_streaming_log;
+SET SESSION wsrep_trx_fragment_unit='STATEMENTS';
+ERROR 42000: Variable 'wsrep_trx_fragment_unit' can't be set to the value of 'STATEMENTS'
+SET SESSION wsrep_trx_fragment_size = 2;
+ERROR 42000: Variable 'wsrep_trx_fragment_size' can't be set to the value of '2'
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1231	Cannot set 'wsrep_trx_fragment_size' to a value other than 0 because wsrep is switched off.
+Error	1231	Variable 'wsrep_trx_fragment_size' can't be set to the value of '2'
+SELECT @@wsrep_trx_fragment_unit;
+@@wsrep_trx_fragment_unit
+bytes
+SELECT @@wsrep_trx_fragment_size;
+@@wsrep_trx_fragment_size
+0
+SET SESSION wsrep_trx_fragment_size = 0;
+SELECT @@wsrep_trx_fragment_unit;
+@@wsrep_trx_fragment_unit
+bytes
+SELECT @@wsrep_trx_fragment_size;
+@@wsrep_trx_fragment_size
+0
+SET GLOBAL wsrep_on=ON;
+SET SESSION wsrep_trx_fragment_unit='STATEMENTS';
+ERROR 42000: Variable 'wsrep_trx_fragment_unit' can't be set to the value of 'STATEMENTS'
+SET SESSION wsrep_trx_fragment_size = 2;
+ERROR 42000: Variable 'wsrep_trx_fragment_size' can't be set to the value of '2'
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1231	Cannot set 'wsrep_trx_fragment_size' to a value other than 0 because streaming table mysql.wsrep_streaming_log does not exists.
+Error	1231	Variable 'wsrep_trx_fragment_size' can't be set to the value of '2'
+SELECT @@wsrep_trx_fragment_unit;
+@@wsrep_trx_fragment_unit
+bytes
+SELECT @@wsrep_trx_fragment_size;
+@@wsrep_trx_fragment_size
+0
+SET GLOBAL wsrep_on=OFF;
+CREATE TABLE IF NOT EXISTS mysql.wsrep_streaming_log
+(
+node_uuid CHAR(36),
+trx_id BIGINT,
+seqno BIGINT,
+flags INT NOT NULL,
+frag LONGBLOB NOT NULL,
+PRIMARY KEY (node_uuid, trx_id, seqno)
+) ENGINE=InnoDB STATS_PERSISTENT=0 CHARSET=latin1;
+SET GLOBAL wsrep_on=ON;
+connection node_1;
+CREATE TABLE t1 (c INT);
+INSERT INTO t1 VALUES (0),(0);
+CREATE TABLE t2 (c INT);
+SET SESSION wsrep_trx_fragment_unit='STATEMENTS';
+SET SESSION wsrep_trx_fragment_size=2;
+CREATE TRIGGER tgr AFTER INSERT ON t2 FOR EACH ROW UPDATE t1 SET c=c+1;
+INSERT INTO t2 VALUES (1),(2);
+SELECT * FROM t1;
+c
+2
+2
+SELECT * FROM t2;
+c
+1
+2
+connection node_2;
+INSERT INTO t2 VALUES (1),(2);
+SELECT * FROM t1;
+c
+4
+4
+SELECT * FROM t2;
+c
+1
+2
+1
+2
+connection node_1;
+SET wsrep_trx_fragment_unit=DEFAULT;
+SET GLOBAL wsrep_trx_fragment_size=DEFAULT;
+DROP TRIGGER tgr;
+DROP TABLE t1, t2;
diff --git a/mysql-test/suite/galera/t/MDEV-34117.test b/mysql-test/suite/galera/t/MDEV-34117.test
new file mode 100644
index 00000000000..fda225e640a
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-34117.test
@@ -0,0 +1,83 @@
+--source include/galera_cluster.inc
+
+--connection node_1
+CREATE TABLE t1 (c INT);
+INSERT INTO t1 VALUES (0),(0);
+CREATE TABLE t2 (c INT);
+SET SESSION wsrep_trx_fragment_unit='STATEMENTS';
+SET SESSION wsrep_trx_fragment_size=2;
+--error ER_TABLEACCESS_DENIED_ERROR
+DROP TABLE mysql.wsrep_streaming_log;
+CREATE TRIGGER tgr AFTER INSERT ON t2 FOR EACH ROW UPDATE t1 SET c=c+1;
+INSERT INTO t2 VALUES (1),(2);
+SELECT * FROM t1;
+SELECT * FROM t2;
+
+SET wsrep_trx_fragment_unit=DEFAULT;
+SET GLOBAL wsrep_trx_fragment_size=DEFAULT;
+DROP TRIGGER tgr;
+DROP TABLE t1, t2;
+
+--connection node_2
+SET GLOBAL wsrep_on=OFF;
+--error ER_WRONG_VALUE_FOR_VAR
+SET SESSION wsrep_trx_fragment_unit='STATEMENTS';
+SELECT @@wsrep_trx_fragment_unit;
+SELECT @@wsrep_trx_fragment_size;
+--error ER_WRONG_VALUE_FOR_VAR
+SET SESSION wsrep_trx_fragment_size = 2;
+SHOW WARNINGS;
+SELECT @@wsrep_trx_fragment_unit;
+SELECT @@wsrep_trx_fragment_size;
+DROP TABLE mysql.wsrep_streaming_log;
+--error ER_WRONG_VALUE_FOR_VAR
+SET SESSION wsrep_trx_fragment_unit='STATEMENTS';
+--error ER_WRONG_VALUE_FOR_VAR
+SET SESSION wsrep_trx_fragment_size = 2;
+SHOW WARNINGS;
+SELECT @@wsrep_trx_fragment_unit;
+SELECT @@wsrep_trx_fragment_size;
+SET SESSION wsrep_trx_fragment_size = 0;
+SELECT @@wsrep_trx_fragment_unit;
+SELECT @@wsrep_trx_fragment_size;
+SET GLOBAL wsrep_on=ON;
+--error ER_WRONG_VALUE_FOR_VAR
+SET SESSION wsrep_trx_fragment_unit='STATEMENTS';
+--error ER_WRONG_VALUE_FOR_VAR
+SET SESSION wsrep_trx_fragment_size = 2;
+SHOW WARNINGS;
+SELECT @@wsrep_trx_fragment_unit;
+SELECT @@wsrep_trx_fragment_size;
+SET GLOBAL wsrep_on=OFF;
+CREATE TABLE IF NOT EXISTS mysql.wsrep_streaming_log
+(
+  node_uuid CHAR(36),
+  trx_id BIGINT,
+  seqno BIGINT,
+  flags INT NOT NULL,
+  frag LONGBLOB NOT NULL,
+  PRIMARY KEY (node_uuid, trx_id, seqno)
+) ENGINE=InnoDB STATS_PERSISTENT=0 CHARSET=latin1;
+SET GLOBAL wsrep_on=ON;
+
+--connection node_1
+CREATE TABLE t1 (c INT);
+INSERT INTO t1 VALUES (0),(0);
+CREATE TABLE t2 (c INT);
+SET SESSION wsrep_trx_fragment_unit='STATEMENTS';
+SET SESSION wsrep_trx_fragment_size=2;
+CREATE TRIGGER tgr AFTER INSERT ON t2 FOR EACH ROW UPDATE t1 SET c=c+1;
+INSERT INTO t2 VALUES (1),(2);
+SELECT * FROM t1;
+SELECT * FROM t2;
+
+--connection node_2
+INSERT INTO t2 VALUES (1),(2);
+SELECT * FROM t1;
+SELECT * FROM t2;
+
+--connection node_1
+SET wsrep_trx_fragment_unit=DEFAULT;
+SET GLOBAL wsrep_trx_fragment_size=DEFAULT;
+DROP TRIGGER tgr;
+DROP TABLE t1, t2;
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_unit_statements.result b/mysql-test/suite/galera_sr/r/galera_sr_unit_statements.result
index 4e3bd52483e..32b502722b7 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_unit_statements.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_unit_statements.result
@@ -3,52 +3,60 @@ connection node_1;
 connection node_1;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 SET SESSION wsrep_trx_fragment_size = 3;
+SHOW WARNINGS;
+Level	Code	Message
 SET SESSION wsrep_trx_fragment_unit = 'statements';
+SHOW WARNINGS;
+Level	Code	Message
 connection node_1;
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 VALUES (1);
+# Expect nothing is replicated yet, so far we have 2 statements
 connection node_2;
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-SELECT COUNT(*) FROM t1;
-COUNT(*)
+SELECT COUNT(*) AS EXPECT_0 FROM t1;
+EXPECT_0
 0
-SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
-COUNT(*)
+SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
+EXPECT_0
 0
 connection node_1;
 INSERT INTO t1 VALUES (2);
+# Expect 2 rows in t1 and 1 fragment in SR table
 connection node_2;
-SELECT COUNT(*) FROM t1;
-COUNT(*)
+SELECT COUNT(*) AS EXPECT_2 FROM t1;
+EXPECT_2
 2
-SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
-COUNT(*)
+SELECT COUNT(*) AS EXPECT_1 FROM mysql.wsrep_streaming_log;
+EXPECT_1
 1
 connection node_1;
 INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
+# Expect 5 rows in t1 and 2 fragments in SR table
 connection node_2;
-SELECT COUNT(*) FROM t1;
-COUNT(*)
+SELECT COUNT(*) AS EXPECT_5 FROM t1;
+EXPECT_5
 5
-SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
-COUNT(*)
+SELECT COUNT(*) AS EXPECT_2 FROM mysql.wsrep_streaming_log;
+EXPECT_2
 2
 connection node_1;
 COMMIT;
-SELECT COUNT(*) FROM t1;
-COUNT(*)
+# Expect 5 rows in t1 and empty SR table
+SELECT COUNT(*) AS EXPECT_5 FROM t1;
+EXPECT_5
 5
-SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
-COUNT(*)
+SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
+EXPECT_0
 0
 connection node_2;
-SELECT COUNT(*) FROM t1;
-COUNT(*)
+SELECT COUNT(*) AS EXPECT_5 FROM t1;
+EXPECT_5
 5
-SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
-COUNT(*)
+SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
+EXPECT_0
 0
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_unit_statements.test b/mysql-test/suite/galera_sr/t/galera_sr_unit_statements.test
index 0cf05765838..d5739d0c8b6 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_unit_statements.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_unit_statements.test
@@ -9,46 +9,48 @@
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 
 SET SESSION wsrep_trx_fragment_size = 3;
+SHOW WARNINGS;
 SET SESSION wsrep_trx_fragment_unit = 'statements';
+SHOW WARNINGS;
 
 --connection node_1
 SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 VALUES (1);
 
-# Expect noting is replicated yet, so far we have 2 statements
+--echo # Expect nothing is replicated yet, so far we have 2 statements
 --connection node_2
 SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-SELECT COUNT(*) FROM t1;
-SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
+SELECT COUNT(*) AS EXPECT_0 FROM t1;
+SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 INSERT INTO t1 VALUES (2);
 
-# Expect 2 rows in t1 and 1 fragment in SR table
+--echo # Expect 2 rows in t1 and 1 fragment in SR table
 --connection node_2
-SELECT COUNT(*) FROM t1;
-SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
+SELECT COUNT(*) AS EXPECT_2 FROM t1;
+SELECT COUNT(*) AS EXPECT_1 FROM mysql.wsrep_streaming_log;
 
  --connection node_1
 INSERT INTO t1 VALUES (3);
 INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 
-# Expect 5 rows in t1 and 2 fragments in SR table
+--echo # Expect 5 rows in t1 and 2 fragments in SR table
 --connection node_2
-SELECT COUNT(*) FROM t1;
-SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
+SELECT COUNT(*) AS EXPECT_5 FROM t1;
+SELECT COUNT(*) AS EXPECT_2 FROM mysql.wsrep_streaming_log;
 
 --connection node_1
 COMMIT;
 
-# Expect 5 rows in t1 and empty SR table
-SELECT COUNT(*) FROM t1;
-SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
+--echo # Expect 5 rows in t1 and empty SR table
+SELECT COUNT(*) AS EXPECT_5 FROM t1;
+SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
 
 --connection node_2
-SELECT COUNT(*) FROM t1;
-SELECT COUNT(*) FROM mysql.wsrep_streaming_log;
+SELECT COUNT(*) AS EXPECT_5 FROM t1;
+SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
 
 DROP TABLE t1;
diff --git a/mysql-test/suite/wsrep/r/wsrep_variables_wsrep_off.result b/mysql-test/suite/wsrep/r/wsrep_variables_wsrep_off.result
index 6b4139e97a1..830ee4dcfc5 100644
--- a/mysql-test/suite/wsrep/r/wsrep_variables_wsrep_off.result
+++ b/mysql-test/suite/wsrep/r/wsrep_variables_wsrep_off.result
@@ -3,7 +3,6 @@ SELECT @@wsrep_on;
 0
 SET @wsrep_debug_saved = @@global.wsrep_debug;
 SET SESSION wsrep_trx_fragment_size=DEFAULT;
-ERROR HY000: Incorrect arguments to SET
 SELECT @@session.wsrep_trx_fragment_size;
 @@session.wsrep_trx_fragment_size
 0
@@ -33,7 +32,11 @@ SELECT @@global.wsrep_desync;
 @@global.wsrep_desync
 0
 SET SESSION wsrep_trx_fragment_unit='rows';
-ERROR HY000: Incorrect arguments to SET
+ERROR 42000: Variable 'wsrep_trx_fragment_unit' can't be set to the value of 'rows'
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1231	Cannot set 'wsrep_trx_fragment_unit' because wsrep is switched off
+Error	1231	Variable 'wsrep_trx_fragment_unit' can't be set to the value of 'rows'
 SELECT @@session.wsrep_trx_fragment_unit;
 @@session.wsrep_trx_fragment_unit
-rows
+bytes
diff --git a/mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.test b/mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.test
index ec654614f40..64420c91b9e 100644
--- a/mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.test
+++ b/mysql-test/suite/wsrep/t/wsrep_variables_wsrep_off.test
@@ -5,7 +5,6 @@ SELECT @@wsrep_on;
 
 SET @wsrep_debug_saved = @@global.wsrep_debug;
 
---error ER_WRONG_ARGUMENTS
 SET SESSION wsrep_trx_fragment_size=DEFAULT;
 SELECT @@session.wsrep_trx_fragment_size;
 --error ER_WRONG_VALUE_FOR_VAR
@@ -20,8 +19,9 @@ SELECT @@global.wsrep_slave_threads;
 --error ER_WRONG_ARGUMENTS
 SET GLOBAL wsrep_desync=1;
 SELECT @@global.wsrep_desync;
---error ER_WRONG_ARGUMENTS
+--error ER_WRONG_VALUE_FOR_VAR
 SET SESSION wsrep_trx_fragment_unit='rows';
+SHOW WARNINGS;
 SELECT @@session.wsrep_trx_fragment_unit;
 
 --disable_query_log
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index a053ac3ccdb..ae19adf5cbd 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -108,6 +108,7 @@
 #ifdef WITH_WSREP
 #include "wsrep_thd.h"
 #include "wsrep_trans_observer.h" /* wsrep transaction hooks */
+#include "wsrep_schema.h"
 
 static bool wsrep_mysql_parse(THD *thd, char *rawbuf, uint length,
                               Parser_state *parser_state);
@@ -1139,7 +1140,7 @@ void cleanup_items(Item *item)
 }
 
 #ifdef WITH_WSREP
-static bool wsrep_tables_accessible_when_detached(const TABLE_LIST *tables)
+static inline bool wsrep_tables_accessible_when_detached(const TABLE_LIST *tables)
 {
   for (const TABLE_LIST *table= tables; table; table= table->next_global)
   {
@@ -1151,13 +1152,27 @@ static bool wsrep_tables_accessible_when_detached(const TABLE_LIST *tables)
   return tables != NULL;
 }
 
-static bool wsrep_command_no_result(char command)
+static inline bool wsrep_is_streaming_log(const TABLE_LIST *tables)
+{
+  for (const TABLE_LIST *table= tables; table; table= table->next_global)
+  {
+    const Lex_ident_db db(table->db);
+    const Lex_ident_table name(table->table_name);
+    if (db.streq(WSREP_LEX_SCHEMA) &&
+        name.streq(WSREP_LEX_STREAMING))
+      return true;
+  }
+  return false;
+}
+
+static inline bool wsrep_command_no_result(char command)
 {
   return (command == COM_STMT_FETCH            ||
           command == COM_STMT_SEND_LONG_DATA   ||
           command == COM_STMT_CLOSE);
 }
 #endif /* WITH_WSREP */
+
 #ifndef EMBEDDED_LIBRARY
 static enum enum_server_command fetch_command(THD *thd, char *packet)
 {
@@ -5034,6 +5049,19 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
     {
       if (check_table_access(thd, DROP_ACL, all_tables, FALSE, UINT_MAX, FALSE))
 	goto error;				/* purecov: inspected */
+#ifdef WITH_WSREP
+      /* In Galera do not allow dropping mysql.wsrep_streaming_log
+         because it would make streaming replication to fail.
+      */
+      if (WSREP(thd) && wsrep_is_streaming_log(all_tables))
+      {
+        my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0), "DROP",
+                 thd->security_ctx->priv_user,
+                 thd->security_ctx->host_or_ip,
+                 "mysql", "wsrep_streaming_log");
+        goto error;
+      }
+#endif /* WITH_WSREP */
     }
     else
     {
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index df6c48f2dc8..7a5e1701300 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -6387,7 +6387,7 @@ static Sys_var_enum Sys_wsrep_trx_fragment_unit(
       wsrep_fragment_units,
       DEFAULT(WSREP_FRAG_BYTES),
       NO_MUTEX_GUARD, NOT_IN_BINLOG,
-      ON_CHECK(0),
+      ON_CHECK(wsrep_trx_fragment_unit_check),
       ON_UPDATE(wsrep_trx_fragment_unit_update));
 
 extern const char *wsrep_SR_store_types[];
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc
index be4ba01ec95..feee88fdd42 100644
--- a/sql/wsrep_var.cc
+++ b/sql/wsrep_var.cc
@@ -28,6 +28,7 @@
 #include "wsrep_trans_observer.h"
 #include "wsrep_server_state.h"
 #include "wsrep_mysqld.h"
+#include "wsrep_schema.h"
 
 ulong   wsrep_reject_queries;
 
@@ -886,29 +887,47 @@ bool wsrep_trx_fragment_size_check (sys_var *self, THD* thd, set_var* var)
 
   const ulong new_trx_fragment_size= var->value->val_uint();
 
-  if (!WSREP(thd) && new_trx_fragment_size > 0) {
-    push_warning (thd, Sql_condition::WARN_LEVEL_WARN,
-                  ER_WRONG_VALUE_FOR_VAR,
-                  "Cannot set 'wsrep_trx_fragment_size' to a value other than "
-                  "0 because wsrep is switched off.");
-    return true;
-  }
+  if (new_trx_fragment_size)
+  {
+    // Give error if wsrep_trx_fragment_size is set and wsrep is disabled or
+    // provider is not loaded
+    if (!WSREP(thd) || !Wsrep_server_state::instance().is_provider_loaded())
+    {
+      push_warning (thd, Sql_condition::WARN_LEVEL_WARN,
+                    ER_WRONG_VALUE_FOR_VAR,
+                    "Cannot set 'wsrep_trx_fragment_size' to a value other than "
+                    "0 because wsrep is switched off.");
+      return true;
+    }
 
-  if (new_trx_fragment_size > 0 && !wsrep_provider_is_SR_capable()) {
-    push_warning (thd, Sql_condition::WARN_LEVEL_WARN,
-                  ER_WRONG_VALUE_FOR_VAR,
-                  "Cannot set 'wsrep_trx_fragment_size' to a value other than "
-                  "0 because the wsrep_provider does not support streaming "
-                  "replication.");
-    return true;
-  }
+    if (!wsrep_provider_is_SR_capable())
+    {
+      push_warning (thd, Sql_condition::WARN_LEVEL_WARN,
+                    ER_WRONG_VALUE_FOR_VAR,
+                    "Cannot set 'wsrep_trx_fragment_size' to a value other than "
+                    "0 because the wsrep_provider does not support streaming "
+                    "replication.");
+      return true;
+    }
 
-  if (wsrep_protocol_version < 4  && new_trx_fragment_size > 0) {
-    push_warning (thd, Sql_condition::WARN_LEVEL_WARN,
-                  ER_WRONG_VALUE_FOR_VAR,
-                  "Cannot set 'wsrep_trx_fragment_size' to a value other than "
-                  "0 because cluster is not yet operating in Galera 4 mode.");
-    return true;
+    if (wsrep_protocol_version < 4)
+    {
+      push_warning (thd, Sql_condition::WARN_LEVEL_WARN,
+                    ER_WRONG_VALUE_FOR_VAR,
+                    "Cannot set 'wsrep_trx_fragment_size' to a value other than "
+                    "0 because cluster is not yet operating in Galera 4 mode.");
+      return true;
+    }
+
+    if (!ha_table_exists(thd, &WSREP_LEX_SCHEMA, &WSREP_LEX_STREAMING))
+    {
+      push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+                          ER_WRONG_VALUE_FOR_VAR,
+                          "Cannot set 'wsrep_trx_fragment_size' to a value other than "
+                          "0 because streaming table %s.%s does not exists.",
+		          WSREP_LEX_SCHEMA.str, WSREP_LEX_STREAMING.str);
+      return true;
+    }
   }
 
   return false;
@@ -919,28 +938,50 @@ bool wsrep_trx_fragment_size_update(sys_var* self, THD *thd, enum_var_type)
   WSREP_DEBUG("wsrep_trx_fragment_size_update: %llu",
               thd->variables.wsrep_trx_fragment_size);
 
-  // Give error if wsrep_trx_fragment_size is set and wsrep is disabled or
-  // provider is not loaded
-  if (!WSREP_ON || !Wsrep_server_state::instance().is_provider_loaded())
-  {
-    push_warning (thd, Sql_condition::WARN_LEVEL_WARN,
-                  ER_WRONG_VALUE_FOR_VAR,
-                  "Cannot set 'wsrep_trx_fragment_size' because "
-                  "wsrep is switched off");
-    return true;
-  }
-
   if (thd->variables.wsrep_trx_fragment_size)
   {
     return thd->wsrep_cs().enable_streaming(
       wsrep_fragment_unit(thd->variables.wsrep_trx_fragment_unit),
       size_t(thd->variables.wsrep_trx_fragment_size));
   }
-  else
+  else if (wsrep_streaming_enabled(thd))
   {
     thd->wsrep_cs().disable_streaming();
-    return false;
   }
+  return false;
+}
+
+bool wsrep_trx_fragment_unit_check (sys_var *self, THD* thd, set_var* var)
+{
+  uint new_trx_fragment_unit= (uint)var->save_result.ulonglong_value;
+  // Do not allow setting fragment unit anything else than
+  // default if galera is not enabled and streaming replication
+  // table does not exists.
+  if (thd->variables.wsrep_trx_fragment_size ||
+      new_trx_fragment_unit != WSREP_FRAG_BYTES)
+  {
+    // Give error if wsrep_trx_fragment_unit is set and wsrep is disabled or
+    // provider is not loaded
+    if (!WSREP_ON || !Wsrep_server_state::instance().is_provider_loaded())
+    {
+      push_warning (thd, Sql_condition::WARN_LEVEL_WARN,
+                    ER_WRONG_VALUE_FOR_VAR,
+                   "Cannot set 'wsrep_trx_fragment_unit' because "
+                   "wsrep is switched off");
+      return true;
+    }
+
+    if (!ha_table_exists(thd, &WSREP_LEX_SCHEMA, &WSREP_LEX_STREAMING))
+    {
+      push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+                          ER_WRONG_VALUE_FOR_VAR,
+                          "Cannot set 'wsrep_trx_fragment_unit' "
+                          "because streaming table %s.%s does not exists.",
+                          WSREP_LEX_SCHEMA.str, WSREP_LEX_STREAMING.str);
+      return true;
+    }
+  }
+  return false;
 }
 
 bool wsrep_trx_fragment_unit_update(sys_var* self, THD *thd, enum_var_type)
@@ -948,17 +989,6 @@ bool wsrep_trx_fragment_unit_update(sys_var* self, THD *thd, enum_var_type)
   WSREP_DEBUG("wsrep_trx_fragment_unit_update: %lu",
               thd->variables.wsrep_trx_fragment_unit);
 
-  // Give error if wsrep_trx_fragment_unit is set and wsrep is disabled or
-  // provider is not loaded
-  if (!WSREP_ON || !Wsrep_server_state::instance().is_provider_loaded())
-  {
-    push_warning (thd, Sql_condition::WARN_LEVEL_WARN,
-                  ER_WRONG_VALUE_FOR_VAR,
-                  "Cannot set 'wsrep_trx_fragment_unit' because "
-                  "wsrep is switched off");
-    return true;
-  }
-
   if (thd->variables.wsrep_trx_fragment_size)
   {
     return thd->wsrep_cs().enable_streaming(
diff --git a/sql/wsrep_var.h b/sql/wsrep_var.h
index 06f47fd2ed1..942c64ceff5 100644
--- a/sql/wsrep_var.h
+++ b/sql/wsrep_var.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2023 Codership Oy <info@codership.com>
+/* Copyright (C) 2013-2025 Codership Oy <info@codership.com>
 
    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
@@ -96,6 +96,7 @@ extern bool wsrep_desync_update              UPDATE_ARGS;
 extern bool wsrep_trx_fragment_size_check    CHECK_ARGS;
 extern bool wsrep_trx_fragment_size_update   UPDATE_ARGS;
 
+extern bool wsrep_trx_fragment_unit_check    CHECK_ARGS;
 extern bool wsrep_trx_fragment_unit_update   UPDATE_ARGS;
 
 extern bool wsrep_max_ws_size_check          CHECK_ARGS;

From cedb0ed79da4fe43a31abb9b4f974ee9384c2642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Mon, 3 Nov 2025 14:01:08 +0200
Subject: [PATCH 007/119] MDEV-37991 : Galera cluster crashes when granting
 permission to non existing user after setting max_error_count and
 wsrep_ignore_apply_errors to zero

There was two problems. Firsty, implementation assumed that
thd->wsrep_rgi is not nullptr, this is not true for TOI.
Secondly, Sql_condition_iterator was also assumed to be
not nullptr, this might not be also true.

Fixed by adding nullptr guard for thd->wsrep_rgi and
if Sql_condition_iterator is nullptr obtain error
information directly from Diagnostics_area if there
is some error there.
---
 mysql-test/suite/galera/r/MDEV-37991.result | 18 +++++++
 mysql-test/suite/galera/t/MDEV-37991.test   | 30 +++++++++++
 sql/wsrep_applier.cc                        | 60 +++++++++++++++------
 3 files changed, 91 insertions(+), 17 deletions(-)
 create mode 100644 mysql-test/suite/galera/r/MDEV-37991.result
 create mode 100644 mysql-test/suite/galera/t/MDEV-37991.test

diff --git a/mysql-test/suite/galera/r/MDEV-37991.result b/mysql-test/suite/galera/r/MDEV-37991.result
new file mode 100644
index 00000000000..09c4087674d
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-37991.result
@@ -0,0 +1,18 @@
+connection node_2;
+connection node_1;
+connection node_1;
+connection node_2;
+connection node_2;
+SET SESSION max_error_count=0;
+SET GLOBAL wsrep_ignore_apply_errors = 0;
+GRANT SELECT ON *.* TO dummy@'localhost';
+ERROR 28000: Can't find any matching row in the user table
+SHOW WARNINGS;
+Level	Code	Message
+# Node_2 is on inconsistency state so kill it
+SET SESSION wsrep_sync_wait = 0;
+Killing server ...
+connection node_1;
+connection node_2;
+SET GLOBAL wsrep_ignore_apply_errors = DEFAULT;
+call mtr.add_suppression("Inconsistency detected: Inconsistent by consensus on");
diff --git a/mysql-test/suite/galera/t/MDEV-37991.test b/mysql-test/suite/galera/t/MDEV-37991.test
new file mode 100644
index 00000000000..19e809d5b28
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-37991.test
@@ -0,0 +1,30 @@
+--source include/galera_cluster.inc
+
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
+--connection node_2
+SET SESSION max_error_count=0;
+SET GLOBAL wsrep_ignore_apply_errors = 0;
+--error ER_PASSWORD_NO_MATCH
+GRANT SELECT ON *.* TO dummy@'localhost';
+SHOW WARNINGS;
+--echo # Node_2 is on inconsistency state so kill it
+SET SESSION wsrep_sync_wait = 0;
+--source include/kill_galera.inc
+
+--let $start_mysqld_params =
+--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
+--source include/start_mysqld.inc
+--source include/wait_until_ready.inc
+
+--connection node_1
+--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+
+--connection node_2
+SET GLOBAL wsrep_ignore_apply_errors = DEFAULT;
+call mtr.add_suppression("Inconsistency detected: Inconsistent by consensus on");
+--source include/auto_increment_offset_restore.inc
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc
index 4ce644c52f7..4eaef4fb489 100644
--- a/sql/wsrep_applier.cc
+++ b/sql/wsrep_applier.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013-2024 Codership Oy <info@codership.com>
+/* Copyright (C) 2013-2025 Codership Oy <info@codership.com>
 
    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
@@ -88,7 +88,8 @@ static void wsrep_store_error_rli(const THD* const thd,
                                   wsrep::mutable_buffer& dst,
                                   bool const include_msg)
 {
-  Slave_reporting_capability* const rli= thd->wsrep_rgi->rli;
+  Slave_reporting_capability* const rli= thd->wsrep_rgi ?
+    thd->wsrep_rgi->rli : nullptr;
   if (rli && rli->last_error().number != 0)
   {
     auto error= rli->last_error();
@@ -108,14 +109,36 @@ static void wsrep_store_error_rli(const THD* const thd,
   }
 }
 
+/* Helper function to print error message */
+static size_t wsrep_print_error(char* dst,
+                                const size_t dst_len,
+                                const bool include_msg,
+                                const uint err_code,
+                                const char* err_str)
+{
+  size_t len;
+  if (include_msg)
+  {
+    len= snprintf(dst, dst_len, " %s, Error_code: %d;",
+                  err_str, err_code);
+  }
+  else
+  {
+    len= snprintf(dst, dst_len, " Error_code: %d;",
+                  err_code);
+  }
+  return len;
+}
+
 /* store error from diagnostic area */
 static void wsrep_store_error_da(const THD* const thd,
                                  wsrep::mutable_buffer& dst,
                                  bool const include_msg)
 {
+  const Diagnostics_area* da= thd->get_stmt_da();
   Diagnostics_area::Sql_condition_iterator it=
-    thd->get_stmt_da()->sql_conditions();
-  const Sql_condition* cond;
+    da->sql_conditions();
+  const Sql_condition* cond=it++;
 
   static size_t const max_len= 2*MAX_SLAVE_ERRMSG; // 2x so that we have enough
 
@@ -124,23 +147,26 @@ static void wsrep_store_error_da(const THD* const thd,
   char* slider= dst.data();
   const char* const buf_end= slider + max_len - 1; // -1: leave space for \0
 
-  for (cond= it++; cond && slider < buf_end; cond= it++)
+  if (cond)
   {
-    uint const err_code= cond->get_sql_errno();
-    const char* const err_str= cond->get_message_text();
-
-    if (include_msg)
+    for (; cond && slider < buf_end; cond= it++)
     {
-      slider+= snprintf(slider, buf_end - slider, " %s, Error_code: %d;",
-                        err_str, err_code);
-    }
-    else
-    {
-      slider+= snprintf(slider, buf_end - slider, " Error_code: %d;",
-                        err_code);
+      uint const err_code= cond->get_sql_errno();
+      const char* const err_str= cond->get_message_text();
+      slider+= wsrep_print_error(slider, buf_end-slider,
+                                 include_msg, err_code, err_str);
     }
   }
-
+  else if (da->is_error())
+  {
+    // For example during TOI SQL_condition_iterator
+    // could be nullptr, get error from Diagnostics
+    // area directly.
+    uint const err_code= da->sql_errno();
+    const char* const err_str= da->message();
+    slider+= wsrep_print_error(slider, buf_end-slider,
+                               include_msg, err_code, err_str);
+  }
   if (slider != dst.data())
   {
     *slider= '\0';

From 9fa25e88ed4e26858e6f9c3c0e51d0f259339d17 Mon Sep 17 00:00:00 2001
From: Daniel Bartholomew <db@dbart.us>
Date: Thu, 6 Nov 2025 12:28:23 -0500
Subject: [PATCH 008/119] bump the VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index b522910ae82..4522ed40cbd 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=24
+MYSQL_VERSION_PATCH=25
 SERVER_MATURITY=stable

From ebd875b13a0440c10583dd428a777c3f197f947c Mon Sep 17 00:00:00 2001
From: Daniel Bartholomew <db@dbart.us>
Date: Thu, 6 Nov 2025 12:29:42 -0500
Subject: [PATCH 009/119] bump the VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index e50555698ea..691d171ecd6 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=11
-MYSQL_VERSION_PATCH=15
+MYSQL_VERSION_PATCH=16
 SERVER_MATURITY=stable

From 023074aa4928295c6b70d4cad6de81e939c20941 Mon Sep 17 00:00:00 2001
From: Daniel Bartholomew <db@dbart.us>
Date: Thu, 6 Nov 2025 12:30:28 -0500
Subject: [PATCH 010/119] bump the VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 57e87ec47a6..09b6406325a 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=11
 MYSQL_VERSION_MINOR=4
-MYSQL_VERSION_PATCH=9
+MYSQL_VERSION_PATCH=10
 SERVER_MATURITY=stable

From 911e68c16b7c3d5a8690d48f55b1b72ed98b6e85 Mon Sep 17 00:00:00 2001
From: Sergey Vojtovich <svojtovich@gmail.com>
Date: Sun, 2 Nov 2025 19:43:35 +0400
Subject: [PATCH 011/119] MDEV-38008 - main.grant_kill fails sporadically

Test output was affected by incompletely closed preceding connections.

Make test agnostic to concurrent connections by querying
information_schema.processlist only for connections that it uses.

With bead24b7f3d all 3 processlist queries were affected.
Before bead24b7f3d - only the first one.
---
 mysql-test/main/grant_kill.result | 12 +++---------
 mysql-test/main/grant_kill.test   | 17 ++++++-----------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/mysql-test/main/grant_kill.result b/mysql-test/main/grant_kill.result
index e1243a39a70..724b8341ecb 100644
--- a/mysql-test/main/grant_kill.result
+++ b/mysql-test/main/grant_kill.result
@@ -14,11 +14,9 @@ GRANT ALL PRIVILEGES ON *.* TO bar@localhost;
 REVOKE CONNECTION ADMIN, SUPER ON *.* FROM bar@localhost;
 connect  foo,localhost,foo,,;
 connect  bar,localhost,bar,,;
-SELECT user FROM information_schema.processlist ORDER BY user;
+SELECT user FROM information_schema.processlist WHERE id=$id;
 user
-bar
 foo
-root
 KILL ID;
 ERROR HY000: You are not owner of thread ID
 disconnect foo;
@@ -35,11 +33,9 @@ CREATE USER bar@localhost;
 GRANT PROCESS, CONNECTION ADMIN ON *.* TO bar@localhost;
 connect  foo,localhost,foo,,;
 connect  bar,localhost,bar,,;
-SELECT user FROM information_schema.processlist ORDER BY user;
+SELECT user FROM information_schema.processlist WHERE id=$id;
 user
-bar
 foo
-root
 KILL ID;
 connection default;
 disconnect foo;
@@ -55,11 +51,9 @@ CREATE USER bar@localhost;
 GRANT PROCESS, SUPER ON *.* TO bar@localhost;
 connect  foo,localhost,foo,,;
 connect  bar,localhost,bar,,;
-SELECT user FROM information_schema.processlist ORDER BY user;
+SELECT user FROM information_schema.processlist WHERE id=$id;
 user
-bar
 foo
-root
 KILL ID;
 connection default;
 disconnect foo;
diff --git a/mysql-test/main/grant_kill.test b/mysql-test/main/grant_kill.test
index 75a25743dc9..0887d9d7165 100644
--- a/mysql-test/main/grant_kill.test
+++ b/mysql-test/main/grant_kill.test
@@ -9,8 +9,6 @@
 --echo #
 --disable_service_connection
 
---let $count_sessions=1
-
 --echo #
 --echo # Test that KILL is not allowed without CONNECTION ADMIN or SUPER
 --echo #
@@ -21,16 +19,15 @@ CREATE USER bar@localhost;
 GRANT ALL PRIVILEGES ON *.* TO bar@localhost;
 REVOKE CONNECTION ADMIN, SUPER ON *.* FROM bar@localhost;
 --connect (foo,localhost,foo,,)
-let $id=`(SELECT id FROM INFORMATION_SCHEMA.PROCESSLIST WHERE user='foo')`;
+let $id=`select connection_id()`;
 --connect (bar,localhost,bar,,)
-SELECT user FROM information_schema.processlist ORDER BY user;
+evalp SELECT user FROM information_schema.processlist WHERE id=$id;
 --replace_result $id ID
 --error ER_KILL_DENIED_ERROR
 --eval KILL $id
 --disconnect foo
 --disconnect bar
 --connection default
---source include/wait_until_count_sessions.inc
 DROP USER foo@localhost;
 DROP USER bar@localhost;
 
@@ -43,9 +40,9 @@ GRANT SELECT ON *.* TO foo@localhost;
 CREATE USER bar@localhost;
 GRANT PROCESS, CONNECTION ADMIN ON *.* TO bar@localhost;
 --connect (foo,localhost,foo,,)
-let $id=`(SELECT id FROM INFORMATION_SCHEMA.PROCESSLIST WHERE user='foo')`;
+let $id=`select connection_id()`;
 --connect (bar,localhost,bar,,)
-SELECT user FROM information_schema.processlist ORDER BY user;
+evalp SELECT user FROM information_schema.processlist WHERE id=$id;
 --replace_result $id ID
 --eval KILL $id
 --connection default
@@ -55,7 +52,6 @@ let $wait_condition=
 --source include/wait_condition.inc
 --disconnect foo
 --disconnect bar
---source include/wait_until_count_sessions.inc
 DROP USER foo@localhost;
 DROP USER bar@localhost;
 
@@ -68,9 +64,9 @@ GRANT SELECT ON *.* TO foo@localhost;
 CREATE USER bar@localhost;
 GRANT PROCESS, SUPER ON *.* TO bar@localhost;
 --connect (foo,localhost,foo,,)
-let $id=`(SELECT id FROM INFORMATION_SCHEMA.PROCESSLIST WHERE user='foo')`;
+let $id=`select connection_id()`;
 --connect (bar,localhost,bar,,)
-SELECT user FROM information_schema.processlist ORDER BY user;
+evalp SELECT user FROM information_schema.processlist WHERE id=$id;
 --replace_result $id ID
 --eval KILL $id
 --connection default
@@ -80,7 +76,6 @@ let $wait_condition=
 --source include/wait_condition.inc
 --disconnect foo
 --disconnect bar
---source include/wait_until_count_sessions.inc
 DROP USER foo@localhost;
 DROP USER bar@localhost;
 

From 14d9323f60b0a4f5acf569fe596c728eca3e2753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Fri, 7 Nov 2025 08:06:27 +0200
Subject: [PATCH 012/119] MDEV-37994 Race condition between checkpoint and .ibd
 file creation

It was possible that a log checkpoint was completed and the server killed
between the time that fil_ibd_create() durably wrote a FILE_CREATE record,
and the initialization of the tablespace. This could lead to a failure
to start up after the server was killed during TRUNCATE TABLE or any
table-rebuilding operation such as OPTIMIZE TABLE.

In the case of TRUNCATE TABLE, an attempt to rename a file #sql-ibNNN.ibd
(the contents of the table before truncation) to tablename.ibd would fail,
because both files existed and the file tablename.ibd would have been
filled with NUL bytes. It was possible to resume from this error by
deleting the file tablename.ibd and restarting the server.

We will prevent this class of errors by ensuring that both the FILE_CREATE
record and the records written by fsp_header_init() will be part of the
same atomic transaction, which must be durably written before any file
is created or allocated.

NOTE: There is another possible crash recovery problem, which we are not
attempting to solve here and which will be covered by the subsequent
change (MDEV-38026). If fil_ibd_create() fails to create the file and
the server were killed, recovery would not even attempt to create the file
at all.

fil_space_t::create(): Remove the DBUG_EXECUTE_IF fault injection that
was the only cause of return nullptr. This allows us to simplify
several callers.

fil_space_t::set_stopped(), fil_space_t::clear_stopped(): Accessor
functions for fil_ibd_create() for preventing any concurrent access
to an incompletely created tablespace.

fil_ibd_create(): In a single atomic mini-transaction, write the
FILE_CREATE record as well as the log for initializing the tablespace.
After durably writing the log, create the file in the file system
Only after the file has been successfully created and allocated,
open the tablespace for business. Finally, release the exclusive page
latches so that the header pages may be written to the file.

fil_ibd_open(): Move some fault injection from fil_space_t::create()
to a higher level, to the place where an existing file is being opened.

Reviewed by: Thirunarayanan Balathandayuthapani
Tested by: Saahil Alam
---
 extra/mariabackup/xtrabackup.cc               |  14 +-
 .../suite/innodb_fts/r/innodb-fts-ddl.result  |   1 +
 .../suite/innodb_fts/t/innodb-fts-ddl.test    |   1 +
 storage/innobase/fil/fil0fil.cc               | 197 ++++++++++--------
 storage/innobase/fsp/fsp0space.cc             |   8 +-
 storage/innobase/fsp/fsp0sysspace.cc          |   8 -
 storage/innobase/include/fil0fil.h            |  21 +-
 7 files changed, 132 insertions(+), 118 deletions(-)

diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index a65f8c2cf0b..f41d9f0313f 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -5461,16 +5461,12 @@ exit:
 	ut_ad(fil_space_t::physical_size(flags) == info.page_size);
 
 	mysql_mutex_lock(&fil_system.mutex);
-	fil_space_t* space = fil_space_t::create(uint32_t(info.space_id),
-						 flags, false, 0,
-						 FIL_ENCRYPTION_DEFAULT, true);
+	std::ignore = fil_space_t::create(uint32_t(info.space_id),
+					  flags, false, 0,
+					  FIL_ENCRYPTION_DEFAULT, true);
 	mysql_mutex_unlock(&fil_system.mutex);
-	if (space) {
-		*success = xb_space_create_file(real_name, info.space_id,
-						flags, &file);
-	} else {
-		msg("Can't create tablespace %s\n", dest_space_name);
-	}
+	*success = xb_space_create_file(real_name, info.space_id,
+					flags, &file);
 
 	goto exit;
 }
diff --git a/mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result b/mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result
index 15f5b2958cd..e890ff6f119 100644
--- a/mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result
+++ b/mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result
@@ -272,6 +272,7 @@ call mtr.add_suppression("InnoDB: Operating system error number .* in a file ope
 call mtr.add_suppression("InnoDB: Error number .* means");
 call mtr.add_suppression("InnoDB: Cannot create file");
 call mtr.add_suppression("InnoDB: Failed to create");
+call mtr.add_suppression("InnoDB: The file '.*test/FTS_[0-9a-f]*_BEING_DELETED\\.ibd' already exists");
 CREATE TABLE t1(a TEXT, FTS_DOC_ID BIGINT UNSIGNED NOT NULL UNIQUE) ENGINE=InnoDB;
 ALTER TABLE t1 ADD FULLTEXT(a), ALGORITHM=INPLACE;
 ERROR HY000: Got error 11 "Resource temporarily unavailable" from storage engine InnoDB
diff --git a/mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test b/mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
index 11d2d493bf3..b46e8156a91 100644
--- a/mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
+++ b/mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
@@ -365,6 +365,7 @@ call mtr.add_suppression("InnoDB: Operating system error number .* in a file ope
 call mtr.add_suppression("InnoDB: Error number .* means");
 call mtr.add_suppression("InnoDB: Cannot create file");
 call mtr.add_suppression("InnoDB: Failed to create");
+call mtr.add_suppression("InnoDB: The file '.*test/FTS_[0-9a-f]*_BEING_DELETED\\.ibd' already exists");
 
 let MYSQLD_DATADIR=`select @@datadir`;
 CREATE TABLE t1(a TEXT, FTS_DOC_ID BIGINT UNSIGNED NOT NULL UNIQUE) ENGINE=InnoDB;
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index 8a4310b3de9..ff98cfa9a04 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -930,8 +930,6 @@ fil_space_t *fil_space_t::create(uint32_t id, ulint flags,
   ut_ad(fil_space_t::is_valid_flags(flags & ~FSP_FLAGS_MEM_MASK, id));
   ut_ad(srv_page_size == UNIV_PAGE_SIZE_ORIG || flags != 0);
 
-  DBUG_EXECUTE_IF("fil_space_create_failure", return nullptr;);
-
   fil_space_t** after= fil_system.spaces.cell_get(id)->search
     (&fil_space_t::hash, [id](const fil_space_t *space)
     { return !space || space->id == id; });
@@ -1840,16 +1838,12 @@ fil_ibd_create(
 	uint32_t	key_id,
 	dberr_t*	err) noexcept
 {
-	pfs_os_file_t	file;
-	bool		success;
-	mtr_t		mtr;
-	bool		has_data_dir = FSP_FLAGS_HAS_DATA_DIR(flags) != 0;
-
 	ut_ad(!is_system_tablespace(space_id));
 	ut_ad(!srv_read_only_mode);
 	ut_a(space_id < SRV_SPACE_ID_UPPER_BOUND);
 	ut_a(size >= FIL_IBD_FILE_INITIAL_SIZE);
-	ut_a(fil_space_t::is_valid_flags(flags & ~FSP_FLAGS_MEM_MASK, space_id));
+	ut_a(fil_space_t::is_valid_flags(flags & ~FSP_FLAGS_MEM_MASK,
+					 space_id));
 
 	/* Create the subdirectories in the path, if they are
 	not there already. */
@@ -1858,11 +1852,6 @@ fil_ibd_create(
 		return NULL;
 	}
 
-	mtr.start();
-	mtr.log_file_op(FILE_CREATE, space_id, path);
-	mtr.commit();
-	log_write_up_to(mtr.commit_lsn(), true);
-
 	static_assert(((UNIV_ZIP_SIZE_MIN >> 1) << 3) == 4096,
 		      "compatibility");
 #if defined _WIN32 || defined HAVE_FCNTL_DIRECT
@@ -1878,45 +1867,7 @@ fil_ibd_create(
 #else
 	constexpr auto type = OS_DATA_FILE;
 #endif
-
-	file = os_file_create(
-		innodb_data_file_key, path,
-		OS_FILE_CREATE | OS_FILE_ON_ERROR_NO_EXIT,
-		type, srv_read_only_mode, &success);
-
-	if (!success) {
-		/* The following call will print an error message */
-		switch (os_file_get_last_error(true)) {
-		case OS_FILE_ALREADY_EXISTS:
-			ib::info() << "The file '" << path << "'"
-				" already exists though the"
-				" corresponding table did not exist"
-				" in the InnoDB data dictionary."
-				" You can resolve the problem by removing"
-				" the file.";
-			*err = DB_TABLESPACE_EXISTS;
-			break;
-		case OS_FILE_DISK_FULL:
-			*err = DB_OUT_OF_FILE_SPACE;
-			break;
-		default:
-			*err = DB_ERROR;
-		}
-		ib::error() << "Cannot create file '" << path << "'";
-		return NULL;
-	}
-
 	const bool is_compressed = fil_space_t::is_compressed(flags);
-#ifdef _WIN32
-	const bool is_sparse = is_compressed;
-	if (is_compressed) {
-		os_file_set_sparse_win32(file);
-	}
-#else
-	const bool is_sparse = is_compressed
-		&& DB_SUCCESS == os_file_punch_hole(file, 0, 4096)
-		&& !my_test_if_thinly_provisioned(file);
-#endif
 
 	if (fil_space_t::full_crc32(flags)) {
 		flags |= FSP_FLAGS_FCRC32_PAGE_SSIZE();
@@ -1931,54 +1882,122 @@ fil_ibd_create(
 		? fil_space_create_crypt_data(mode, key_id)
 		: nullptr;
 
+	mysql_mutex_lock(&fil_system.mutex);
+	fil_space_t* space = fil_space_t::create(uint32_t(space_id),
+						 flags, false,
+						 crypt_data, mode, true);
+	fil_node_t* node = space->add(path, OS_FILE_CLOSED, size, false, true);
+	space->set_stopped();
+	mysql_mutex_unlock(&fil_system.mutex);
+
+	buf_block_t *header[2];
+	{
+		mtr_t mtr;
+		mtr.start();
+		mtr.log_file_op(FILE_CREATE, space_id, path);
+		mtr.set_named_space(space);
+		log_free_check();
+		ut_a(fsp_header_init(space, size, &mtr) == DB_SUCCESS);
+		ut_ad(mtr.get_savepoint() == 3);
+		header[0] = mtr.at_savepoint(1);
+		header[1] = mtr.at_savepoint(2);
+		ut_ad(header[0]->page.id() == page_id_t(space_id, 0));
+		ut_ad(header[1]->page.id() == page_id_t(space_id, 1));
+		/* Block any page writes before the file has been created. */
+		header[0]->page.lock.x_lock();
+		header[1]->page.lock.x_lock();
+		mtr.commit();
+		/* Durably write the FILE_CREATE record (as well as records for
+		the fsp_header_init() above before creating the file. */
+		log_write_up_to(mtr.commit_lsn(), true);
+	}
+
+	bool success;
+	pfs_os_file_t file = os_file_create(
+		innodb_data_file_key, path,
+		OS_FILE_CREATE | OS_FILE_ON_ERROR_NO_EXIT,
+		type, srv_read_only_mode, &success);
+	ut_ad(!success == (file == OS_FILE_CLOSED));
+
+	if (!success) {
+		*err = DB_ERROR;
+		/* The following call will print an error message */
+		switch (os_file_get_last_error(true)) {
+		case OS_FILE_ALREADY_EXISTS:
+			sql_print_error("InnoDB: The file '%s'"
+					" already exists though the"
+					" corresponding table did not exist"
+					" in the InnoDB data dictionary."
+					" You can resolve the problem"
+					" by removing"
+					" the file.", path);
+			*err = DB_TABLESPACE_EXISTS;
+			break;
+		case OS_FILE_DISK_FULL:
+			*err = DB_OUT_OF_FILE_SPACE;
+			/* fall through */
+		default:
+			sql_print_error("InnoDB: Cannot create file '%s'",
+					path);
+		}
+		goto err_exit_after_cleanup;
+err_exit:
+		os_file_delete(innodb_data_file_key, path);
+		os_file_close(file);
+err_exit_after_cleanup:
+		space->release();
+		fil_space_free(space_id, false);
+		space = nullptr;
+func_exit:
+		header[0]->page.lock.x_unlock();
+		header[1]->page.lock.x_unlock();
+		DBUG_EXECUTE_IF("checkpoint_after_file_create",
+				log_make_checkpoint(););
+		return space;
+	}
+
+#ifdef _WIN32
+	const bool is_sparse = is_compressed;
+	if (is_compressed) {
+		os_file_set_sparse_win32(file);
+	}
+#else
+	const bool is_sparse = is_compressed
+		&& DB_SUCCESS == os_file_punch_hole(file, 0, 4096)
+		&& !my_test_if_thinly_provisioned(file);
+#endif
 	if (!os_file_set_size(path, file,
 			      os_offset_t(size) << srv_page_size_shift,
 			      is_sparse)) {
 		*err = DB_OUT_OF_FILE_SPACE;
-err_exit:
-		os_file_close(file);
-		os_file_delete(innodb_data_file_key, path);
-		free(crypt_data);
-		return nullptr;
+		goto err_exit;
 	}
 
-	fil_space_t::name_type space_name;
+	DBUG_EXECUTE_IF("fil_space_create_failure",
+			*err = DB_OUT_OF_FILE_SPACE; goto err_exit;);
 
-	if (has_data_dir) {
+	if (FSP_FLAGS_HAS_DATA_DIR(flags)) {
 		/* Make the ISL file if the IBD file is not
 		in the default location. */
-		space_name = {name.m_name, strlen(name.m_name)};
+		fil_space_t::name_type space_name{name.m_name,
+						  strlen(name.m_name)};
 		*err = RemoteDatafile::create_link_file(space_name, path);
 		if (*err != DB_SUCCESS) {
 			goto err_exit;
 		}
 	}
 
-	DBUG_EXECUTE_IF("checkpoint_after_file_create",
-			log_make_checkpoint(););
-
 	mysql_mutex_lock(&fil_system.mutex);
-	if (fil_space_t* space = fil_space_t::create(uint32_t(space_id),
-						     flags, false,
-						     crypt_data, mode, true)) {
-		fil_node_t* node = space->add(path, file, size, false, true);
-		node->find_metadata(IF_WIN(,true));
-		mysql_mutex_unlock(&fil_system.mutex);
-		mtr.start();
-		mtr.set_named_space(space);
-		ut_a(fsp_header_init(space, size, &mtr) == DB_SUCCESS);
-		mtr.commit();
-		return space;
-	} else {
-		mysql_mutex_unlock(&fil_system.mutex);
+	space->clear_stopped();
+	node->handle = file;
+	node->find_metadata(IF_WIN(,true));
+	if (++fil_system.n_open >= srv_max_n_open_files) {
+		space->reacquire();
+		fil_space_t::try_to_close(space, true);
+		space->release();
 	}
-
-	if (space_name.data()) {
-		RemoteDatafile::delete_link_file(space_name);
-	}
-
-	*err = DB_ERROR;
-	goto err_exit;
+	mysql_mutex_unlock(&fil_system.mutex);
+	goto func_exit;
 }
 
 fil_space_t *fil_ibd_open(ulint id, ulint flags,
@@ -2162,7 +2181,9 @@ func_exit:
 			    || df_remote.is_open() != df_remote.is_valid()) {
 				goto corrupted;
 			}
+#ifndef DBUG_OFF
 error:
+#endif
 			local_err = DB_ERROR;
 			goto func_exit;
 		}
@@ -2186,6 +2207,8 @@ error:
 	ut_a(valid_tablespaces_found == 1);
 
 skip_validate:
+	DBUG_EXECUTE_IF("fil_space_create_failure", goto error;);
+
 	const byte* first_page =
 		df_default.is_open() ? df_default.get_first_page() :
 		df_remote.get_first_page();
@@ -2199,11 +2222,6 @@ skip_validate:
 	space = fil_space_t::create(uint32_t(id), flags,
 				    validate == fil_space_t::VALIDATE_IMPORT,
 				    crypt_data);
-	if (!space) {
-		mysql_mutex_unlock(&fil_system.mutex);
-		goto error;
-	}
-
 	/* We do not measure the size of the file, that is why
 	we pass the 0 below */
 
@@ -2508,11 +2526,6 @@ tablespace_check:
 	space = fil_space_t::create(uint32_t(space_id), flags, false,
 				    crypt_data);
 
-	if (space == NULL) {
-		mysql_mutex_unlock(&fil_system.mutex);
-		return(FIL_LOAD_INVALID);
-	}
-
 	ut_ad(space->id == file.space_id());
 	ut_ad(space->id == space_id);
 
diff --git a/storage/innobase/fsp/fsp0space.cc b/storage/innobase/fsp/fsp0space.cc
index e72ddfef7ed..d52f6a63f03 100644
--- a/storage/innobase/fsp/fsp0space.cc
+++ b/storage/innobase/fsp/fsp0space.cc
@@ -112,6 +112,7 @@ Tablespace::open_or_create(bool is_temp)
 		/* We can close the handle now and open the tablespace
 		the proper way. */
 		it->close();
+		mysql_mutex_lock(&fil_system.mutex);
 
 		if (it == begin()) {
 			/* First data file. */
@@ -130,16 +131,9 @@ Tablespace::open_or_create(bool is_temp)
 				fsp_flags = FSP_FLAGS_PAGE_SSIZE();
 			}
 
-			mysql_mutex_lock(&fil_system.mutex);
 			space = fil_space_t::create(
 				uint32_t(m_space_id), fsp_flags,
 				false, nullptr);
-			if (!space) {
-				mysql_mutex_unlock(&fil_system.mutex);
-				return DB_ERROR;
-			}
-		} else {
-			mysql_mutex_lock(&fil_system.mutex);
 		}
 		space->add(it->m_filepath, OS_FILE_CLOSED, it->m_size,
 			   false, true);
diff --git a/storage/innobase/fsp/fsp0sysspace.cc b/storage/innobase/fsp/fsp0sysspace.cc
index dbc5987b2e5..409811e5439 100644
--- a/storage/innobase/fsp/fsp0sysspace.cc
+++ b/storage/innobase/fsp/fsp0sysspace.cc
@@ -938,10 +938,6 @@ SysTablespace::open_or_create(
 			space = fil_space_t::create(
 				SRV_TMP_SPACE_ID, flags(), false, nullptr);
 			ut_ad(space == fil_system.temp_space);
-			if (!space) {
-				err = DB_ERROR;
-				break;
-			}
 			ut_ad(!space->is_compressed());
 			ut_ad(space->full_crc32());
 		} else {
@@ -949,10 +945,6 @@ SysTablespace::open_or_create(
 			space = fil_space_t::create(
 				TRX_SYS_SPACE, it->flags(), false, nullptr);
 			ut_ad(space == fil_system.sys_space);
-			if (!space) {
-				err = DB_ERROR;
-				break;
-			}
 		}
 
 		uint32_t max_size = (++node_counter == m_files.size()
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index 2260791cbe8..1ffb9d7c86a 100644
--- a/storage/innobase/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
@@ -593,6 +593,24 @@ public:
     n_pending.fetch_and(~NEEDS_FSYNC, std::memory_order_release);
   }
 
+  /** Set the STOPPING flags when creating a file,
+  to block premature fil_crypt_find_space_to_rotate() */
+  inline void set_stopped() noexcept
+  {
+    ut_d(uint32_t n=)
+      n_pending.fetch_add(STOPPING + 1, std::memory_order_relaxed);
+    ut_ad(n == CLOSING);
+  }
+
+  /** Clear the STOPPING flags after creating a file */
+  inline void clear_stopped() noexcept
+  {
+    ut_d(uint32_t n=)
+      n_pending.fetch_sub(STOPPING + CLOSING + 1, std::memory_order_relaxed);
+    ut_ad(n & PENDING);
+    ut_ad((n & ~PENDING) == (STOPPING | CLOSING));
+  }
+
 private:
   /** Clear the CLOSING flag */
   void clear_closing() noexcept
@@ -959,8 +977,7 @@ public:
   @param crypt_data      encryption information
   @param mode            encryption mode
   @param opened          whether the tablespace files are open
-  @return pointer to created tablespace, to be filled in with add()
-  @retval nullptr on failure (such as when the same tablespace exists) */
+  @return pointer to created tablespace, to be filled in with add() */
   static fil_space_t *create(uint32_t id, ulint flags, bool being_imported,
                              fil_space_crypt_t *crypt_data,
                              fil_encryption_t mode= FIL_ENCRYPTION_DEFAULT,

From 759e3523e3d832b174cf0a612704da38b2557b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Fri, 7 Nov 2025 08:09:08 +0200
Subject: [PATCH 013/119] MDEV-38026 Recovery of FILE_CREATE fails to create a
 file

fil_ibd_create(): Add a DEBUG_SYNC point for the test case.

fil_node_open_file_low(): If node->deferred is set, set the
OS_FILE_ON_ERROR_SILENT flag on OS_FILE_OPEN and attempt
OS_FILE_CREATE if needed. If this fails, then InnoDB will
refuse to start up, giving the operator a chance to resolve
the situation, for example by freeing up some space in the
file system.

recv_validate_tablespace(): Invoke deferred_spaces.add() on
any missing tablespace for which we know the LSN of the FILE_CREATE
record. In this way, fil_node_open_file_low() will end up being invoked
on files that are supposed to be created.

fil_name_process(): For FILE_CREATE, remember the create_lsn.

recv_sys_t::parse(): Pass FILE_CREATE to fil_name_process().

Some existing tests have been adjusted for the improved recovery of
file creation.

Reviewed by: Thirunarayanan Balathandayuthapani
Tested by: Saahil Alam
---
 mysql-test/suite/innodb/r/alter_crash.result  | 22 ++++++
 mysql-test/suite/innodb/r/alter_kill.result   |  4 +
 mysql-test/suite/innodb/r/innodb-index.result | 14 +---
 .../suite/innodb/r/log_file_name.result       | 28 +++----
 mysql-test/suite/innodb/t/alter_crash.test    | 14 ++++
 mysql-test/suite/innodb/t/alter_kill.test     | 11 +++
 mysql-test/suite/innodb/t/innodb-index.test   | 21 +----
 mysql-test/suite/innodb/t/log_file_name.test  | 78 ++++++-------------
 storage/innobase/fil/fil0fil.cc               | 17 ++++
 storage/innobase/include/fil0fil.h            |  2 +-
 storage/innobase/log/log0recv.cc              | 25 +++++-
 11 files changed, 134 insertions(+), 102 deletions(-)

diff --git a/mysql-test/suite/innodb/r/alter_crash.result b/mysql-test/suite/innodb/r/alter_crash.result
index 110653101fe..77acd237218 100644
--- a/mysql-test/suite/innodb/r/alter_crash.result
+++ b/mysql-test/suite/innodb/r/alter_crash.result
@@ -220,4 +220,26 @@ SELECT * FROM t1;
 a	b
 1	1
 2	1
+connect ddl, localhost, root;
+SET DEBUG_SYNC = 'fil_ibd_create_logged SIGNAL stuck WAIT_FOR ever';
+ALTER TABLE t1 FORCE;
+connection default;
+SET DEBUG_SYNC = 'now WAIT_FOR stuck';
+# Kill the server
+disconnect ddl;
+# restart
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) NOT NULL,
+  `b` int(11) DEFAULT NULL,
+  PRIMARY KEY (`a`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+SELECT * FROM t1;
+a	b
+1	1
+2	1
 DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/r/alter_kill.result b/mysql-test/suite/innodb/r/alter_kill.result
index 13e64683040..58bf22ebabf 100644
--- a/mysql-test/suite/innodb/r/alter_kill.result
+++ b/mysql-test/suite/innodb/r/alter_kill.result
@@ -36,6 +36,10 @@ BEGIN;
 INSERT INTO t1 VALUES(42);
 connect  con1,localhost,root;
 CREATE TABLE bug16735660 (a INT PRIMARY KEY) ENGINE=InnoDB;
+SET GLOBAL innodb_max_purge_lag_wait=2;
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct=90.0;
 XA START 'x';
 INSERT INTO bug16735660 VALUES(1),(2),(3);
 XA END 'x';
diff --git a/mysql-test/suite/innodb/r/innodb-index.result b/mysql-test/suite/innodb/r/innodb-index.result
index 3ec2845fc34..be665dc29af 100644
--- a/mysql-test/suite/innodb/r/innodb-index.result
+++ b/mysql-test/suite/innodb/r/innodb-index.result
@@ -1920,16 +1920,10 @@ CREATE TABLE t2(f1 INT PRIMARY KEY)ENGINE=InnoDB;
 # Kill the server
 # Wrong space_id in a dirty file and a missing file
 # restart
-SELECT * FROM INFORMATION_SCHEMA.ENGINES
-WHERE engine = 'innodb'
-AND support IN ('YES', 'DEFAULT', 'ENABLED');
-ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
-# Restore t1 and t2
-# restart
-SELECT * FROM t1;
-f1
-SELECT * FROM t2;
-f1
+CHECK TABLE t1, t2;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+test.t2	check	status	OK
 DROP TABLE t1, t2;
 #
 #  MDEV-18186 assertion failure on missing InnoDB index
diff --git a/mysql-test/suite/innodb/r/log_file_name.result b/mysql-test/suite/innodb/r/log_file_name.result
index a7f8cc8c7b2..cc18572cacf 100644
--- a/mysql-test/suite/innodb/r/log_file_name.result
+++ b/mysql-test/suite/innodb/r/log_file_name.result
@@ -19,23 +19,6 @@ WHERE engine = 'innodb'
 AND support IN ('YES', 'DEFAULT', 'ENABLED');
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 FOUND 1 /InnoDB: Ignoring data file '.*t2.ibd' with space ID \d+. Another data file called .*t1.ibd exists with the same space ID/ in mysqld.1.err
-# Fault 2: Wrong space_id in a dirty file, and a missing file.
-# restart
-SELECT * FROM INFORMATION_SCHEMA.ENGINES
-WHERE engine = 'innodb'
-AND support IN ('YES', 'DEFAULT', 'ENABLED');
-ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
-FOUND 1 /InnoDB: Tablespace \d+ was not found at.*t3.ibd/ in mysqld.1.err
-# Fault 3: Wrong space_id in a dirty file, and no missing file.
-# restart
-SELECT * FROM INFORMATION_SCHEMA.ENGINES
-WHERE engine = 'innodb'
-AND support IN ('YES', 'DEFAULT', 'ENABLED');
-ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
-FOUND 1 /InnoDB: Ignoring data file '.*t[23].ibd' with space ID/ in mysqld.1.err
-NOT FOUND /InnoDB: Tablespace \d+ was not found at .*t1.ibd/ in mysqld.1.err
-FOUND 1 /InnoDB: Tablespace \d+ was not found at .*t3.ibd/ in mysqld.1.err
-FOUND 2 /InnoDB: Set innodb_force_recovery=1 to ignore this and to permanently lose all changes to the tablespace/ in mysqld.1.err
 # Fault 4: Missing data file
 # restart
 SELECT * FROM INFORMATION_SCHEMA.ENGINES
@@ -57,6 +40,7 @@ AND support IN ('YES', 'DEFAULT', 'ENABLED');
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 NOT FOUND /\[Note\] InnoDB: Cannot read first page of .*t2.ibd/ in mysqld.1.err
 FOUND 1 /.*\[ERROR\] InnoDB: Cannot apply log to \[page id: space=[1-9][0-9]*, page number=3\] of corrupted file './test/t2\.ibd'/ in mysqld.1.err
+# Fault 2: Wrong space_id in a dirty file, and a missing file.
 # restart
 SELECT * FROM t2;
 a
@@ -78,6 +62,16 @@ CREATE TABLE t0(a INT PRIMARY KEY) ENGINE=InnoDB;
 ERROR HY000: Can't create table `test`.`t0` (errno: 184 "Tablespace already exists")
 CREATE TABLE t0(a INT PRIMARY KEY) ENGINE=InnoDB;
 DROP TABLE t0;
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+ERROR HY000: Can't create table `test`.`t1` (errno: 184 "Tablespace already exists")
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+ERROR HY000: Can't create table `test`.`t1` (errno: 184 "Tablespace already exists")
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+DROP TABLE t1;
+SET GLOBAL innodb_max_purge_lag_wait=0;
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct=90.0;
 CREATE TABLE u1(a INT PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE u2(a INT PRIMARY KEY) ENGINE=InnoDB;
 CREATE TABLE u3(a INT PRIMARY KEY) ENGINE=InnoDB;
diff --git a/mysql-test/suite/innodb/t/alter_crash.test b/mysql-test/suite/innodb/t/alter_crash.test
index f56dcf2c275..1829529450d 100644
--- a/mysql-test/suite/innodb/t/alter_crash.test
+++ b/mysql-test/suite/innodb/t/alter_crash.test
@@ -223,6 +223,20 @@ SET GLOBAL innodb_fil_make_page_dirty_debug=0;
 disconnect ddl;
 --source include/start_mysqld.inc
 
+CHECK TABLE t1;
+SHOW CREATE TABLE t1;
+SELECT * FROM t1;
+
+connect ddl, localhost, root;
+SET DEBUG_SYNC = 'fil_ibd_create_logged SIGNAL stuck WAIT_FOR ever';
+send ALTER TABLE t1 FORCE;
+connection default;
+SET DEBUG_SYNC = 'now WAIT_FOR stuck';
+
+--source include/kill_mysqld.inc
+disconnect ddl;
+--source include/start_mysqld.inc
+
 CHECK TABLE t1;
 SHOW CREATE TABLE t1;
 SELECT * FROM t1;
diff --git a/mysql-test/suite/innodb/t/alter_kill.test b/mysql-test/suite/innodb/t/alter_kill.test
index 01b9776fd2c..f00a054875d 100644
--- a/mysql-test/suite/innodb/t/alter_kill.test
+++ b/mysql-test/suite/innodb/t/alter_kill.test
@@ -140,6 +140,17 @@ INSERT INTO t1 VALUES(42);
 
 CREATE TABLE bug16735660 (a INT PRIMARY KEY) ENGINE=InnoDB;
 
+# Force a log checkpoint to "discard" any FILE_CREATE records.
+SET GLOBAL innodb_max_purge_lag_wait=2;
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct=0.0;
+let $wait_condition =
+SELECT variable_value = 0
+FROM information_schema.global_status
+WHERE variable_name = 'INNODB_BUFFER_POOL_PAGES_DIRTY';
+--source include/wait_condition.inc
+SET GLOBAL innodb_max_dirty_pages_pct=90.0;
+
 XA START 'x';
 --source ../include/no_checkpoint_start.inc
 INSERT INTO bug16735660 VALUES(1),(2),(3);
diff --git a/mysql-test/suite/innodb/t/innodb-index.test b/mysql-test/suite/innodb/t/innodb-index.test
index 7495fc4d17e..226af32b361 100644
--- a/mysql-test/suite/innodb/t/innodb-index.test
+++ b/mysql-test/suite/innodb/t/innodb-index.test
@@ -1136,26 +1136,14 @@ CREATE TABLE t2(f1 INT PRIMARY KEY)ENGINE=InnoDB;
 --let CLEANUP_IF_CHECKPOINT=DROP TABLE t1, t2;
 --source include/no_checkpoint_end.inc
 
-let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
-let $check_no_innodb=SELECT * FROM INFORMATION_SCHEMA.ENGINES
-WHERE engine = 'innodb'
-AND support IN ('YES', 'DEFAULT', 'ENABLED');
-
 --echo # Wrong space_id in a dirty file and a missing file
-
---copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t0.ibd
 --move_file $MYSQLD_DATADIR/test/t2.ibd $MYSQLD_DATADIR/test/t1.ibd
 
 --source include/start_mysqld.inc
---eval $check_no_innodb
---source include/shutdown_mysqld.inc
+# Because the tables were created after the checkpoint,
+# InnoDB will start up, but the tables will be corrupted.
+CHECK TABLE t1, t2;
 
---echo # Restore t1 and t2
-
---move_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t2.ibd
---move_file $MYSQLD_DATADIR/test/t0.ibd $MYSQLD_DATADIR/test/t1.ibd
-
---source include/start_mysqld.inc
 if ($have_debug) {
 # Initiate shutdown in order to issue a redo log checkpoint and to discard
 # the redo log record that was emitted due to '+d,fil_names_write_bogus'.
@@ -1164,9 +1152,6 @@ if ($have_debug) {
 --let $restart_noprint=0
 }
 
-SELECT * FROM t1;
-SELECT * FROM t2;
-
 DROP TABLE t1, t2;
 
 --echo #
diff --git a/mysql-test/suite/innodb/t/log_file_name.test b/mysql-test/suite/innodb/t/log_file_name.test
index 14596562eb8..3105f5ab580 100644
--- a/mysql-test/suite/innodb/t/log_file_name.test
+++ b/mysql-test/suite/innodb/t/log_file_name.test
@@ -45,53 +45,13 @@ AND support IN ('YES', 'DEFAULT', 'ENABLED');
 eval $check_no_innodb;
 let SEARCH_PATTERN= InnoDB: Ignoring data file '.*t2.ibd' with space ID \d+. Another data file called .*t1.ibd exists with the same space ID;
 --source include/search_pattern_in_file.inc
-
 --source include/shutdown_mysqld.inc
 
---remove_file $MYSQLD_DATADIR/test/t1.ibd
-
-# This could fail to refuse InnoDB startup, in case there was a log
-# checkpoint after the CREATE TABLE t3. That is what we checked above.
---echo # Fault 2: Wrong space_id in a dirty file, and a missing file.
---move_file $MYSQLD_DATADIR/test/t3.ibd $MYSQLD_DATADIR/test/t1.ibd
-
---source include/start_mysqld.inc
-eval $check_no_innodb;
-
-let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at.*t3.ibd;
---source include/search_pattern_in_file.inc
-
---source include/shutdown_mysqld.inc
-
---move_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t3.ibd
-
---echo # Fault 3: Wrong space_id in a dirty file, and no missing file.
-# Swap t2.ibd and t3.ibd.
---move_file $MYSQLD_DATADIR/test/t3.ibd $MYSQLD_DATADIR/test/t.ibd
---move_file $MYSQLD_DATADIR/test/t2.ibd $MYSQLD_DATADIR/test/t3.ibd
---move_file $MYSQLD_DATADIR/test/t.ibd $MYSQLD_DATADIR/test/t2.ibd
-
---source include/start_mysqld.inc
-eval $check_no_innodb;
-
-let SEARCH_PATTERN= InnoDB: Ignoring data file '.*t[23].ibd' with space ID;
---source include/search_pattern_in_file.inc
-
-let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at .*t1.ibd;
---source include/search_pattern_in_file.inc
-let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at .*t3.ibd;
---source include/search_pattern_in_file.inc
-let SEARCH_PATTERN= InnoDB: Set innodb_force_recovery=1 to ignore this and to permanently lose all changes to the tablespace;
---source include/search_pattern_in_file.inc
-
---source include/shutdown_mysqld.inc
-
-# Swap back t3.ibd, but hide t2.ibd (which the redo log also knows as t1.ibd).
---move_file $MYSQLD_DATADIR/test/t3.ibd $MYSQLD_DATADIR/test/t.ibd
---move_file $MYSQLD_DATADIR/test/t2.ibd $MYSQLD_DATADIR/test/t3.ibd
-
 --echo # Fault 4: Missing data file
 
+--move_file $MYSQLD_DATADIR/test/t2.ibd $MYSQLD_DATADIR/test/t.ibd
+--remove_file $MYSQLD_DATADIR/test/t1.ibd
+
 --source include/start_mysqld.inc
 eval $check_no_innodb;
 --source include/shutdown_mysqld.inc
@@ -108,15 +68,6 @@ let SEARCH_PATTERN= InnoDB: Tablespace \d+ was not found at .*t[12].ibd.
 eval $check_no_innodb;
 --source include/shutdown_mysqld.inc
 
-# On Linux, lseek() would typically report EINVAL when invoked on a directory.
-# On other plaftorms as well as some GNU/Linux based environments, such as
-# a Ubuntu 22.04 based image on Amazon Web Services,
-# os_file_get_size() would succeed on a directory, and we would get another
-# error about inability to apply log to a corrupted page.
-
-#--let SEARCH_PATTERN= InnoDB: Could not measure the size of single-table tablespace file '.*test/t2\\.ibd'
-#--source include/search_pattern_in_file.inc
-
 --rmdir $MYSQLD_DATADIR/test/t2.ibd
 
 # Create a short file.
@@ -136,6 +87,9 @@ let SEARCH_PATTERN= .*\[ERROR\] InnoDB: Cannot apply log to \\[page id: space=[1
 --remove_file $MYSQLD_DATADIR/test/t2.ibd
 --move_file $MYSQLD_DATADIR/test/t.ibd $MYSQLD_DATADIR/test/t2.ibd
 
+--echo # Fault 2: Wrong space_id in a dirty file, and a missing file.
+--move_file $MYSQLD_DATADIR/test/t3.ibd $MYSQLD_DATADIR/test/t1.ibd
+
 --source include/start_mysqld.inc
 
 SELECT * FROM t2;
@@ -150,13 +104,20 @@ CREATE TABLE t0(a INT PRIMARY KEY) ENGINE=InnoDB;
 --remove_file $MYSQLD_DATADIR/test/t0.ibd
 CREATE TABLE t0(a INT PRIMARY KEY) ENGINE=InnoDB;
 DROP TABLE t0;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+--remove_file $MYSQLD_DATADIR/test/t1.ibd
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+DROP TABLE t1;
 
 --disable_query_log
 # The following are for the orphan file t0.ibd or for the directory t2.ibd:
 call mtr.add_suppression("InnoDB: Operating system error number [0-9]* in a file operation");
 call mtr.add_suppression("InnoDB: Error number [0-9]* means '(File exists|Is a directory|Invalid argument)'");
 call mtr.add_suppression("InnoDB: Cannot create file '.*t0.ibd'");
-call mtr.add_suppression("InnoDB: The file '.*t0\.ibd' already exists");
+call mtr.add_suppression("InnoDB: The file '.*t[01]\.ibd' already exists");
 call mtr.add_suppression("InnoDB: Cannot open datafile for read-write: '.*t2\.ibd'");
 call mtr.add_suppression("InnoDB: Could not measure the size of single-table tablespace file '.*test/t2\\.ibd'");
 # The following are for aborted startup without --innodb-force-recovery:
@@ -187,6 +148,17 @@ call mtr.add_suppression("InnoDB: Cannot read first page in datafile:");
 FLUSH TABLES;
 --enable_query_log
 
+# Force a log checkpoint to "discard" any FILE_CREATE records.
+SET GLOBAL innodb_max_purge_lag_wait=0;
+SET GLOBAL innodb_max_dirty_pages_pct_lwm=0.0;
+SET GLOBAL innodb_max_dirty_pages_pct=0.0;
+let $wait_condition =
+SELECT variable_value = 0
+FROM information_schema.global_status
+WHERE variable_name = 'INNODB_BUFFER_POOL_PAGES_DIRTY';
+--source include/wait_condition.inc
+SET GLOBAL innodb_max_dirty_pages_pct=90.0;
+
 --source include/no_checkpoint_start.inc
 
 CREATE TABLE u1(a INT PRIMARY KEY) ENGINE=InnoDB;
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index ff98cfa9a04..efb728ab7c2 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -357,12 +357,17 @@ static bool fil_node_open_file_low(fil_node_t *node, const byte *page,
     node->handle= os_file_create(innodb_data_file_key, node->name,
                                  node->is_raw_disk
                                  ? OS_FILE_OPEN_RAW | OS_FILE_ON_ERROR_NO_EXIT
+                                 : node->deferred
+                                 ? OS_FILE_OPEN | OS_FILE_ON_ERROR_NO_EXIT
+                                 | OS_FILE_ON_ERROR_SILENT
                                  : OS_FILE_OPEN | OS_FILE_ON_ERROR_NO_EXIT,
                                  type,
                                  srv_read_only_mode, &success);
+    ut_ad(success == node->is_open());
 
     if (success && node->is_open())
     {
+    created:
 #ifndef _WIN32
       if (!node->space->id && !srv_read_only_mode && my_disable_locking &&
           os_file_lock(node->handle, node->name))
@@ -370,6 +375,16 @@ static bool fil_node_open_file_low(fil_node_t *node, const byte *page,
 #endif
       break;
     }
+    else if (node->deferred)
+    {
+      node->handle= os_file_create(innodb_data_file_key, node->name,
+                                   OS_FILE_CREATE | OS_FILE_ON_ERROR_NO_EXIT,
+                                   type,
+                                   srv_read_only_mode, &success);
+      ut_ad(success == node->is_open());
+      if (node->is_open())
+        goto created;
+    }
 
     /* The following call prints an error message */
     if (os_file_get_last_error(true) == EMFILE + 100 &&
@@ -1912,6 +1927,8 @@ fil_ibd_create(
 		log_write_up_to(mtr.commit_lsn(), true);
 	}
 
+	DEBUG_SYNC_C("fil_ibd_create_logged");
+
 	bool success;
 	pfs_os_file_t file = os_file_create(
 		innodb_data_file_key, path,
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index 1ffb9d7c86a..e757231a64e 100644
--- a/storage/innobase/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
@@ -1144,7 +1144,7 @@ struct fil_node_t final
   /** whether the file actually is a raw device or disk partition */
   unsigned is_raw_disk:1;
   /** whether the tablespace discovery is being deferred during crash
-  recovery due to incompletely written page 0 */
+  recovery due to missing file or incompletely written page 0 */
   unsigned deferred:1;
 
   /** size of the file in database pages (0 if not known yet);
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index 41a8f4a4fb2..52a5a0a457c 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -570,6 +570,9 @@ struct file_name_t {
 	/** Status of the tablespace */
 	fil_status	status;
 
+	/** Log sequence number of a FILE_CREATE record, or 0 */
+	lsn_t		create_lsn = 0;
+
 	/** FSP_SIZE of tablespace */
 	uint32_t	size = 0;
 
@@ -1256,7 +1259,8 @@ inline size_t recv_sys_t::files_size()
 @param[in]	name		file name
 @param[in]	len		length of the file name
 @param[in]	space_id	the tablespace ID
-@param[in]	ftype		FILE_MODIFY, FILE_DELETE, or FILE_RENAME
+@param[in]	ftype		FILE_CREATE, FILE_MODIFY, FILE_DELETE,
+				or FILE_RENAME
 @param[in]	lsn		lsn of the redo log
 @param[in]	store		whether the redo log has to be stored */
 static void fil_name_process(const char *name, ulint len, uint32_t space_id,
@@ -1304,6 +1308,7 @@ got_deleted:
 		}
 
 		ut_ad(f.space == NULL);
+		goto reset_create;
 	} else if (p.second // the first FILE_MODIFY or FILE_RENAME
 		   || f.name != fname.name) {
 reload:
@@ -1366,6 +1371,10 @@ rename:
 				break;
 			}
 
+			if (f.create_lsn) {
+				return;
+			}
+
 			if (srv_force_recovery
 			    || srv_operation == SRV_OPERATION_RESTORE) {
 				/* Without innodb_force_recovery,
@@ -1382,7 +1391,7 @@ rename:
 						      fname.name.c_str(),
 						      space_id);
 			}
-			break;
+			return;
 
 		case FIL_LOAD_DEFER:
 			if (d && ftype == FILE_RENAME
@@ -1418,6 +1427,10 @@ rename:
 					  " due to innodb_force_recovery",
 					  int(len), name, space_id);
 		}
+reset_create:
+		f.create_lsn = 0;
+	} else if (ftype == FILE_CREATE && !f.space) {
+		f.create_lsn = lsn;
 	}
 }
 
@@ -2902,8 +2915,9 @@ same_page:
         if (fnend - fn < 4 || memcmp(fnend - 4, DOT_IBD, 4))
           goto file_rec_error;
 
+        /* The old file name of FILE_RENAME is logged as FILE_MODIFY */
         fil_name_process(fn, fnend - fn, space_id,
-                         (b & 0xf0) == FILE_DELETE ? FILE_DELETE : FILE_MODIFY,
+                         fn2 ? FILE_MODIFY : mfile_type_t(b & 0xf0),
                          start_lsn, *store);
 
         if ((b & 0xf0) < FILE_CHECKPOINT && log_file_op)
@@ -4228,6 +4242,11 @@ next:
 		case file_name_t::NORMAL:
 			goto next;
 		case file_name_t::MISSING:
+			if (srv_operation != SRV_OPERATION_NORMAL) {
+			} else if (const lsn_t c = i->second.create_lsn) {
+				deferred_spaces.add(space, i->second.name, c);
+				goto next;
+			}
 			err = recv_init_missing_space(err, i);
 			i->second.status = file_name_t::DELETED;
 			/* fall through */

From e0428264d0095472c015eb58c46be68ca1a320ee Mon Sep 17 00:00:00 2001
From: Timofey Turenko <timofey.turenko@mariadb.com>
Date: Fri, 7 Nov 2025 15:17:37 +0200
Subject: [PATCH 014/119] Add Columnstore MTR to the mariadb-test package

---
 storage/columnstore/CMakeLists.txt | 2 +-
 storage/columnstore/columnstore    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt
index 491955e0e2f..16e9787c115 100644
--- a/storage/columnstore/CMakeLists.txt
+++ b/storage/columnstore/CMakeLists.txt
@@ -78,6 +78,6 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
             SET(CPACK_RPM_columnstore-engine_PACKAGE_SUMMARY "MariaDB ColumnStore storage engine" PARENT_SCOPE)
             SET(CPACK_RPM_columnstore-engine_PACKAGE_DESCRIPTION "The MariaDB ColumnStore storage engine is a high-performance columnar analytical engine, aimed at rapid processing of analytical queries on very large amounts of data." PARENT_SCOPE)
         ENDIF()
-        INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/" "plugin/columnstore")
+        INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/columnstore/mysql-test/" "plugin/columnstore")
     ENDIF()
 ENDIF()
diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore
index e3a2563b588..3024f8af6f5 160000
--- a/storage/columnstore/columnstore
+++ b/storage/columnstore/columnstore
@@ -1 +1 @@
-Subproject commit e3a2563b58898de8117199eddfd7845c5a24886d
+Subproject commit 3024f8af6f54535e7a4dfab6e34a241e1fa6f540

From 7301fbac576b2d8630cdaea029e6a682c25d8412 Mon Sep 17 00:00:00 2001
From: Vlad Lesin <vlad_lesin@mail.ru>
Date: Thu, 30 Oct 2025 17:46:47 +0300
Subject: [PATCH 015/119] MDEV-37755 fil_space_t::drop() doesn't remove space
 from fil_system.named_spaces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

mtr.commit_file() call in fil_space_t::drop() removes space from
fil_system.named_spaces, but then the space can be inserted in the
container again by some another thread while fil_space_t::drop() is
waiting for pending operations finishing.

The fix is to check and remove a space from fil_system.named_spaces
after all pengind operations on the space are finished. Also the ut_d()
macro is removed for space->max_lsn=0 assignments to avoid repeated
space removing from fil_system.named_spaces.

There is error in ilist::pop_back(). ilist::end() returns sentinel,
and the pop_back() removes sentinel from the list instead of the last
element. The error is fixed in this commit.

Reviewed by Marko Mäkelä
---
 include/ilist.h                 |  5 ++++-
 storage/innobase/fil/fil0fil.cc | 30 ++++++++++++++++--------------
 storage/innobase/mtr/mtr0mtr.cc |  2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/include/ilist.h b/include/ilist.h
index dc8be5d5044..76c250f546f 100644
--- a/include/ilist.h
+++ b/include/ilist.h
@@ -185,6 +185,9 @@ public:
     ListNode *prev= pos.node_->prev;
     ListNode *next= pos.node_->next;
 
+    DBUG_ASSERT(prev->next == pos.node_);
+    DBUG_ASSERT(next->prev == pos.node_);
+
     prev->next= next;
     next->prev= prev;
 
@@ -198,7 +201,7 @@ public:
   }
 
   void push_back(reference value) noexcept { insert(end(), value); }
-  void pop_back() noexcept { erase(end()); }
+  void pop_back() noexcept { erase(--end()); }
 
   void push_front(reference value) noexcept { insert(begin(), value); }
   void pop_front() noexcept { erase(begin()); }
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
index efb728ab7c2..cfa1534c37f 100644
--- a/storage/innobase/fil/fil0fil.cc
+++ b/storage/innobase/fil/fil0fil.cc
@@ -861,13 +861,7 @@ static void fil_space_free_low(fil_space_t *space) noexcept
 	/* The tablespace must not be in fil_system.named_spaces. */
 	ut_ad(srv_fast_shutdown == 2 || !srv_was_started
 	      || space->max_lsn == 0);
-
-	/* Wait for fil_space_t::release() after
-	fil_system_t::detach(), the tablespace cannot be found, so
-	fil_space_t::get() would return NULL */
-	while (space->referenced()) {
-		std::this_thread::sleep_for(std::chrono::microseconds(100));
-	}
+	ut_ad(!space->referenced());
 
 	for (fil_node_t* node = UT_LIST_GET_FIRST(space->chain);
 	     node != NULL; ) {
@@ -911,7 +905,7 @@ bool fil_space_free(ulint id, bool x_latched) noexcept
 		mysql_mutex_assert_owner(&log_sys.mutex);
 
 		if (space->max_lsn != 0) {
-			ut_d(space->max_lsn = 0);
+			space->max_lsn = 0;
 			fil_system.named_spaces.remove(*space);
 		}
 
@@ -1604,10 +1598,24 @@ fil_space_t *fil_space_t::drop(ulint id, pfs_os_file_t *detached_handle)
 
   pfs_os_file_t handle= fil_system.detach(space, true);
   mysql_mutex_unlock(&fil_system.mutex);
+  /* The above mtr.commit_file(*space, nullptr) should remove the space from
+  fil_system.named_spaces. Before we set the STOPPING_WRITES flag, another
+  concurrent operation could have marked the tablespace dirty again.
+  This clean-up corresponds to fil_space_free(). */
+  mysql_mutex_lock(&log_sys.mutex);
+  ut_ad((space->pending() & ~NEEDS_FSYNC) == (STOPPING | CLOSING));
+  if (space->max_lsn != 0)
+  {
+    space->max_lsn= 0;
+    fil_system.named_spaces.remove(*space);
+  }
+  mysql_mutex_unlock(&log_sys.mutex);
+
   if (detached_handle)
     *detached_handle = handle;
   else
     os_file_close(handle);
+
   return space;
 }
 
@@ -1630,12 +1638,6 @@ void fil_close_tablespace(ulint id) noexcept
 	while (buf_flush_list_space(space));
 
 	space->x_unlock();
-	mysql_mutex_lock(&log_sys.mutex);
-	if (space->max_lsn != 0) {
-		ut_d(space->max_lsn = 0);
-		fil_system.named_spaces.remove(*space);
-	}
-	mysql_mutex_unlock(&log_sys.mutex);
 	fil_space_free_low(space);
 }
 
diff --git a/storage/innobase/mtr/mtr0mtr.cc b/storage/innobase/mtr/mtr0mtr.cc
index d8f694d80f0..25a66efdef9 100644
--- a/storage/innobase/mtr/mtr0mtr.cc
+++ b/storage/innobase/mtr/mtr0mtr.cc
@@ -375,7 +375,7 @@ bool mtr_t::commit_file(fil_space_t &space, const char *name)
 
   if (!name && space.max_lsn)
   {
-    ut_d(space.max_lsn= 0);
+    space.max_lsn= 0;
     fil_system.named_spaces.remove(space);
   }
 

From 9515cb9029b68f27d2d718de765fe396b0ccee5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Mon, 10 Nov 2025 14:31:28 +0200
Subject: [PATCH 016/119] MDEV-37753 fixup: Relax the test

Occasionally, Microsoft Windows on ARMv8 would fetch 26 pages.
---
 mysql-test/suite/innodb/r/lock_secondary.result | 4 ++--
 mysql-test/suite/innodb/t/lock_secondary.test   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/suite/innodb/r/lock_secondary.result b/mysql-test/suite/innodb/r/lock_secondary.result
index 2acefdbb41c..58c2cf30cf8 100644
--- a/mysql-test/suite/innodb/r/lock_secondary.result
+++ b/mysql-test/suite/innodb/r/lock_secondary.result
@@ -17,8 +17,8 @@ INSERT INTO t VALUES(0,'y'),(1,'x'),(2,'z');
 SELECT variable_value-@reads INTO @diff
 FROM information_schema.global_status
 WHERE variable_name = 'INNODB_BUFFER_POOL_READ_REQUESTS';
-SELECT if(@diff between 22 and 25,'ok',@diff);
-if(@diff between 22 and 25,'ok',@diff)
+SELECT if(@diff between 22 and 26,'ok',@diff);
+if(@diff between 22 and 26,'ok',@diff)
 ok
 disconnect purge_control;
 DROP TABLE t;
diff --git a/mysql-test/suite/innodb/t/lock_secondary.test b/mysql-test/suite/innodb/t/lock_secondary.test
index af1ab7c5302..915e175336b 100644
--- a/mysql-test/suite/innodb/t/lock_secondary.test
+++ b/mysql-test/suite/innodb/t/lock_secondary.test
@@ -27,7 +27,7 @@ WHERE variable_name = 'INNODB_BUFFER_POOL_READ_REQUESTS';
 
 # Typically, this reports 24 pages accessed.
 # If the fix is absent, we would access at least 26 pages.
-SELECT if(@diff between 22 and 25,'ok',@diff);
+SELECT if(@diff between 22 and 26,'ok',@diff);
 disconnect purge_control;
 
 DROP TABLE t;

From 5242ae24212813e09e75ecab2096157f8e1e63d1 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@gmail.com>
Date: Mon, 10 Nov 2025 15:53:37 +0100
Subject: [PATCH 017/119] MDEV-38059 - skip sp-bugs2 test, if compiled without
 perfschema

---
 mysql-test/main/sp-bugs2.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/main/sp-bugs2.test b/mysql-test/main/sp-bugs2.test
index a666e96a00c..61f96bfd768 100644
--- a/mysql-test/main/sp-bugs2.test
+++ b/mysql-test/main/sp-bugs2.test
@@ -1,3 +1,4 @@
+--source include/have_perfschema.inc
 --echo #
 --echo # MDEV-6610 Assertion `thd->is_error() || thd->killed' failed in mysql_execute_command on executing an SP with repeated CREATE TABLE .. SELECT
 --echo #

From 3a13f814b06391cf2b61fd50b587ff8bb0c4f48c Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.com>
Date: Wed, 7 Sep 2022 10:50:40 +0400
Subject: [PATCH 018/119] MDEV-37849 UCA: Change "skip equal simple prefix" to
 "compare simple prefix"

Removing the function my_uca_level_booster_equal_prefix_length().
It was useful only in rare cases, when comparing two equal strings.

Adding a more useful function instead:
  my_uca_level_booster_simple_prefix_cmp()
It optimizes well the case when different strings with a simple
prefix are compared.

"Simple" means that prefixes must have the following data:
- The data can be traversed two bytes at a time, i.e.:
  * Every two bytes are either two ASCII characters or one 2-byte character
  * There are no two-byte characters at an odd octet position
  * There are no ASCII contraction heads at an odd octet position
- Each two bytes producing one or two weights

When either of the two prefixes become non-simple, the comparison
switches to the slower loop.

The timing of this query:
  SELECT BENCHMARK(1000000000,strcmp('aaaaaaaa','aaaaaaab'));
changed from 11.084 seconds to 8.488 seconds on my desktop.
---
 include/m_ctype.h            |   9 ++
 strings/ctype-uca.c          | 200 ++++++++++++++++++++++++++++++++---
 strings/ctype-uca.inl        |  45 ++++----
 unittest/strings/strings-t.c | 158 +++++++++++++++++++++++++++
 4 files changed, 377 insertions(+), 35 deletions(-)

diff --git a/include/m_ctype.h b/include/m_ctype.h
index e0682c57dae..7834e252bdc 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -186,6 +186,15 @@ typedef struct my_uca_level_booster_t
     This array is used for prefix optimization.
   */
   MY_UCA_WEIGHT2 weight_strings_2bytes_to_1_or_2_weights[0x10000];
+
+  /*
+    A helper array to process one-character ASCII strings.
+    Suitable only for stand-alone characters,
+    which are known not to be contraction parts,
+    e.g. the very last character of a string.
+  */
+  uint16 weight_1byte_to_1weight_standalone[0x100];
+
 } MY_UCA_LEVEL_BOOSTER;
 
 
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index fccd8a103af..8d8dfba5677 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -33,6 +33,7 @@
 */
 
 #include "strings_def.h"
+#include "myisampack.h"
 #include <m_ctype.h>
 #include "ctype-uca.h"
 #include "ctype-uca0520.h"
@@ -32016,6 +32017,19 @@ my_uca_scanner_init_any(my_uca_scanner *scanner,
 }
 
 
+/*
+  Test if both scanners have reached the end of their strings,
+  so there is no data left to compare.
+*/
+static inline my_bool
+my_uca_scanner_eof2(const my_uca_scanner *scanner0,
+                    const my_uca_scanner *scanner1)
+{
+  return scanner0->sbeg >= scanner0->send &&
+         scanner1->sbeg >= scanner1->send;
+}
+
+
 static inline int
 my_space_weight(const MY_UCA_WEIGHT_LEVEL *level)
 {
@@ -34220,11 +34234,35 @@ my_uca_level_booster_weight2_populate(MY_UCA_LEVEL_BOOSTER *booster)
 }
 
 
+static void
+my_uca_level_booster_1byte_to_1weight_standalone_populate(
+                                            MY_UCA_LEVEL_BOOSTER *dst,
+                                            const MY_UCA_WEIGHT_LEVEL *src)
+{
+  size_t i;
+  for (i= 0; i <= 0x7F; i++)
+  {
+    const uint16 *w= src->weights[0] + i * src->lengths[0];
+    dst->weight_1byte_to_1weight_standalone[i]= w[1] ? 0 : w[0];
+  }
+  for (i= 0x80; i <= 0xFF; i++)
+  {
+    /*
+      Invalid utf8 one-byte character.
+      Set weight to near-biggest possible uint16 value.
+      This makes a broken string greater than a non-broken string.
+    */
+    dst->weight_1byte_to_1weight_standalone[i]= (uint16) (0xFF00 + i);
+  }
+}
+
+
 static void
 my_uca_level_booster_populate(MY_UCA_LEVEL_BOOSTER *dst,
                               const MY_UCA_WEIGHT_LEVEL *src,
                               CHARSET_INFO *cs)
 {
+  my_uca_level_booster_1byte_to_1weight_standalone_populate(dst, src);
   my_uca_level_booster_2bytes_populate_pairs(dst, src, cs);
   my_uca_level_booster_2bytes_pupulate_ascii2_contractions(dst,
                                                            &src->contractions);
@@ -34261,29 +34299,157 @@ my_uca_level_booster_new(MY_CHARSET_LOADER *loader,
 
 
 /*
-  Skip the simple equal prefix of two string using
-  "One or two bytes produce one or two weights" optimization.
-  Return the prefix length.
+  A helper data type to store a compound value consisting of
+  two UCA 16-bit weights, in the form:
+    weight[0] * 0x10000 + weight[1]
 */
-static size_t
-my_uca_level_booster_equal_prefix_length(const MY_UCA_LEVEL_BOOSTER *booster,
-                                         const uchar *s, size_t slen,
-                                         const uchar *t, size_t tlen)
+typedef uint32 my_compound2_t;
+
+
+/*
+  Helper functions to handle compound weight values.
+
+  Make a compond value from weight[0] and weight[1].
+*/
+static inline my_compound2_t compound2_make(const uint16 *weights)
 {
-  const uchar *s0= s;
-  size_t simple_count= MY_MIN(slen, tlen) >> 1;
-  for ( ; simple_count; s+= 2, t+= 2, simple_count--)
+  return (my_compound2_t) weights[0] * 0x10000 + weights[1];
+}
+
+
+/*
+  Check if weight[0]s are equal in two compound values.
+*/
+static inline int compound2_weight0_equal(my_compound2_t a,
+                                          my_compound2_t b)
+{
+  return ((a ^ b) & 0xFFFF0000) == 0;
+}
+
+
+/*
+  Check if two compound values have incompatible weight[1]s.
+*/
+static inline int compound2_weight1_incompatible(my_compound2_t a,
+                                                 my_compound2_t b)
+{
+  return ((a & 0xFFFF) == 0) != ((b & 0xFFFF) == 0);
+}
+
+
+/*
+  Compare a simple prefix of two string using
+  "One or two bytes produce one or two weights" optimization.
+  Return the comparison result.
+*/
+static int
+my_uca_level_booster_simple_prefix_cmp(my_uca_scanner *sscanner,
+                                       my_uca_scanner *tscanner,
+                                       const MY_UCA_LEVEL_BOOSTER *booster)
+{
+  size_t slen= sscanner->send - sscanner->sbeg;
+  size_t tlen= tscanner->send - tscanner->sbeg;
+  size_t length= MY_MIN(slen, tlen);
+  for ( ; length >= 2; sscanner->sbeg+= 2, tscanner->sbeg+= 2, length-= 2)
   {
+    uint32 cws, cwt;
     const MY_UCA_WEIGHT2 *ws, *wt;
-    ws= my_uca_level_booster_simple_weight2_addr_const(booster, s[0], s[1]);
-    wt= my_uca_level_booster_simple_weight2_addr_const(booster, t[0], t[1]);
-    if (ws->weight[0] &&
-        ws->weight[0] == wt->weight[0] &&
-        ws->weight[1] == wt->weight[1])
+    ws= my_uca_level_booster_simple_weight2_addr_const(booster,
+                                                       sscanner->sbeg[0],
+                                                       sscanner->sbeg[1]);
+    wt= my_uca_level_booster_simple_weight2_addr_const(booster,
+                                                       tscanner->sbeg[0],
+                                                       tscanner->sbeg[1]);
+    /*
+      By implementation, if weight[0] is 0 then weight[1] is also 0.
+    */
+    DBUG_ASSERT(!ws->weight[1] || ws->weight[0]);
+    DBUG_ASSERT(!wt->weight[1] || wt->weight[0]);
+
+    /*
+      If either of the two strings has not produced any weights at this
+      position then return 0, to make the caller switch to the slow loop.
+      Note: XXXX, YYYY, AAAA, BBBB in the below comments mean non-zero
+      unsigned 16-bit hex numbers.
+    */
+
+    if ((cws= compound2_make(ws->weight)) == 0)
+    {
+      /* [0000][0000] */
+      return 0; /*Can't continue: the first string produced no weights*/
+    }
+
+    if (cws == (cwt= compound2_make(wt->weight)))
+    {
+      /*
+        Compound weights are not zero and are equal:
+        - at least weight[0]>0
+        - whether weight[1]>0 is not important here
+        So we have:
+        - [AAAA][0000] vs [AAAA][0000], or
+        - [AAAA][BBBB] vs [AAAA][BBBB]
+      */
       continue;
-    break;
+    }
+
+    if (cwt == 0)
+    {
+      /* [0000][0000] */
+      return 0; /*Can't continue: the second string produced no weights*/
+    }
+
+    /*
+      Handle a special case with incompatible weights:
+      If weight[1] are incompatible:
+      - weight[1] in one string is zero (meaning no second weight), and
+      - weight[1] in the other string is not zero (meaning a real second weight)
+      then we cannot return a comparison result if weight[0]s appear to
+      be equal. Let's return 0 in this case, to make the caller switch to
+      the slow loop.
+    */
+    if (compound2_weight1_incompatible(cws, cwt) &&
+        compound2_weight0_equal(cws, cwt))
+    {
+      /*
+        Can't continue: incompatible weights:
+        - [AAAA][BBBB] vs [XXXX][0000], or
+        - [AAAA][0000] vs [XXXX][YYYY]
+      */
+      return 0;
+    }
+
+    /*
+      Compatible weights:
+      - [AAAA][BBBB] vs [XXXX][YYYY], or
+      - [AAAA][0000] vs [XXXX][0000]
+      Let's return the sign of the difference.
+    */
+    return cws < cwt ? -1 : +1;
   }
-  return s - s0;
+
+  if (length == 1 &&
+      sscanner->send - sscanner->sbeg == 1 &&
+      tscanner->send - tscanner->sbeg == 1) /* One byte left on both sides */
+  {
+    uint16 ws, wt;
+    if ((ws= booster->weight_1byte_to_1weight_standalone[sscanner->sbeg[0]]) &&
+        (wt= booster->weight_1byte_to_1weight_standalone[tscanner->sbeg[0]]))
+    {
+      /*
+        The increments below are important only if the two weights are equal:
+          the caller will check if both scanners reached line ends to
+          decide if it needs to continue with a slower loop.
+        But it's not harmful to increment even of the weights are different:
+          the caller will return on "greater" or "less",
+          so scanner positions are not important any more.
+        Let's always increment, to avoid a conditional jump.
+      */
+      sscanner->sbeg++;
+      tscanner->sbeg++;
+      return (int) ws - (int) wt;
+    }
+  }
+  return 0;
 }
 
 
diff --git a/strings/ctype-uca.inl b/strings/ctype-uca.inl
index c70524c5b54..c05a9f09924 100644
--- a/strings/ctype-uca.inl
+++ b/strings/ctype-uca.inl
@@ -97,18 +97,21 @@ MY_FUNCTION_NAME(strnncoll_onelevel)(CHARSET_INFO *cs,
   int s_res;
   int t_res;
 
+  my_uca_scanner_init_any(&sscanner, s, slen);
+  my_uca_scanner_init_any(&tscanner, t, tlen);
+
 #if MY_UCA_ASCII_OPTIMIZE
 {
-  size_t prefix= my_uca_level_booster_equal_prefix_length(level->booster,
-                                                          s, slen, t, tlen);
-  s+= prefix, slen-= prefix;
-  t+= prefix, tlen-= prefix;
+  int cmp= my_uca_level_booster_simple_prefix_cmp(&sscanner, &tscanner,
+                                                  level->booster);
+  if (cmp)
+    return cmp;
+  if (my_uca_scanner_eof2(&sscanner, &tscanner))
+    return 0;
 }
 #endif
 
   my_uca_scanner_param_init(&param, cs, level);
-  my_uca_scanner_init_any(&sscanner, s, slen);
-  my_uca_scanner_init_any(&tscanner, t, tlen);
   
   do
   {
@@ -216,18 +219,21 @@ MY_FUNCTION_NAME(strnncollsp_onelevel)(CHARSET_INFO *cs,
   my_uca_scanner_param param;
   int s_res, t_res;
 
+  my_uca_scanner_init_any(&sscanner, s, slen);
+  my_uca_scanner_init_any(&tscanner, t, tlen);
+
 #if MY_UCA_ASCII_OPTIMIZE
 {
-  size_t prefix= my_uca_level_booster_equal_prefix_length(level->booster,
-                                                          s, slen, t, tlen);
-  s+= prefix, slen-= prefix;
-  t+= prefix, tlen-= prefix;
+  int cmp= my_uca_level_booster_simple_prefix_cmp(&sscanner, &tscanner,
+                                                  level->booster);
+  if (cmp)
+    return cmp;
+  if (my_uca_scanner_eof2(&sscanner, &tscanner))
+    return 0;
 }
 #endif
 
   my_uca_scanner_param_init(&param, cs, level);
-  my_uca_scanner_init_any(&sscanner, s, slen);
-  my_uca_scanner_init_any(&tscanner, t, tlen);
 
   do
   {
@@ -473,21 +479,24 @@ MY_FUNCTION_NAME(strnncollsp_nchars_onelevel)(CHARSET_INFO *cs,
   size_t s_nchars_left= nchars;
   size_t t_nchars_left= nchars;
 
+  my_uca_scanner_init_any(&sscanner, s, slen);
+  my_uca_scanner_init_any(&tscanner, t, tlen);
+
 /*
 TODO: strnncollsp_nchars_onelevel
 #if MY_UCA_ASCII_OPTIMIZE
 {
-  size_t prefix= my_uca_level_booster_equal_prefix_length(level->booster,
-                                                          s, slen, t, tlen);
-  s+= prefix, slen-= prefix;
-  t+= prefix, tlen-= prefix;
+  int cmp= my_uca_level_booster_simple_prefix_cmp(&sscanner, &tscanner,
+                                                  level->booster);
+  if (cmp)
+    return cmp;
+  if (my_uca_scanner_eof2(&sscanner, &tscanner))
+    return 0;
 }
 #endif
 */
 
   my_uca_scanner_param_init(&param, cs, level);
-  my_uca_scanner_init_any(&sscanner, s, slen);
-  my_uca_scanner_init_any(&tscanner, t, tlen);
 
   for ( ; ; )
   {
diff --git a/unittest/strings/strings-t.c b/unittest/strings/strings-t.c
index eea7c62c530..328b7c6e632 100644
--- a/unittest/strings/strings-t.c
+++ b/unittest/strings/strings-t.c
@@ -450,6 +450,122 @@ static STRNNCOLL_PARAM strcoll_utf8mb4_general_ci[]=
 };
 
 
+
+/********** Tests for neutral UCA collations ***/
+
+/* Shared data for any strength */
+static STRNNCOLL_PARAM strcoll_utf8mb4_uca1400_aX_cX[]=
+{
+  {CSTR("aaaa"), CSTR("aaab"),           -1},
+  {CSTR("aaaa"), CSTR("AAAB"),           -1},
+  {CSTR("aaaa"), CSTR("AALA"),           -1},
+  {CSTR("aaaa"), CSTR("AAAL"),           -1},
+  {CSTR("aaaCh"),CSTR("AAAh"),           -1},
+  {CSTR("aaacH"),CSTR("AAAh"),           -1},
+  {NULL, 0, NULL, 0, 0}
+};
+
+
+static STRNNCOLL_PARAM strcoll_utf8mb4_uca1400_ai_ci[]=
+{
+  {CSTR("aaaa"), CSTR("AAA" UTF8_ARING),  0},
+  {CSTR("aaaa"), CSTR("AAAA"),            0},
+  {CSTR("aala"), CSTR("AALA"),            0},
+  {CSTR("aaal"), CSTR("AAAL"),            0},
+  {NULL, 0, NULL, 0, 0}
+};
+
+
+static STRNNCOLL_PARAM strcoll_utf8mb4_uca1400_as_ci[]=
+{
+  {CSTR("aaaa"), CSTR("AAA" UTF8_ARING), -1},
+  {CSTR("aaaa"), CSTR("AAAA"),            0},
+  {CSTR("aala"), CSTR("AALA"),            0},
+  {CSTR("aaal"), CSTR("AAAL"),            0},
+  {NULL, 0, NULL, 0, 0}
+};
+
+
+static STRNNCOLL_PARAM strcoll_utf8mb4_uca1400_as_cs[]=
+{
+  {CSTR("aaaa"), CSTR("AAA" UTF8_ARING), -1},
+  {CSTR("aaaa"), CSTR("AAAA"),           -1},
+  {CSTR("aala"), CSTR("AALA"),           -1},
+  {CSTR("aaal"), CSTR("AAAL"),           -1},
+  {NULL, 0, NULL, 0, 0}
+};
+
+
+
+/********** Tests for Czech UCA collations ****/
+
+/* Shared data for any strength */
+static STRNNCOLL_PARAM strcoll_utf8mb4_uca1400_czech_aX_cX[]=
+{
+  {CSTR("aaaa"), CSTR("aaab"),           -1},
+  {CSTR("aaaa"), CSTR("AAAB"),           -1},
+  {CSTR("aaaa"), CSTR("AALA"),           -1},
+  {CSTR("aaaa"), CSTR("AAAL"),           -1},
+  {CSTR("aaaCh"),CSTR("AAAH"),            1},
+  {CSTR("aaacH"),CSTR("AAAH"),           -1},
+  {NULL, 0, NULL, 0, 0}
+};
+
+
+/********** Tests for Danish UCA collation ***/
+
+/* Shared data for any strength */
+static STRNNCOLL_PARAM strcoll_utf8mb4_uca1400_danish_aX_cX[]=
+{
+  {CSTR("aaaa"), CSTR("aaab"),            1},
+  {CSTR("aaaa"), CSTR(UTF8_ARING "ab"),   1},
+  {CSTR("aaaa"), CSTR("AAAB"),            1},
+  {CSTR("aaaa"), CSTR("AALA"),            1},
+  {CSTR("aaaa"), CSTR("AAAL"),            1},
+  {CSTR("aaaCh"),CSTR("AAAH"),           -1},
+  {CSTR("aaacH"),CSTR("AAAH"),           -1},
+  {NULL, 0, NULL, 0, 0}
+};
+
+
+static STRNNCOLL_PARAM strcoll_utf8mb4_uca1400_danish_ai_ci[]=
+{
+  {CSTR("aaaa"), CSTR("AAAA"),            0},
+  {CSTR("aaAA"), CSTR("AA" UTF8_ARING),   0},
+  {CSTR("aaaa"), CSTR("AA" UTF8_ARING),   0},
+  {CSTR("aaaA"), CSTR("AA" UTF8_ARING),  -1},
+  {CSTR("aaal"), CSTR("AAAL"),            0},
+  {CSTR("aaal"), CSTR(UTF8_ARING "AL"),   0},
+  {CSTR("Aaal"), CSTR(UTF8_ARING "AL"),   0},
+  {CSTR("AAal"), CSTR(UTF8_ARING "AL"),   0},
+  {CSTR("aAal"), CSTR(UTF8_ARING "AL"),  -1},
+  {NULL, 0, NULL, 0, 0}
+};
+
+
+static STRNNCOLL_PARAM strcoll_utf8mb4_uca1400_danish_as_ci[]=
+{
+  {CSTR("aaaa"), CSTR("AA" UTF8_ARING),   1},
+  {CSTR("aaaa"), CSTR("AAA" UTF8_ARING),  1},
+  {CSTR("aaaa"), CSTR("AAAA"),            0},
+  {CSTR("aala"), CSTR("AALA"),            0},
+  {CSTR("aala"), CSTR(UTF8_ARING "LA"),   1},
+  {CSTR("aaal"), CSTR("AAAL"),            0},
+  {NULL, 0, NULL, 0, 0}
+};
+
+
+static STRNNCOLL_PARAM strcoll_utf8mb4_uca1400_danish_as_cs[]=
+{
+  {CSTR("aaaa"), CSTR("AAAA"),           -1},
+  {CSTR("aaaa"), CSTR("aaAa"),           -1},
+  {CSTR("aaAa"), CSTR("aaAA"),           -1},
+  {CSTR("aala"), CSTR("AALA"),           -1},
+  {CSTR("aaal"), CSTR("AAAL"),           -1},
+  {NULL, 0, NULL, 0, 0}
+};
+
+
 static STRNNCOLL_PARAM strcoll_ucs2_common[]=
 {
   {CSTR("\xC0"),     CSTR("\xC1"),        -1},    /* Incomlete MB2 vs incomplete MB2 */
@@ -680,6 +796,20 @@ strcollsp(CHARSET_INFO *cs, const STRNNCOLL_PARAM *param)
 }
 
 
+static int
+strcollsp_by_name(const char *collation, const STRNNCOLL_PARAM *param)
+{
+  CHARSET_INFO *cs= get_charset_by_name(collation, MYF(0));
+
+  if (!cs)
+  {
+    diag("get_charset_by_name() failed");
+    return 1;
+  }
+  return strcollsp(cs, param);
+}
+
+
 static int
 test_strcollsp()
 {
@@ -779,6 +909,34 @@ test_strcollsp()
   failed+= strcollsp(&my_charset_utf8mb4_general_ci,          strcoll_utf8mb4_common);
   failed+= strcollsp(&my_charset_utf8mb4_general_ci,          strcoll_utf8mb4_general_ci);
   failed+= strcollsp(&my_charset_utf8mb4_bin,                 strcoll_utf8mb4_common);
+
+  failed+= strcollsp_by_name("utf8mb4_uca1400_ai_ci",         strcoll_utf8mb4_uca1400_aX_cX);
+  failed+= strcollsp_by_name("utf8mb4_uca1400_ai_ci",         strcoll_utf8mb4_uca1400_ai_ci);
+
+  failed+= strcollsp_by_name("utf8mb4_uca1400_as_ci",         strcoll_utf8mb4_uca1400_aX_cX);
+  failed+= strcollsp_by_name("utf8mb4_uca1400_as_ci",         strcoll_utf8mb4_uca1400_as_ci);
+
+  failed+= strcollsp_by_name("utf8mb4_uca1400_as_cs",         strcoll_utf8mb4_uca1400_aX_cX);
+  failed+= strcollsp_by_name("utf8mb4_uca1400_as_cs",         strcoll_utf8mb4_uca1400_as_cs);
+
+  failed+= strcollsp_by_name("utf8mb4_uca1400_czech_ai_ci",   strcoll_utf8mb4_uca1400_czech_aX_cX);
+  failed+= strcollsp_by_name("utf8mb4_uca1400_czech_ai_ci",   strcoll_utf8mb4_uca1400_ai_ci);
+
+  failed+= strcollsp_by_name("utf8mb4_uca1400_czech_as_ci",   strcoll_utf8mb4_uca1400_czech_aX_cX);
+  failed+= strcollsp_by_name("utf8mb4_uca1400_czech_as_ci",   strcoll_utf8mb4_uca1400_as_ci);
+
+  failed+= strcollsp_by_name("utf8mb4_uca1400_czech_as_cs",   strcoll_utf8mb4_uca1400_czech_aX_cX);
+  failed+= strcollsp_by_name("utf8mb4_uca1400_czech_as_cs",   strcoll_utf8mb4_uca1400_as_cs);
+
+  failed+= strcollsp_by_name("utf8mb4_uca1400_danish_ai_ci",  strcoll_utf8mb4_uca1400_danish_aX_cX);
+  failed+= strcollsp_by_name("utf8mb4_uca1400_danish_ai_ci",  strcoll_utf8mb4_uca1400_danish_ai_ci);
+
+  failed+= strcollsp_by_name("utf8mb4_uca1400_danish_as_ci",  strcoll_utf8mb4_uca1400_danish_aX_cX);
+  failed+= strcollsp_by_name("utf8mb4_uca1400_danish_as_ci",  strcoll_utf8mb4_uca1400_danish_as_ci);
+
+  failed+= strcollsp_by_name("utf8mb4_uca1400_danish_as_cs",  strcoll_utf8mb4_uca1400_danish_aX_cX);
+  failed+= strcollsp_by_name("utf8mb4_uca1400_danish_as_cs",  strcoll_utf8mb4_uca1400_danish_as_cs);
+
 #endif
   return failed;
 }

From 652582ad8c44d02179393f93c74928873e51ae79 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.com>
Date: Tue, 11 Nov 2025 12:02:09 +0400
Subject: [PATCH 019/119] A cleanup for MDEV-37849 UCA: Change "skip..prefix"
 to "compare simple prefix"

After-review changes suggested by Vlad.
---
 strings/ctype-uca.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index 8d8dfba5677..9e61e3363f0 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -34240,12 +34240,15 @@ my_uca_level_booster_1byte_to_1weight_standalone_populate(
                                             const MY_UCA_WEIGHT_LEVEL *src)
 {
   size_t i;
-  for (i= 0; i <= 0x7F; i++)
+  /* One array element for every possible byte value */
+  compile_time_assert(array_elements(dst->weight_1byte_to_1weight_standalone) ==
+                      256);
+  for (i= 0; i < 0x80; i++)
   {
     const uint16 *w= src->weights[0] + i * src->lengths[0];
     dst->weight_1byte_to_1weight_standalone[i]= w[1] ? 0 : w[0];
   }
-  for (i= 0x80; i <= 0xFF; i++)
+  for (i= 0x80; i < 0x100; i++)
   {
     /*
       Invalid utf8 one-byte character.

From cfaaf93ead41a973ca4b8690ae2312d1295bdb9d Mon Sep 17 00:00:00 2001
From: Thirunarayanan Balathandayuthapani <thiru@mariadb.com>
Date: Tue, 11 Nov 2025 12:50:42 +0530
Subject: [PATCH 020/119] MDEV-37138: Innochecksum fails to handle doublewrite
 buffer and 		multiple file tablespace

Problem:
=======
- innochecksum was incorrectly interpreting doublewrite buffer
pages as index pages, causing confusion about stale tables
in the system tablespace.

- innochecksum fails to parse the multi-file system tablespace

Solution:
========
1. Rewrite checksum of doublewrite buffer pages
are skipped.

2. Introduced the option --tablespace-flags which can be used
to initialize page size. This option can handle the ibdata2,
ibdata3 etc without parsing ibdata1.

This is a cherry-pick of commit 9f8716ab612ee13a4ecd41dfc70fd89c0add81df
---
 extra/innochecksum.cc                         | 214 ++++++++++++------
 .../r/innochecksum_flags_and_skip.result      |  28 +++
 .../innodb/t/innochecksum_flags_and_skip.opt  |   2 +
 .../innodb/t/innochecksum_flags_and_skip.test | 171 ++++++++++++++
 .../suite/innodb_zip/r/innochecksum_2.result  |  17 +-
 .../suite/innodb_zip/r/innochecksum_3.result  |   1 +
 .../suite/innodb_zip/t/innochecksum_2.opt     |   1 +
 .../suite/innodb_zip/t/innochecksum_2.test    |  37 ++-
 storage/innobase/include/fsp0types.h          |   2 +
 storage/innobase/include/trx0sys.h            |   5 +-
 storage/innobase/include/trx0undo.h           |   3 +-
 11 files changed, 400 insertions(+), 81 deletions(-)
 create mode 100644 mysql-test/suite/innodb/r/innochecksum_flags_and_skip.result
 create mode 100644 mysql-test/suite/innodb/t/innochecksum_flags_and_skip.opt
 create mode 100644 mysql-test/suite/innodb/t/innochecksum_flags_and_skip.test

diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc
index 664f1baf64f..8aa4a1c50fc 100644
--- a/extra/innochecksum.cc
+++ b/extra/innochecksum.cc
@@ -48,9 +48,8 @@ The parts not included are excluded by #ifndef UNIV_INNOCHECKSUM. */
 #include "buf0buf.h"             /* buf_page_is_corrupted */
 #include "page0zip.h"            /* page_zip_*() */
 #include "trx0undo.h"            /* TRX_* */
-#include "ut0crc32.h"            /* ut_crc32_init() */
+#include "ut0crc32.h"		 /* ut_crc32_init() */
 #include "fil0crypt.h"           /* fil_space_verify_crypt_checksum */
-
 #include <string.h>
 
 #ifdef UNIV_NONINL
@@ -79,6 +78,8 @@ static ulint extent_size;
 static ulint xdes_size;
 ulong srv_page_size;
 ulong srv_page_size_shift;
+static uint32_t dblwr_1;
+static uint32_t dblwr_2;
 /* Current page number (0 based). */
 uint32_t		cur_page_num;
 /* Current space. */
@@ -102,8 +103,10 @@ FILE*				log_file = NULL;
 /* Enabled for log write option. */
 static bool			is_log_enabled = false;
 static bool			skip_freed_pages;
+static uint32_t 		tablespace_flags= 0;
 static byte field_ref_zero_buf[UNIV_PAGE_SIZE_MAX];
 const byte *field_ref_zero = field_ref_zero_buf;
+constexpr uint32_t USE_FSP_FLAGS{UINT32_MAX};
 
 #ifndef _WIN32
 /* advisory lock for non-window system. */
@@ -258,12 +261,9 @@ void print_leaf_stats(
 }
 
 /** Init the page size for the tablespace.
-@param[in]	buf	buffer used to read the page */
-static void init_page_size(const byte* buf)
+@param[in]	flags	InnoDB tablespace flags */
+static void init_page_size_from_flags(const uint32_t flags)
 {
-	const unsigned	flags = mach_read_from_4(buf + FIL_PAGE_DATA
-						 + FSP_SPACE_FLAGS);
-
 	if (fil_space_t::full_crc32(flags)) {
 		const ulong ssize = FSP_FLAGS_FCRC32_GET_PAGE_SSIZE(flags);
 		srv_page_size_shift = UNIV_ZIP_SIZE_SHIFT_MIN - 1 + ssize;
@@ -550,24 +550,15 @@ is_page_corrupted(
 	return(is_corrupted);
 }
 
-/********************************************//*
- Check if page is doublewrite buffer or not.
- @param [in] page	buffer page
-
- @retval true  if page is doublewrite buffer otherwise false.
-*/
-static
-bool
-is_page_doublewritebuffer(
-	const byte*	page)
+/** Check if page is doublewrite buffer or not.
+@retval true  if page is doublewrite buffer otherwise false. */
+static bool is_page_doublewritebuffer()
 {
-	if ((cur_page_num >= extent_size)
-		&& (cur_page_num < extent_size * 3)) {
-		/* page is doublewrite buffer. */
-		return (true);
-	}
-
-	return (false);
+  if (cur_space != 0) return false;
+  const uint32_t extent{static_cast<uint32_t>(
+    cur_page_num & ~(extent_size - 1))};
+  return cur_page_num > FSP_DICT_HDR_PAGE_NO &&
+	 extent && (extent == dblwr_1 || extent == dblwr_2);
 }
 
 /*******************************************************//*
@@ -774,7 +765,7 @@ Parse the page and collect/dump the information about page type
 @param [in] file	file for diagnosis.
 @param [in] is_encrypted  tablespace is encrypted
 */
-void
+static void
 parse_page(
 	const byte*	page,
 	byte*		xdes,
@@ -794,6 +785,12 @@ parse_page(
 	str = skip_page ? "Double_write_buffer" : "-";
 	page_no = mach_read_from_4(page + FIL_PAGE_OFFSET);
 	if (skip_freed_pages) {
+
+		/** Skip doublewrite pages when -r is enabled */
+		if (is_page_doublewritebuffer()) {
+			return;
+		}
+
 		const byte *des= xdes + XDES_ARR_OFFSET +
 			xdes_size * ((page_no & (physical_page_size - 1))
 				     / extent_size);
@@ -988,6 +985,18 @@ parse_page(
 			fprintf(file, "#::" UINT32PF "\t\t|\t\tTransaction system "
 				"page\t\t|\t%s\n", cur_page_num, str);
 		}
+
+		if (cur_space == 0 &&
+		    (mach_read_from_4(page + TRX_SYS_DOUBLEWRITE +
+			             TRX_SYS_DOUBLEWRITE_MAGIC) ==
+		     TRX_SYS_DOUBLEWRITE_MAGIC_N))  {
+			dblwr_1 = mach_read_from_4(
+					page + TRX_SYS_DOUBLEWRITE +
+					TRX_SYS_DOUBLEWRITE_BLOCK1);
+			dblwr_2 = mach_read_from_4(
+					page + TRX_SYS_DOUBLEWRITE +
+					TRX_SYS_DOUBLEWRITE_BLOCK2);
+		}
 		break;
 
 	case FIL_PAGE_TYPE_FSP_HDR:
@@ -1230,6 +1239,9 @@ static struct my_option innochecksum_options[] = {
   {"skip-freed-pages", 'r', "skip freed pages for the tablespace",
    &skip_freed_pages, &skip_freed_pages, 0, GET_BOOL, NO_ARG,
    0, 0, 0, 0, 0, 0},
+  {"tablespace-flags", 0, "InnoDB tablespace flags (default: 4294967295 "
+   "= read from page 0)", &tablespace_flags, &tablespace_flags, 0,
+   GET_UINT, REQUIRED_ARG, USE_FSP_FLAGS, 0, USE_FSP_FLAGS, 0, 0, 0},
 
   {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
@@ -1304,6 +1316,14 @@ innochecksum_get_one_option(
 		my_end(0);
 		exit(EXIT_SUCCESS);
 		break;
+	default:
+	  if (tablespace_flags != USE_FSP_FLAGS &&
+	      !fil_space_t::is_valid_flags(tablespace_flags, false) &&
+	      !fil_space_t::is_valid_flags(tablespace_flags, true)) {
+		fprintf(stderr, "Error: Provided --tablespace-flags "
+			"is not valid.");
+		return true;
+	  }
 	}
 
 	return(false);
@@ -1434,6 +1454,87 @@ rewrite_checksum(
 		&& !write_file(filename, fil_in, buf, flags, pos);
 }
 
+/** Read and validate page 0, then initialize tablespace flags
+and page size.
+@param	fil_in        File pointer
+@param	buf           Buffer to read page into
+@return whether the page was read successfully */
+static bool read_and_validate_page0(FILE *fil_in, byte *buf)
+{
+  /* Read the minimum page size first */
+  size_t initial_page_size= UNIV_ZIP_SIZE_MIN;
+  if (tablespace_flags != USE_FSP_FLAGS)
+  {
+    init_page_size_from_flags(tablespace_flags);
+    initial_page_size= physical_page_size;
+  }
+
+  /* Read just enough to get the tablespace flags */
+  size_t bytes= fread(buf, 1, initial_page_size, fil_in);
+
+  if (bytes != initial_page_size)
+  {
+    fprintf(stderr, "Error: Was not able to read the "
+            "minimum page size of %zu bytes. Bytes read "
+            "was %zu\n", initial_page_size, bytes);
+    return false;
+  }
+
+  /* Read space_id and page offset */
+  cur_space= mach_read_from_4(buf + FIL_PAGE_SPACE_ID);
+  cur_page_num= mach_read_from_4(buf + FIL_PAGE_OFFSET);
+
+  /* Get tablespace flags from the FSP header */
+  uint32_t flags= mach_read_from_4(buf + FSP_HEADER_OFFSET +
+                                   FSP_SPACE_FLAGS);
+
+  if (tablespace_flags != USE_FSP_FLAGS)
+  {
+    if (cur_page_num == 0 && flags != tablespace_flags)
+      fprintf(stderr, "Error: Mismatch between provided tablespace "
+              "flags (0x%x) and file flags (0x%x)\n",
+              tablespace_flags, flags);
+  }
+  else
+  {
+    if (cur_page_num)
+    {
+      fprintf(stderr, "Error: First page of the tablespace file "
+              "should be 0, but encountered page number %" PRIu32 ". "
+              "If you are checking multi file system "
+              "tablespace files, please specify the correct "
+              "tablespace flags using --tablespace-flags option.\n",
+              cur_page_num);
+      return false;
+    }
+    /* Initialize page size parameters based on flags */
+    init_page_size_from_flags(flags);
+    /* Read the rest of the page if it's larger than the minimum size */
+    if (physical_page_size > UNIV_ZIP_SIZE_MIN)
+    {
+      /* Read rest of the page 0 to determine crypt_data */
+      ulint bytes= read_file(buf, true, physical_page_size, fil_in);
+      if (bytes != physical_page_size)
+      {
+        fprintf(stderr, "Error: Was not able to read the rest of the "
+		"page of " ULINTPF " bytes. Bytes read was " ULINTPF "\n",
+		physical_page_size - UNIV_ZIP_SIZE_MIN, bytes);
+        return false;
+      }
+    }
+    tablespace_flags= flags;
+  }
+
+  if (physical_page_size < UNIV_ZIP_SIZE_MIN ||
+      physical_page_size > UNIV_PAGE_SIZE_MAX)
+  {
+    fprintf(stderr, "Error: Invalid page size " ULINTPF
+            " encountered\n", physical_page_size);
+    return false;
+  }
+  return true;
+}
+
 int main(
 	int	argc,
 	char	**argv)
@@ -1569,51 +1670,13 @@ int main(
 			}
 		}
 
-		/* Read the minimum page size. */
-		bytes = fread(buf, 1, UNIV_ZIP_SIZE_MIN, fil_in);
-		partial_page_read = true;
-
-		if (bytes != UNIV_ZIP_SIZE_MIN) {
-			fprintf(stderr, "Error: Was not able to read the "
-				"minimum page size ");
-			fprintf(stderr, "of %d bytes.  Bytes read was " ULINTPF "\n",
-				UNIV_ZIP_SIZE_MIN, bytes);
-
+		/* Read and validate page 0 */
+		if (!read_and_validate_page0(fil_in, buf)) {
 			exit_status = 1;
 			goto my_exit;
 		}
 
-		/* enable variable is_system_tablespace when space_id of given
-		file is zero. Use to skip the checksum verification and rewrite
-		for doublewrite pages. */
-		cur_space = mach_read_from_4(buf + FIL_PAGE_SPACE_ID);
-		cur_page_num = mach_read_from_4(buf + FIL_PAGE_OFFSET);
-
-		/* Determine page size, zip_size and page compression
-		from fsp_flags and encryption metadata from page 0 */
-		init_page_size(buf);
-
-		ulint flags = mach_read_from_4(FSP_HEADER_OFFSET + FSP_SPACE_FLAGS + buf);
-
-		if (physical_page_size == UNIV_ZIP_SIZE_MIN) {
-			partial_page_read = false;
-		} else {
-			/* Read rest of the page 0 to determine crypt_data */
-			bytes = read_file(buf, partial_page_read, physical_page_size, fil_in);
-			if (bytes != physical_page_size) {
-				fprintf(stderr, "Error: Was not able to read the "
-					"rest of the page ");
-				fprintf(stderr, "of " ULINTPF " bytes.  Bytes read was " ULINTPF "\n",
-					physical_page_size - UNIV_ZIP_SIZE_MIN, bytes);
-
-				exit_status = 1;
-				goto my_exit;
-			}
-			partial_page_read = false;
-		}
-
-
-		/* Now that we have full page 0 in buffer, check encryption */
+		/* Check if tablespace is encrypted */
 		bool is_encrypted = check_encryption(filename, buf);
 
 		/* Verify page 0 contents. Note that we can't allow
@@ -1624,7 +1687,8 @@ int main(
 			allow_mismatches = 0;
 
 			exit_status = verify_checksum(buf, is_encrypted,
-						      &mismatch_count, flags);
+						      &mismatch_count,
+						      tablespace_flags);
 
 			if (exit_status) {
 				fprintf(stderr, "Error: Page 0 checksum mismatch, can't continue. \n");
@@ -1635,7 +1699,8 @@ int main(
 
 		if ((exit_status = rewrite_checksum(
 					filename, fil_in, buf,
-					&pos, is_encrypted, flags))) {
+					&pos, is_encrypted,
+					tablespace_flags))) {
 			goto my_exit;
 		}
 
@@ -1831,7 +1896,7 @@ unexpected_eof:
 first_non_zero:
 			if (is_system_tablespace) {
 				/* enable when page is double write buffer.*/
-				skip_page = is_page_doublewritebuffer(buf);
+				skip_page = is_page_doublewritebuffer();
 			} else {
 				skip_page = false;
 			}
@@ -1852,13 +1917,16 @@ first_non_zero:
 			    && !is_page_free(xdes, physical_page_size, cur_page_num)
 			    && (exit_status = verify_checksum(
 						buf, is_encrypted,
-						&mismatch_count, flags))) {
+						&mismatch_count,
+						tablespace_flags))) {
 				goto my_exit;
 			}
 
-			if ((exit_status = rewrite_checksum(
-						filename, fil_in, buf,
-						&pos, is_encrypted, flags))) {
+			if (!is_page_doublewritebuffer() &&
+			    (exit_status = rewrite_checksum(
+				    filename, fil_in, buf,
+				    &pos, is_encrypted,
+				    tablespace_flags))) {
 				goto my_exit;
 			}
 
diff --git a/mysql-test/suite/innodb/r/innochecksum_flags_and_skip.result b/mysql-test/suite/innodb/r/innochecksum_flags_and_skip.result
new file mode 100644
index 00000000000..183bb58192a
--- /dev/null
+++ b/mysql-test/suite/innodb/r/innochecksum_flags_and_skip.result
@@ -0,0 +1,28 @@
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB STATS_PERSISTENT=0;
+SET GLOBAL innodb_log_checkpoint_now=ON;
+FLUSH TABLE t1 FOR EXPORT;
+UNLOCK TABLES;
+INSERT INTO t1 SET a=1;
+FLUSH TABLE t1 FOR EXPORT;
+UNLOCK TABLES;
+# Skip InnoDB Doublewrite Buffer
+Should not exist when summary excludes dblwr pages
+Should exist when summary includes dblwr pages
+# restart
+CREATE TABLE ibd_1(f1 INT PRIMARY KEY)ENGINE=InnoDB;
+INSERT INTO ibd_1 VALUES(1), (2), (3), (4);
+# Pass wrong tablespace flag for ibdata2
+FOUND 1 /Error: Page 0 checksum mismatch/ in result.log
+# Pass wrong tablespace flag for ibdata1
+FOUND 1 /Error: Mismatch between provided tablespace flags/ in result.log
+# Pass invalid tablespace flag for ibdata1
+FOUND 1 /Error: Provided --tablespace-flags is not valid/ in result.log
+# innochecksum should be succesfull
+NOT FOUND /Fail/ in result.log
+# Create a tablespace with page number > 2^31
+# Test innochecksum with the modified ibdata3
+FOUND 1 /Error: First page of the tablespace file should be 0, but encountered page number 2147483649/ in result.log
+# Test innochecksum with the modified ibdata3 with tablespace flags
+FOUND 1 /Exceeded the maximum allowed checksum mismatch/ in result.log
+# restart
+DROP TABLE t1, ibd_1;
diff --git a/mysql-test/suite/innodb/t/innochecksum_flags_and_skip.opt b/mysql-test/suite/innodb/t/innochecksum_flags_and_skip.opt
new file mode 100644
index 00000000000..5d265d61d14
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innochecksum_flags_and_skip.opt
@@ -0,0 +1,2 @@
+--innodb_data_file_path=ibdata1:3M;ibdata2:1M:autoextend
+--innodb_sys_tablespaces
diff --git a/mysql-test/suite/innodb/t/innochecksum_flags_and_skip.test b/mysql-test/suite/innodb/t/innochecksum_flags_and_skip.test
new file mode 100644
index 00000000000..a8e700e13ac
--- /dev/null
+++ b/mysql-test/suite/innodb/t/innochecksum_flags_and_skip.test
@@ -0,0 +1,171 @@
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+--source include/have_debug.inc
+let MYSQLD_DATADIR= `SELECT @@datadir`;
+CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB STATS_PERSISTENT=0;
+SET GLOBAL innodb_log_checkpoint_now=ON;
+FLUSH TABLE t1 FOR EXPORT;
+UNLOCK TABLES;
+INSERT INTO t1 SET a=1;
+FLUSH TABLE t1 FOR EXPORT;
+UNLOCK TABLES;
+
+let INDEX_ID= `select INDEX_ID FROM INFORMATION_SCHEMA.INNODB_SYS_INDEXES WHERE TABLE_ID = (SELECT TABLE_ID FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME="test/t1")`;
+
+let FLAG= `SELECT flag FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES WHERE NAME="innodb_system"`;
+
+let $shutdown_timeout=0;
+--source include/shutdown_mysqld.inc
+let $resultlog=$MYSQLTEST_VARDIR/tmp/result.log;
+let $resultlog_1=$MYSQLTEST_VARDIR/tmp/result_1.log;
+
+exec $INNOCHECKSUM -S -r $MYSQLD_DATADIR/ibdata1 > $resultlog;
+--echo # Skip InnoDB Doublewrite Buffer
+exec $INNOCHECKSUM -S $MYSQLD_DATADIR/ibdata1 > $resultlog_1;
+
+perl;
+use strict;
+use warnings;
+use File::Spec::Functions qw(catfile);
+
+sub check_index_in_file {
+    my ($filename, $search_id, $file_desc, $expect_found) = @_;
+    my $found = 0;
+    open(my $fh, '<', $filename) or die "Could not open file '$filename': $!\n";
+    my $line_count = 0;
+    while (my $line = <$fh>) {
+        $line_count++;
+        chomp $line;
+        # Skip empty lines and header lines
+        next if $line =~ /^\s*$/;
+        next if $line =~ /index_id.*#pages/;  # Skip header line
+        # Split the line by whitespace
+        my @fields = grep { $_ ne '' } split(/\s+/, $line);
+        next unless @fields;  # Skip if no fields
+        # The first field is the index_id
+        my $current_id = $fields[0];
+        # Check if this is the ID we're looking for
+        if (defined $current_id && $current_id eq $search_id) {
+            $found = 1;
+            last;
+        }
+    }
+    close $fh;
+
+    if ($found != $expect_found) {
+        print "\n=== UNEXPECTED RESULT - SHOWING FILE CONTENTS ($file_desc) ===\n";
+        open($fh, '<', $filename) or die "Cannot reopen file: $!";
+        print while <$fh>;
+        close $fh;
+        print "=== END OF FILE ===\n\n";
+    }
+}
+
+my $search_id = $ENV{'INDEX_ID'};
+
+# Define file paths
+my $resultlog = catfile($ENV{'MYSQLTEST_VARDIR'}, 'tmp', 'result.log');
+my $resultlog_1 = catfile($ENV{'MYSQLTEST_VARDIR'}, 'tmp', 'result_1.log');
+
+# Check both files
+print "Should not exist when summary excludes dblwr pages\n";
+check_index_in_file($resultlog, $search_id, 'result.log', 0);
+
+print "Should exist when summary includes dblwr pages\n";
+check_index_in_file($resultlog_1, $search_id, 'result_1.log', 1);
+EOF
+
+remove_file $resultlog;
+remove_file $resultlog_1;
+
+# We expect deterministic checksum error when we pass
+# incorrect wrong flags to innochecksum. Below restart is needed
+# to make sure that we flush all the pages.
+--source include/start_mysqld.inc
+CREATE TABLE ibd_1(f1 INT PRIMARY KEY)ENGINE=InnoDB;
+INSERT INTO ibd_1 VALUES(1), (2), (3), (4);
+let $shutdown_timeout=;
+--source include/shutdown_mysqld.inc
+--echo # Pass wrong tablespace flag for ibdata2
+--error 1
+exec $INNOCHECKSUM -S --tablespace_flags=39 $MYSQLD_DATADIR/ibdata2 > $resultlog 2>&1;
+
+let SEARCH_FILE=$resultlog;
+let SEARCH_PATTERN=Error: Page 0 checksum mismatch;
+--source include/search_pattern_in_file.inc
+remove_file $resultlog;
+
+--echo # Pass wrong tablespace flag for ibdata1
+--error 1
+exec $INNOCHECKSUM -S --tablespace_flags=39 $MYSQLD_DATADIR/ibdata1 > $resultlog 2>&1;
+
+let SEARCH_PATTERN=Error: Mismatch between provided tablespace flags;
+--source include/search_pattern_in_file.inc
+remove_file $resultlog;
+
+--echo # Pass invalid tablespace flag for ibdata1
+--error 1
+exec $INNOCHECKSUM -S --tablespace_flags=89 $MYSQLD_DATADIR/ibdata1 > $resultlog 2>&1;
+
+let SEARCH_PATTERN=Error: Provided --tablespace-flags is not valid;
+--source include/search_pattern_in_file.inc
+remove_file $resultlog;
+
+--echo # innochecksum should be succesfull
+exec $INNOCHECKSUM -S --tablespace_flags=$FLAG $MYSQLD_DATADIR/ibdata2 > $resultlog 2>&1;
+
+let SEARCH_PATTERN=Fail;
+--source include/search_pattern_in_file.inc
+
+--echo # Create a tablespace with page number > 2^31
+--let $ibdata3 = $MYSQLD_DATADIR/ibdata3
+perl;
+do "$ENV{MTR_SUITE_DIR}/include/crc32.pl";
+my $polynomial = 0x82f63b78; # CRC-32C
+my $ps = 16384; # Default InnoDB page size
+my $page_num = 2147483649; # 2^31 + 1
+my $filename = "$ENV{MYSQLD_DATADIR}/ibdata3";
+
+# Create a zero-filled page
+my $page = "\0" x $ps;
+
+# Set page number (FIL_PAGE_OFFSET)
+substr($page, 4, 4) = pack('NN', $page_num);
+# Set a valid LSN (log sequence number)
+my $lsn = 0x12345678;
+substr($page, 16, 8) = pack('NN', $lsn & 0xFFFFFFFF, $lsn >> 32);
+
+# Calculate the checksum
+my $checksum = pack('N',
+    mycrc32(substr($page, 4, 22), 0, $polynomial) ^
+    mycrc32(substr($page, 38, $ps - 38 - 8), 0, $polynomial)
+);
+# Write the checksum at the beginning (FIL_PAGE_SPACE_OR_CHKSUM)
+# and at the end (FIL_PAGE_END_LSN_OLD_CHKSUM) of the page
+substr($page, 0, 4) = $checksum;
+substr($page, $ps - 8, 4) = $checksum;
+
+# Write the page to file
+open(my $fh, '>', $filename) or die "Could not open file $filename: $!";
+binmode $fh;
+print $fh $page;
+close $fh;
+EOF
+
+--echo # Test innochecksum with the modified ibdata3
+--error 1
+exec $INNOCHECKSUM -S $ibdata3 > $resultlog 2>&1;
+let SEARCH_PATTERN=Error: First page of the tablespace file should be 0, but encountered page number 2147483649;
+--source include/search_pattern_in_file.inc
+remove_file $resultlog;
+
+--echo # Test innochecksum with the modified ibdata3 with tablespace flags
+--error 1
+exec $INNOCHECKSUM -S --tablespace_flags=$FLAG $ibdata3 > $resultlog 2>&1;
+let SEARCH_PATTERN=Exceeded the maximum allowed checksum mismatch;
+--source include/search_pattern_in_file.inc
+
+remove_file $ibdata3;
+--source include/start_mysqld.inc
+DROP TABLE t1, ibd_1;
+remove_file $resultlog;
diff --git a/mysql-test/suite/innodb_zip/r/innochecksum_2.result b/mysql-test/suite/innodb_zip/r/innochecksum_2.result
index e7e36e5188e..0477abda548 100644
--- a/mysql-test/suite/innodb_zip/r/innochecksum_2.result
+++ b/mysql-test/suite/innodb_zip/r/innochecksum_2.result
@@ -14,6 +14,12 @@ INSERT INTO t1 SELECT * from t1;
 INSERT INTO t1 SELECT * from t1;
 INSERT INTO t1 SELECT * from t1;
 INSERT INTO t1 SELECT * from t1;
+CREATE TABLE t2 (j LONGBLOB) ENGINE = InnoDB
+ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2;
+CREATE TABLE t3 (j LONGBLOB) ENGINE = InnoDB
+ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
+CREATE TABLE t4(c1 INT PRIMARY KEY,c2 VARCHAR(20),
+INDEX(c2(10))) ENGINE=InnoDB;
 # stop the server
 
 Variables (--variable-name=value)
@@ -35,6 +41,7 @@ log                               (No default value)
 leaf                              FALSE
 merge                             0
 skip-freed-pages                  FALSE
+tablespace-flags                  4294967295
 [1]:# check the both short and long options for "help"
 [2]:# Run the innochecksum when file isn't provided.
 # It will print the innochecksum usage similar to --help option.
@@ -69,6 +76,9 @@ See https://mariadb.com/kb/en/library/innochecksum/ for usage hints.
                       pages
   -r, --skip-freed-pages 
                       skip freed pages for the tablespace
+  --tablespace-flags=# 
+                      InnoDB tablespace flags (default: 4294967295 = read from
+                      page 0)
 
 Variables (--variable-name=value)
 and boolean options {FALSE|TRUE}  Value (after reading options)
@@ -88,9 +98,12 @@ log                               (No default value)
 leaf                              FALSE
 merge                             0
 skip-freed-pages                  FALSE
+tablespace-flags                  4294967295
 [3]:# check the both short and long options for "count" and exit
 Number of pages:#
 Number of pages:#
 [4]:# Print the version of innochecksum and exit
-innochecksum Ver #.#.## Restart the DB server
-DROP TABLE t1;
+innochecksum Ver #.#.#
+[5]:# check t1.ibd and t2.ibd summary with and without tablespace_flags
+# Restart the DB server
+DROP TABLE t4, t3, t2, t1;
diff --git a/mysql-test/suite/innodb_zip/r/innochecksum_3.result b/mysql-test/suite/innodb_zip/r/innochecksum_3.result
index 0e5e4d2d7f7..af37f4d5df5 100644
--- a/mysql-test/suite/innodb_zip/r/innochecksum_3.result
+++ b/mysql-test/suite/innodb_zip/r/innochecksum_3.result
@@ -140,6 +140,7 @@ log                               (No default value)
 leaf                              FALSE
 merge                             0
 skip-freed-pages                  FALSE
+tablespace-flags                  4294967295
 [5]: Page type dump for with shortform for tab1.ibd
 
 
diff --git a/mysql-test/suite/innodb_zip/t/innochecksum_2.opt b/mysql-test/suite/innodb_zip/t/innochecksum_2.opt
index ac26eca328c..af67edaab10 100644
--- a/mysql-test/suite/innodb_zip/t/innochecksum_2.opt
+++ b/mysql-test/suite/innodb_zip/t/innochecksum_2.opt
@@ -1 +1,2 @@
 --skip-innodb-doublewrite
+--innodb_sys_tablespaces
diff --git a/mysql-test/suite/innodb_zip/t/innochecksum_2.test b/mysql-test/suite/innodb_zip/t/innochecksum_2.test
index 57926d921f4..7d862a9a1e0 100644
--- a/mysql-test/suite/innodb_zip/t/innochecksum_2.test
+++ b/mysql-test/suite/innodb_zip/t/innochecksum_2.test
@@ -25,6 +25,23 @@ while ($i > 0) {
   dec $i;
 }
 
+CREATE TABLE t2 (j LONGBLOB) ENGINE = InnoDB
+ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2;
+
+CREATE TABLE t3 (j LONGBLOB) ENGINE = InnoDB
+ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
+
+CREATE TABLE t4(c1 INT PRIMARY KEY,c2 VARCHAR(20),
+		INDEX(c2(10))) ENGINE=InnoDB;
+
+let FLAG= `SELECT flag FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES WHERE NAME="test/t1"`;
+
+let FLAG2= `SELECT flag FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES WHERE NAME="test/t2"`;
+
+let FLAG3= `SELECT flag FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES WHERE NAME="test/t3"`;
+
+let FLAG4= `SELECT flag FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES WHERE NAME="test/t4"`;
+
 --echo # stop the server
 --source include/shutdown_mysqld.inc
 
@@ -80,10 +97,24 @@ EOF
 --exec $INNOCHECKSUM -c $MYSQLD_DATADIR/test/t1.ibd
 
 --echo [4]:# Print the version of innochecksum and exit
---replace_regex /.*innochecksum.*Ver.*[0-9]*.[0-9]*.[0-9]*.*/innochecksum Ver #.#.#/
---exec $INNOCHECKSUM -V $MYSQLD_DATADIR/test/t1.ibd
+--replace_regex /.*innochecksum.*Ver [0-9]*\.[0-9]*\.[0-9]*, for .*\)/innochecksum Ver #.#.#/
+--exec $INNOCHECKSUM -V
 
+--echo [5]:# check t1.ibd and t2.ibd summary with and without tablespace_flags
+let $resultlog=$MYSQLTEST_VARDIR/tmp/result.log;
+--exec $INNOCHECKSUM -S $MYSQLD_DATADIR/test/t1.ibd -s 3 -e 5 > $resultlog
+--exec $INNOCHECKSUM -S $MYSQLD_DATADIR/test/t2.ibd -s 3 -e 5 > $resultlog
+--exec $INNOCHECKSUM -S $MYSQLD_DATADIR/test/t3.ibd -s 3 -e 5 > $resultlog
+--exec $INNOCHECKSUM -S $MYSQLD_DATADIR/test/t4.ibd -s 3 -e 5 > $resultlog
+
+
+--exec $INNOCHECKSUM -S $MYSQLD_DATADIR/test/t1.ibd --tablespace_flags=$FLAG -s 3 -e 5 > $resultlog
+--exec $INNOCHECKSUM -S $MYSQLD_DATADIR/test/t2.ibd --tablespace_flags=$FLAG2 -s 3 -e 5 > $resultlog
+--exec $INNOCHECKSUM -S $MYSQLD_DATADIR/test/t3.ibd --tablespace_flags=$FLAG3 -s 3 -e 5 > $resultlog
+--exec $INNOCHECKSUM -S $MYSQLD_DATADIR/test/t4.ibd --tablespace_flags=$FLAG4 -s 3 -e 5 > $resultlog
+
+remove_file $resultlog;
 --echo # Restart the DB server
 --source include/start_mysqld.inc
 
-DROP TABLE t1;
+DROP TABLE t4, t3, t2, t1;
diff --git a/storage/innobase/include/fsp0types.h b/storage/innobase/include/fsp0types.h
index 1912c31b744..7715a541a63 100644
--- a/storage/innobase/include/fsp0types.h
+++ b/storage/innobase/include/fsp0types.h
@@ -150,6 +150,7 @@ enum fsp_reserve_t {
 	FSP_CLEANING,	/* reservation done during purge operations */
 	FSP_BLOB	/* reservation being done for BLOB insertion */
 };
+#endif /* UNIV_INNOCHECKSUM */
 
 /* Number of pages described in a single descriptor page: currently each page
 description takes less than 1 byte; a descriptor page is repeated every
@@ -190,6 +191,7 @@ every XDES_DESCRIBED_PER_PAGE pages in every tablespace. */
 /*--------------------------------------*/
 /* @} */
 
+#ifndef UNIV_INNOCHECKSUM
 /** Check if tablespace is system temporary.
 @param[in]      space_id        verify is checksum is enabled for given space.
 @return true if tablespace is system temporary. */
diff --git a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h
index 8a72199284d..c2dbcc604d1 100644
--- a/storage/innobase/include/trx0sys.h
+++ b/storage/innobase/include/trx0sys.h
@@ -24,6 +24,7 @@ Transaction system
 Created 3/26/1996 Heikki Tuuri
 *******************************************************/
 
+#ifndef UNIV_INNOCHECKSUM
 #pragma once
 #include "buf0buf.h"
 #include "fil0fil.h"
@@ -272,6 +273,7 @@ FIXED WSREP XID info offsets for 4k page size 10.0.32-galera
 #define TRX_SYS_WSREP_XID_BQUAL_LEN 12
 #define TRX_SYS_WSREP_XID_DATA      16
 #endif /* WITH_WSREP*/
+#endif /* !UNIV_INNOCHECKSUM */
 
 /** Doublewrite buffer */
 /* @{ */
@@ -320,7 +322,7 @@ constexpr uint32_t TRX_SYS_DOUBLEWRITE_MAGIC_N= 536853855;
 /** Contents of TRX_SYS_DOUBLEWRITE_SPACE_ID_STORED */
 constexpr uint32_t TRX_SYS_DOUBLEWRITE_SPACE_ID_STORED_N= 1783657386;
 /* @} */
-
+#ifndef UNIV_INNOCHECKSUM
 trx_t* current_trx();
 
 struct rw_trx_hash_element_t
@@ -1286,3 +1288,4 @@ private:
 
 /** The transaction system */
 extern trx_sys_t trx_sys;
+#endif /* !UNIV_INNOCHECKSUM */
diff --git a/storage/innobase/include/trx0undo.h b/storage/innobase/include/trx0undo.h
index 7c6081d415d..2ee2e8ac8a5 100644
--- a/storage/innobase/include/trx0undo.h
+++ b/storage/innobase/include/trx0undo.h
@@ -27,9 +27,8 @@ Created 3/26/1996 Heikki Tuuri
 #ifndef trx0undo_h
 #define trx0undo_h
 
-#ifndef UNIV_INNOCHECKSUM
 #include "trx0sys.h"
-
+#ifndef UNIV_INNOCHECKSUM
 /** The LSB of the "is insert" flag in DB_ROLL_PTR */
 #define ROLL_PTR_INSERT_FLAG_POS 55
 /** The LSB of the 7-bit trx_rseg_t::id in DB_ROLL_PTR */

From fb49d8aa421136af8a3a5bb36b13292086241f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@galeracluster.com>
Date: Wed, 3 Apr 2024 12:26:50 +0300
Subject: [PATCH 021/119] MDEV-30732 : wsrep_store_key_val_for_row() may invoke
 memcpy() on nullptr

Problem was that row_mysql_read_blob_ref can return NULL
in case when blob datatype is used in a key and its real
value is NULL. This NULL pointer is then used in memcpy
function in wsrep_store_key_val_for_row. However,
memcpy is defined so that argument 2 must not be NULL.

Fixed by adding conditions before memcpy functions so
that argument 2 is always non NULL.

Additional fixes after review
- Removed unnecessary copying key data from one buffer to another.
Use original key data buffer as input and temporary buffer as output.
Extra output buffer is needed because strnxfrm might expand input buffer
contents.
- Removed unnecessary initialization of variables and move
declaration where first time needed.
- Removed unnecessary intitialization of temporary buffer because
we already keep track actual filled length.
- Remove unneccessary extra call to charset->strnxfrm
---
 mysql-test/suite/galera/r/MDEV-30732.result | 627 ++++++++++++++++++++
 mysql-test/suite/galera/t/MDEV-30732.test   | 371 ++++++++++++
 storage/innobase/handler/ha_innodb.cc       | 212 +++----
 storage/innobase/include/ha_prototypes.h    |   9 +-
 storage/innobase/rem/rem0rec.cc             |  14 +-
 5 files changed, 1107 insertions(+), 126 deletions(-)
 create mode 100644 mysql-test/suite/galera/r/MDEV-30732.result
 create mode 100644 mysql-test/suite/galera/t/MDEV-30732.test

diff --git a/mysql-test/suite/galera/r/MDEV-30732.result b/mysql-test/suite/galera/r/MDEV-30732.result
new file mode 100644
index 00000000000..e2ca79d3fda
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-30732.result
@@ -0,0 +1,627 @@
+connection node_2;
+connection node_1;
+SET GLOBAL sql_mode=0;
+SET sql_mode=DEFAULT;
+CREATE TABLE t (c INT,c2 BLOB NOT NULL,KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+SELECT * from t;
+c	c2
+1	
+1	
+1	
+1	
+1	
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 BLOB NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 BLOB NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 VARCHAR(270) NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 VARCHAR(270) NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 CHAR(80) NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+SELECT * from t;
+c	c2
+1	
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 CHAR(80) NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+SELECT * from t;
+c	c2
+1	
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 TEXT NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 TEXT NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 BLOB NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 BLOB NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 VARCHAR(270) NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 VARCHAR(270) NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 CHAR(80) NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+SELECT * from t;
+c	c2
+1	
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 CHAR(80) NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+SELECT * from t;
+c	c2
+1	
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 TEXT NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 TEXT NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+SET GLOBAL sql_mode=0;
+SET sql_mode=DEFAULT;
+CREATE TABLE t (c INT,c2 BLOB,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 BLOB NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 BLOB,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+2	NULL
+3	NULL
+4	NULL
+5	NULL
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 BLOB NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 VARCHAR(270),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 VARCHAR(270) NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 VARCHAR(270),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+2	NULL
+3	NULL
+4	NULL
+5	NULL
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 VARCHAR(270) NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 CHAR(80),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 CHAR(80) NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 CHAR(80),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+2	NULL
+3	NULL
+4	NULL
+5	NULL
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 CHAR(80) NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 TEXT,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 TEXT NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 TEXT,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+2	NULL
+3	NULL
+4	NULL
+5	NULL
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 TEXT NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+Warnings:
+Warning	1364	Field 'c2' doesn't have a default value
+UPDATE t SET c2=NULL WHERE c = 1;
+Warnings:
+Warning	1048	Column 'c2' cannot be null
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+2	
+3	
+4	
+5	
+DROP TABLE t;
+SET GLOBAL sql_mode=DEFAULT;
+CREATE TABLE t (c INT,c2 BLOB,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 VARCHAR(270),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 CHAR(80),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 TEXT,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 BLOB,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+2	NULL
+3	NULL
+4	NULL
+5	NULL
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 VARCHAR(270),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+2	NULL
+3	NULL
+4	NULL
+5	NULL
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 CHAR(80),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+2	NULL
+3	NULL
+4	NULL
+5	NULL
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 TEXT,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+c	c2
+2	NULL
+3	NULL
+4	NULL
+5	NULL
+DROP TABLE t;
diff --git a/mysql-test/suite/galera/t/MDEV-30732.test b/mysql-test/suite/galera/t/MDEV-30732.test
new file mode 100644
index 00000000000..68525cb02dc
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-30732.test
@@ -0,0 +1,371 @@
+--source include/galera_cluster.inc
+
+#
+# MDEV-30732 : wsrep_store_key_val_for_row() may invoke memcpy() on nullptr
+# original test case
+#
+SET GLOBAL sql_mode=0;
+SET sql_mode=DEFAULT;
+CREATE TABLE t (c INT,c2 BLOB NOT NULL,KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+SELECT * from t;
+DROP TABLE t;
+#
+# Additional test cases
+#
+CREATE TABLE t (c INT,c2 BLOB NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 BLOB NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 VARCHAR(270) NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 VARCHAR(270) NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 CHAR(80) NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 CHAR(80) NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 TEXT NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 TEXT NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+DROP TABLE t;
+
+CREATE TABLE t (c INT PRIMARY KEY,c2 BLOB NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 BLOB NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 VARCHAR(270) NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 VARCHAR(270) NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 CHAR(80) NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 CHAR(80) NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 TEXT NOT NULL,UNIQUE KEY k2 (c2 (1),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+DROP TABLE t;
+CREATE TABLE t (c INT PRIMARY KEY,c2 TEXT NOT NULL,KEY k2 (c, c2 (1))) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * from t;
+DROP TABLE t;
+
+SET GLOBAL sql_mode=0;
+SET sql_mode=DEFAULT;
+CREATE TABLE t (c INT,c2 BLOB,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 BLOB NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 BLOB,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 BLOB NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 VARCHAR(270),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 VARCHAR(270) NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 VARCHAR(270),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 VARCHAR(270) NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 CHAR(80),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 CHAR(80) NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 CHAR(80),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 CHAR(80) NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="" WHERE c=1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 TEXT,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 TEXT NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 TEXT,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 TEXT NOT NULL,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+
+SET GLOBAL sql_mode=DEFAULT;
+
+CREATE TABLE t (c INT,c2 BLOB,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 VARCHAR(270),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 CHAR(80),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT,c2 TEXT,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(1),(1),(1),(1);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 BLOB,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 VARCHAR(270),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 CHAR(80),KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
+CREATE TABLE t (c INT NOT NULL PRIMARY KEY,c2 TEXT,KEY k2 (c2 (6),c)) DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT;
+INSERT INTO t (c) VALUES (1),(2),(3),(4),(5);
+UPDATE t SET c2=NULL WHERE c = 1;
+UPDATE t SET c2="TESTtest" WHERE c = 1;
+UPDATE t SET c2="BUGbug" WHERE c2 = "TESTtest";
+DELETE FROM t WHERE c2="BUGbug";
+SELECT * FROM t;
+DROP TABLE t;
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index ada50c1b409..00ac0223a3c 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -6220,25 +6220,22 @@ ha_innobase::close()
 /* The following accessor functions should really be inside MySQL code! */
 
 #ifdef WITH_WSREP
-ulint
-wsrep_innobase_mysql_sort(
-					/* out: str contains sort string */
+size_t
+wsrep_normalize_string(
 	int		mysql_type,	/* in: MySQL type */
 	uint		charset_number,	/* in: number of the charset */
-	unsigned char*	str,		/* in: data field */
-	ulint		str_length,	/* in: data field length,
+	const unsigned char* str,	/* in: input data field */
+	unsigned char*  out_str,        /* out: normalized string */
+	size_t		str_length,	/* in: data field length,
 					not UNIV_SQL_NULL */
-	ulint		buf_length)	/* in: total str buffer length */
+	size_t		buf_length)	/* in: total str buffer length */
 
 {
-	CHARSET_INFO*		charset;
-	enum_field_types	mysql_tp;
-	ulint			ret_length =	str_length;
+	size_t ret_length= str_length;
+	const enum_field_types mysql_tp= (enum_field_types)mysql_type;
 
 	DBUG_ASSERT(str_length != UNIV_SQL_NULL);
 
-	mysql_tp = (enum_field_types) mysql_type;
-
 	switch (mysql_tp) {
 
 	case MYSQL_TYPE_BIT:
@@ -6250,8 +6247,7 @@ wsrep_innobase_mysql_sort(
 	case MYSQL_TYPE_LONG_BLOB:
 	case MYSQL_TYPE_VARCHAR:
 	{
-		uchar tmp_str[REC_VERSION_56_MAX_INDEX_COL_LEN] = {'\0'};
-		ulint tmp_length = REC_VERSION_56_MAX_INDEX_COL_LEN;
+		CHARSET_INFO* charset;
 
 		/* Use the charset number to pick the right charset struct for
 		the comparison. Since the MySQL function get_charset may be
@@ -6266,36 +6262,26 @@ wsrep_innobase_mysql_sort(
 			charset = get_charset(charset_number, MYF(MY_WME));
 
 			if (charset == NULL) {
-			  sql_print_error("InnoDB needs charset %lu for doing "
-					  "a comparison, but MariaDB cannot "
-					  "find that charset.",
-					  (ulong) charset_number);
+				sql_print_error("InnoDB needs charset %lu for doing "
+						"a comparison, but MariaDB cannot "
+						"find that charset.",
+						(ulong) charset_number);
 				ut_a(0);
 			}
 		}
 
-		ut_a(str_length <= tmp_length);
-		memcpy(tmp_str, str, str_length);
-
-		tmp_length = charset->strnxfrm(str, str_length,
-					       uint(str_length), tmp_str,
-					       tmp_length, 0);
-		DBUG_ASSERT(tmp_length <= str_length);
 		if (wsrep_protocol_version < 3) {
-			tmp_length = charset->strnxfrm(
-				str, str_length,
-				uint(str_length), tmp_str, tmp_length, 0);
-			DBUG_ASSERT(tmp_length <= str_length);
+			ret_length = charset->strnxfrm(
+				out_str, str_length,
+				uint(str_length), str, buf_length, 0);
 		} else {
 			/* strnxfrm will expand the destination string,
-			   protocols < 3 truncated the sorted sring
-			   protocols >= 3 gets full sorted sring
+			   protocols < 3 truncated the normalized string
+			   protocols >= 3 gets full normalized string
 			*/
-			tmp_length = charset->strnxfrm(
-				str, buf_length,
-				uint(str_length), tmp_str, str_length, 0);
-			DBUG_ASSERT(tmp_length <= buf_length);
-			ret_length = tmp_length;
+			ret_length = charset->strnxfrm(
+				out_str, buf_length,
+				uint(str_length), str, str_length, 0);
 		}
 
 		break;
@@ -6665,8 +6651,6 @@ wsrep_store_key_val_for_row(
 	KEY_PART_INFO*	key_part	= key_info->key_part;
 	KEY_PART_INFO*	end		= key_part + key_info->user_defined_key_parts;
 	char*		buff_start	= buff;
-	enum_field_types mysql_type;
-	Field*		field;
 	ulint buff_space = buff_len;
 
 	DBUG_ENTER("wsrep_store_key_val_for_row");
@@ -6675,8 +6659,8 @@ wsrep_store_key_val_for_row(
 	*key_is_null = true;
 
 	for (; key_part != end; key_part++) {
-		uchar sorted[REC_VERSION_56_MAX_INDEX_COL_LEN] = {'\0'};
-		bool part_is_null = false;
+		uchar normalized[REC_VERSION_56_MAX_INDEX_COL_LEN+1];
+		bool part_is_null= false;
 
 		if (key_part->null_bit) {
 			if (buff_space > 0) {
@@ -6696,23 +6680,15 @@ wsrep_store_key_val_for_row(
 		}
 		if (!part_is_null)  *key_is_null = false;
 
-		field = key_part->field;
-		mysql_type = field->type();
+		const Field* field= key_part->field;
+		const enum_field_types mysql_type= field->type();
 
 		if (mysql_type == MYSQL_TYPE_VARCHAR) {
 						/* >= 5.0.3 true VARCHAR */
-			ulint		lenlen;
-			ulint		len;
-			const byte*	data;
-			ulint		key_len;
-			ulint		true_len;
-			const CHARSET_INFO* cs;
-			int		error=0;
-
-			key_len = key_part->length;
+			const size_t key_len= key_part->length;
 
 			if (part_is_null) {
-				true_len = key_len + 2;
+				size_t true_len= key_len + 2;
 				if (true_len > buff_space) {
 					fprintf (stderr,
 						 "WSREP: key truncated: %s\n",
@@ -6723,27 +6699,28 @@ wsrep_store_key_val_for_row(
 				buff_space -= true_len;
 				continue;
 			}
-			cs = field->charset();
+			const CHARSET_INFO* cs = field->charset();
 
-			lenlen = (ulint)
+			ulint lenlen = (ulint)
 				(((Field_varstring*)field)->length_bytes);
 
-			data = row_mysql_read_true_varchar(&len,
+			size_t len;
+			const byte* data = row_mysql_read_true_varchar(&len,
 				(byte*) (record
 				+ (ulint)get_field_offset(table, field)),
 				lenlen);
 
-			true_len = len;
+			size_t true_len= len;
 
 			/* For multi byte character sets we need to calculate
 			the true length of the key */
 
 			if (len > 0 && cs->mbmaxlen > 1) {
-				true_len = (ulint) my_well_formed_length(cs,
+				int error;
+				true_len= my_well_formed_length(cs,
 						(const char *) data,
 						(const char *) data + len,
-						(uint) (key_len /
-						cs->mbmaxlen),
+						(key_len / cs->mbmaxlen),
 						&error);
 			}
 
@@ -6752,16 +6729,21 @@ wsrep_store_key_val_for_row(
 			if (true_len > key_len) {
 				true_len = key_len;
 			}
-			/* cannot exceed max column lenght either, we may need to truncate
+			/* cannot exceed max column length either, we may need to truncate
 			the stored value: */
-			if (true_len > sizeof(sorted)) {
-			  true_len = sizeof(sorted);
+			if (true_len >= sizeof(normalized)) {
+				true_len = sizeof(normalized) - 1;
+			}
+
+			/* Normalize string if is not empty string */
+			if (true_len) {
+				ut_ad(data);
+				true_len= wsrep_normalize_string(
+					mysql_type, cs->number, data,
+					normalized, true_len,
+					REC_VERSION_56_MAX_INDEX_COL_LEN);
 			}
 
-			memcpy(sorted, data, true_len);
-			true_len = wsrep_innobase_mysql_sort(
-				mysql_type, cs->number, sorted, true_len,
-				REC_VERSION_56_MAX_INDEX_COL_LEN);
 			if (wsrep_protocol_version > 1) {
 				/* Note that we always reserve the maximum possible
 				length of the true VARCHAR in the key value, though
@@ -6774,7 +6756,7 @@ wsrep_store_key_val_for_row(
 						 wsrep_thd_query(thd));
 					true_len = buff_space;
 				}
- 				memcpy(buff, sorted, true_len);
+				memcpy(buff, normalized, true_len);
 				buff += true_len;
 				buff_space -= true_len;
 			} else {
@@ -6788,19 +6770,11 @@ wsrep_store_key_val_for_row(
 			as BLOB data in innodb. */
 			|| mysql_type == MYSQL_TYPE_GEOMETRY) {
 
-			const CHARSET_INFO* cs;
-			ulint		key_len;
-			ulint		true_len;
-			int		error=0;
-			ulint		blob_len;
-			const byte*	blob_data;
-
+			const size_t key_len= key_part->length;
 			ut_a(key_part->key_part_flag & HA_PART_KEY_SEG);
 
-			key_len = key_part->length;
-
 			if (part_is_null) {
-				true_len = key_len + 2;
+				size_t true_len= key_len + 2;
 				if (true_len > buff_space) {
 					fprintf (stderr,
 						 "WSREP: key truncated: %s\n",
@@ -6813,14 +6787,15 @@ wsrep_store_key_val_for_row(
 				continue;
 			}
 
-			cs = field->charset();
+			const CHARSET_INFO* cs= field->charset();
 
-			blob_data = row_mysql_read_blob_ref(&blob_len,
+			size_t blob_len;
+			const byte* blob_data = row_mysql_read_blob_ref(&blob_len,
 				(byte*) (record
 				+ (ulint)get_field_offset(table, field)),
 					(ulint) field->pack_length());
 
-			true_len = blob_len;
+			size_t true_len= blob_len;
 
 			ut_a(get_field_offset(table, field)
 				== key_part->offset);
@@ -6829,12 +6804,13 @@ wsrep_store_key_val_for_row(
 			the true length of the key */
 
 			if (blob_len > 0 && cs->mbmaxlen > 1) {
-				true_len = (ulint) my_well_formed_length(cs,
+				int error;
+
+				true_len= my_well_formed_length(cs,
 						(const char *) blob_data,
 						(const char *) blob_data
 							+ blob_len,
-						(uint) (key_len /
-							cs->mbmaxlen),
+						(key_len / cs->mbmaxlen),
 						&error);
 			}
 
@@ -6846,11 +6822,16 @@ wsrep_store_key_val_for_row(
 				true_len = key_len;
 			}
 
-			memcpy(sorted, blob_data, true_len);
-			true_len = wsrep_innobase_mysql_sort(
-				mysql_type, cs->number, sorted, true_len,
-				REC_VERSION_56_MAX_INDEX_COL_LEN);
-
+			/* Normalize string if it is not empty string.
+			When true_len == 0 blob_data is not always
+			nullptr it may be empty string i.e. "" */
+			if (true_len) {
+				ut_ad(blob_data);
+				true_len= wsrep_normalize_string(
+					mysql_type, cs->number, blob_data,
+					normalized, true_len,
+					REC_VERSION_56_MAX_INDEX_COL_LEN);
+			}
 
 			/* Note that we always reserve the maximum possible
 			length of the BLOB prefix in the key value. */
@@ -6866,24 +6847,15 @@ wsrep_store_key_val_for_row(
 			} else {
 				buff += key_len;
 			}
-			memcpy(buff, sorted, true_len);
+			memcpy(buff, normalized, true_len);
 		} else {
 			/* Here we handle all other data types except the
 			true VARCHAR, BLOB and TEXT. Note that the column
 			value we store may be also in a column prefix
 			index. */
 
-			const CHARSET_INFO*	cs = NULL;
-			ulint			true_len;
-			ulint			key_len;
-			const uchar*		src_start;
-			int			error=0;
-			enum_field_types	real_type;
-
-			key_len = key_part->length;
-
 			if (part_is_null) {
-				true_len = key_len;
+				size_t true_len= key_part->length;
 				if (true_len > buff_space) {
 					fprintf (stderr,
 						 "WSREP: key truncated: %s\n",
@@ -6896,9 +6868,9 @@ wsrep_store_key_val_for_row(
 				continue;
 			}
 
-			src_start = record + key_part->offset;
-			real_type = field->real_type();
-			true_len = key_len;
+			const uchar* src_start= record + key_part->offset;
+			const enum_field_types real_type= field->real_type();
+			size_t true_len= key_part->length;
 
 			/* Character set for the field is defined only
 			to fields whose type is string and real field
@@ -6910,26 +6882,32 @@ wsrep_store_key_val_for_row(
 				&& ( mysql_type == MYSQL_TYPE_VAR_STRING
 					|| mysql_type == MYSQL_TYPE_STRING)) {
 
-				cs = field->charset();
+				const CHARSET_INFO* cs= field->charset();
 
 				/* For multi byte character sets we need to
 				calculate the true length of the key */
 
-				if (key_len > 0 && cs->mbmaxlen > 1) {
+				if (true_len > 0 && cs->mbmaxlen > 1) {
+					int error;
 
-					true_len = (ulint)
-						my_well_formed_length(cs,
+					true_len= my_well_formed_length(cs,
 							(const char *)src_start,
 							(const char *)src_start
-								+ key_len,
-							(uint) (key_len /
-								cs->mbmaxlen),
+								+ true_len,
+							(true_len / cs->mbmaxlen),
 							&error);
 				}
-				memcpy(sorted, src_start, true_len);
-				true_len = wsrep_innobase_mysql_sort(
-					mysql_type, cs->number, sorted, true_len,
-					REC_VERSION_56_MAX_INDEX_COL_LEN);
+
+				/* Normalize string if it is not empty string */
+				if (true_len) {
+					ut_ad(src_start);
+					true_len= wsrep_normalize_string(
+						mysql_type, cs->number,
+						src_start, normalized, true_len,
+						REC_VERSION_56_MAX_INDEX_COL_LEN);
+				} else {
+					ut_ad(src_start == nullptr);
+				}
 
 				if (true_len > buff_space) {
 					fprintf (stderr,
@@ -6937,9 +6915,15 @@ wsrep_store_key_val_for_row(
 						 wsrep_thd_query(thd));
 					true_len   = buff_space;
 				}
-				memcpy(buff, sorted, true_len);
+				memcpy(buff, normalized, true_len);
 			} else {
-				memcpy(buff, src_start, true_len);
+				/* Copy only if there is data */
+				if (true_len) {
+					ut_ad(src_start);
+					memcpy(buff, src_start, true_len);
+				} else {
+					ut_ad(src_start == nullptr);
+				}
 			}
 			buff       += true_len;
 			buff_space -= true_len;
diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h
index 35a93f32ea3..34d1c9fb7a7 100644
--- a/storage/innobase/include/ha_prototypes.h
+++ b/storage/innobase/include/ha_prototypes.h
@@ -148,9 +148,12 @@ innobase_basename(
 	const char*	path_name);
 
 #ifdef WITH_WSREP
-ulint wsrep_innobase_mysql_sort(int mysql_type, uint charset_number,
-                             unsigned char* str, ulint str_length,
-                             ulint buf_length);
+size_t wsrep_normalize_string(int mysql_type,
+			      uint charset_number,
+			      const unsigned char* str,
+			      unsigned char* out_str,
+			      ulint str_length,
+			      ulint buf_length);
 #endif /* WITH_WSREP */
 
 /** Get high resolution timestamp for the current query start time.
diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc
index 47be5e447f5..6480c0358ed 100644
--- a/storage/innobase/rem/rem0rec.cc
+++ b/storage/innobase/rem/rem0rec.cc
@@ -2733,11 +2733,10 @@ wsrep_rec_get_foreign_key(
 				*buf++ = 0;
 				key_len++;
 			}
-			memcpy(buf, data, len);
-			*buf_len = wsrep_innobase_mysql_sort(
+			*buf_len = wsrep_normalize_string(
 				(int)(col_f->prtype & DATA_MYSQL_TYPE_MASK),
 				dtype_get_charset_coll(col_f->prtype),
-				buf, static_cast<uint>(len),
+				data, buf, static_cast<uint>(len),
 				static_cast<uint>(*buf_len));
 		} else { /* new protocol */
 			if (!(col_r->prtype & DATA_NOT_NULL)) {
@@ -2766,13 +2765,10 @@ wsrep_rec_get_foreign_key(
 			case DATA_VARMYSQL:
 			case DATA_CHAR:
 			case DATA_MYSQL:
-				/* Copy the actual data */
-				memcpy(buf, data, len);
-				len = wsrep_innobase_mysql_sort(
-					(int)
-					(col_f->prtype & DATA_MYSQL_TYPE_MASK),
+				len = wsrep_normalize_string(
+					(int)(col_f->prtype & DATA_MYSQL_TYPE_MASK),
 					dtype_get_charset_coll(col_f->prtype),
-					buf, len, *buf_len);
+					data, buf, len, *buf_len);
 				break;
 			case DATA_BLOB:
 			case DATA_BINARY:

From f31c6ae60b885a76d1c0238ca8c6f2490e49693b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Tue, 11 Nov 2025 12:33:45 +0200
Subject: [PATCH 022/119] Add WSREP_LEX_SCHEMA definition back it is needed
 later.

---
 sql/wsrep_schema.cc | 1 +
 sql/wsrep_schema.h  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sql/wsrep_schema.cc b/sql/wsrep_schema.cc
index 90f60266227..627b555cf1f 100644
--- a/sql/wsrep_schema.cc
+++ b/sql/wsrep_schema.cc
@@ -43,6 +43,7 @@
 #define WSREP_MEMBERS_TABLE   "wsrep_cluster_members"
 #define WSREP_ALLOWLIST_TABLE "wsrep_allowlist"
 
+LEX_CSTRING WSREP_LEX_SCHEMA= {STRING_WITH_LEN(WSREP_SCHEMA)};
 LEX_CSTRING WSREP_LEX_STREAMING= {STRING_WITH_LEN(WSREP_STREAMING_TABLE)};
 LEX_CSTRING WSREP_LEX_CLUSTER= {STRING_WITH_LEN(WSREP_CLUSTER_TABLE)};
 LEX_CSTRING WSREP_LEX_MEMBERS= {STRING_WITH_LEN(WSREP_MEMBERS_TABLE)};
diff --git a/sql/wsrep_schema.h b/sql/wsrep_schema.h
index f9b5dff1be0..edbd9f14c70 100644
--- a/sql/wsrep_schema.h
+++ b/sql/wsrep_schema.h
@@ -172,6 +172,7 @@ class Wsrep_schema
 
 extern Wsrep_schema* wsrep_schema;
 
+extern LEX_CSTRING WSREP_LEX_SCHEMA;
 extern LEX_CSTRING WSREP_LEX_STREAMING;
 extern LEX_CSTRING WSREP_LEX_CLUSTER;
 extern LEX_CSTRING WSREP_LEX_MEMBERS;

From 9b393c7f198d8d037bf5164713aecebb888f879e Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sun, 9 Nov 2025 17:13:53 +0100
Subject: [PATCH 023/119] MDEV-38057 main.func_json test fails in sandbox
 interface with lo device only

don't use `from mysql.user`
---
 mysql-test/main/func_json.result | 5 +++--
 mysql-test/main/func_json.test   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result
index d1a388e0d1e..edb0ba36796 100644
--- a/mysql-test/main/func_json.result
+++ b/mysql-test/main/func_json.result
@@ -5356,9 +5356,10 @@ SET CHARACTER SET default;
 SELECT json_array_intersect(@a,@b);
 json_array_intersect(@a,@b)
 NULL
+#
 # MDEV-36809: json_array_intersect crashs when unused table ref provided
 #
-select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from mysql.user;
+select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from (values (1),(2),(3),(4),(5)) x;
 result
 [["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
 [["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
@@ -5371,7 +5372,7 @@ result
 #
 # MDEV-37864: mysql-test/mtr --cursor main.func_json fails
 #
-select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from mysql.user;
+select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from (values (1),(2),(3),(4),(5)) x;
 result
 [["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
 [["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test
index d5d63349c63..2045b5df09c 100644
--- a/mysql-test/main/func_json.test
+++ b/mysql-test/main/func_json.test
@@ -4263,15 +4263,16 @@ SET CHARACTER SET default;
 
 SELECT json_array_intersect(@a,@b);
 
+--echo #
 --echo # MDEV-36809: json_array_intersect crashs when unused table ref provided
 --echo #
-select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from mysql.user;
+select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from (values (1),(2),(3),(4),(5)) x;
 SELECT ( WITH x AS ( WITH x ( x ) AS ( SELECT ( 1.000000 ) ) SELECT x FROM x ) SELECT * FROM x WHERE ( SELECT AVG ( x ) OVER ( ORDER BY JSON_ARRAY_INTERSECT ( '[["1", "7"], ["2", "6"], ["3", "8"]]' , '[["2","6"],["3","8"],["4","5"],["1","7"]]' ) ) FROM x ) ) as result;
 
 --echo #
 --echo # MDEV-37864: mysql-test/mtr --cursor main.func_json fails
 --echo #
 
-select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from mysql.user;
+select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from (values (1),(2),(3),(4),(5)) x;
 
 --echo # End of 11.4 Test

From 6e1880beca38e8446dcfaf56858bae9e16caf658 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Mon, 3 Nov 2025 00:51:50 +0100
Subject: [PATCH 024/119] MDEV-38005 Assertion `(yyvsp[-3].simple_string) <
 (yyvsp[-1].simple_string)' failed

relax assertion to account for a query being killed in the parser
---
 mysql-test/main/max_session_mem_used.result | 9 +++++++++
 mysql-test/main/max_session_mem_used.test   | 8 ++++++++
 sql/sql_yacc.yy                             | 2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/mysql-test/main/max_session_mem_used.result b/mysql-test/main/max_session_mem_used.result
index d2ce765999b..da953e61139 100644
--- a/mysql-test/main/max_session_mem_used.result
+++ b/mysql-test/main/max_session_mem_used.result
@@ -45,4 +45,13 @@ REPAIR LOCAL TABLE t1 USE_FRM;
 REPAIR LOCAL TABLE t1;
 DROP TABLE t1;
 SET max_session_mem_used=default;
+#
+# MDEV-38005 Assertion `(yyvsp[-3].simple_string) < (yyvsp[-1].simple_string)' failed
+#
+SET max_session_mem_used=1;
+Warnings:
+Warning	1292	Truncated incorrect max_session_mem_used value: '1'
+CREATE TABLE t SELECT 1000000000000000000000000000000000000000000000000000000000000000000000000000000001 AS c;
+ERROR HY000: The MariaDB server is running with the --max-session-mem-used=8192 option so it cannot execute this statement
+SET max_session_mem_used=default;
 # End of 10.6 tests
diff --git a/mysql-test/main/max_session_mem_used.test b/mysql-test/main/max_session_mem_used.test
index 353fdf11916..92b882cf079 100644
--- a/mysql-test/main/max_session_mem_used.test
+++ b/mysql-test/main/max_session_mem_used.test
@@ -82,4 +82,12 @@ REPAIR LOCAL TABLE t1;
 DROP TABLE t1;
 SET max_session_mem_used=default;
 
+--echo #
+--echo # MDEV-38005 Assertion `(yyvsp[-3].simple_string) < (yyvsp[-1].simple_string)' failed
+--echo #
+SET max_session_mem_used=1;
+--error ER_OPTION_PREVENTS_STATEMENT
+CREATE TABLE t SELECT 1000000000000000000000000000000000000000000000000000000000000000000000000000000001 AS c;
+SET max_session_mem_used=default;
+
 --echo # End of 10.6 tests
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index f41e352999a..4ad2d62a415 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -9369,7 +9369,7 @@ select_item:
           }
         | remember_name expr remember_end select_alias
           {
-            DBUG_ASSERT($1 < $3);
+            DBUG_ASSERT($1 < $3 || thd->killed);
 
             if (unlikely(add_item_to_list(thd, $2)))
               MYSQL_YYABORT;

From ccd9b008c730cd0d9a9dcc4b570d33328aa0a473 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 31 Oct 2025 19:11:27 +0100
Subject: [PATCH 025/119] make innodb_gis.gis, innodb_gis.1, main.gis tests
 more stable

and fix outdated comments
---
 mysql-test/main/gis.test               |  2 +-
 mysql-test/suite/innodb_gis/t/1.test   | 10 +++++-----
 mysql-test/suite/innodb_gis/t/gis.test | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mysql-test/main/gis.test b/mysql-test/main/gis.test
index ae4c787d700..860fc8a4d4a 100644
--- a/mysql-test/main/gis.test
+++ b/mysql-test/main/gis.test
@@ -371,7 +371,7 @@ insert into t1 values ('85984',GeomFromText('MULTIPOLYGON(((-115.006363
 
 # Expected results are 115.2970604672862 and 36.23335610879993, but IA64 returns
 # slightly different values due to fused multiply-add instructions.
---replace_result 115.29706047613604 115.2970604672862 36.23335611157958 36.23335610879993
+--replace_regex /115.2970604[67]\d+/115.2970604672862/ /36.233356111579\d+/36.23335610879993/
 select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from
 t1 where object_id=85998;
 
diff --git a/mysql-test/suite/innodb_gis/t/1.test b/mysql-test/suite/innodb_gis/t/1.test
index 1ba48e6a3ae..b0301165ffe 100644
--- a/mysql-test/suite/innodb_gis/t/1.test
+++ b/mysql-test/suite/innodb_gis/t/1.test
@@ -375,15 +375,15 @@ insert into t1 values ('85984',ST_GeomFromText('MULTIPOLYGON(((-115.006363
 36.248666,-115.263639 36.247466,-115.263839 36.252766,-115.261439
 36.252666,-115.261439 36.247366,-115.247239 36.247066)))'));
 
-# Expected result is 115.31877315203187, but IA64 returns 115.31877315203188
-# due to fused multiply-add instructions.
---replace_result 115.29706047613604 115.2970604672862  36.23335611157958 36.23335610879993
+# Expected results are 115.2970604672862 and 36.23335610879993, but IA64 returns
+# slightly different values due to fused multiply-add instructions.
+--replace_regex /115.2970604[67]\d+/115.2970604672862/ /36.233356111579\d+/36.23335610879993/
 select object_id, ST_geometrytype(geo), ST_ISSIMPLE(GEO), ST_ASTEXT(ST_centroid(geo)) from
 t1 where object_id=85998;
 
-# Expected result is 36.3310176346905, but IA64 returns 36.3310176346904
+# Expected result is 36.34725218253213, but IA64 returns 36.34725217627852
 # due to fused multiply-add instructions.
---replace_result 114.86854470090232 114.86854472054372 36.34725217627852 36.34725218253213
+--replace_result 36.34725217627852 36.34725218253213 -114.86854470090232 -114.86854472054372
 select object_id, ST_geometrytype(geo), ST_ISSIMPLE(GEO), ST_ASTEXT(ST_centroid(geo)) from
 t1 where object_id=85984;
 
diff --git a/mysql-test/suite/innodb_gis/t/gis.test b/mysql-test/suite/innodb_gis/t/gis.test
index f8cde7b1a00..9ee45dff701 100644
--- a/mysql-test/suite/innodb_gis/t/gis.test
+++ b/mysql-test/suite/innodb_gis/t/gis.test
@@ -368,15 +368,15 @@ insert into t1 values ('85984',ST_GeomFromText('MULTIPOLYGON(((-115.006363
 36.248666,-115.263639 36.247466,-115.263839 36.252766,-115.261439
 36.252666,-115.261439 36.247366,-115.247239 36.247066)))'));
 
-# Expected result is 115.31877315203187, but IA64 returns 115.31877315203188
-# due to fused multiply-add instructions.
---replace_result 115.29706047613604 115.2970604672862 36.23335611157958 36.23335610879993
+# Expected results are 115.2970604672862 and 36.23335610879993, but IA64 returns
+# slightly different values due to fused multiply-add instructions.
+--replace_regex /115.2970604[67]\d+/115.2970604672862/ /36.233356111579\d+/36.23335610879993/
 select object_id, ST_geometrytype(geo), ST_ISSIMPLE(GEO), ST_ASTEXT(ST_centroid(geo)) from
 t1 where object_id=85998;
 
-# Expected result is 36.3310176346905, but IA64 returns 36.3310176346904
+# Expected result is 36.34725218253213, but IA64 returns 36.34725217627852
 # due to fused multiply-add instructions.
---replace_result 114.86854470090232 114.86854472054372 36.34725217627852 36.34725218253213
+--replace_result 36.34725217627852 36.34725218253213 -114.86854470090232 -114.86854472054372
 select object_id, ST_geometrytype(geo), ST_ISSIMPLE(GEO), ST_ASTEXT(ST_centroid(geo)) from
 t1 where object_id=85984;
 

From 04bf6fdaef3e82b6f98d72a786ba88148b66673f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Tue, 11 Nov 2025 11:46:25 +0200
Subject: [PATCH 026/119] MDEV-36909 : Assertion
 `client_state.transaction().active()' failed in int
 wsrep_thd_append_key(THD*, const wsrep_key*, int, Wsrep_service_key_type)

Problem was that when trigger was executed it accessed
non-transactional table using Aria-engine. To support
simple DML for Aria we use TOI and befoare TOI was
started existing wsrep transaction is rolled back.
In the following operation on transactional
engine in same statement wsrep transaction is not
active anymore leading to assertion.

However, this is incorrect if there is active
wsrep transaction that has done changes. Instead
we should refuse statement if transactional commit
is not supported.
---
 mysql-test/suite/galera/r/MDEV-36909.result   | 52 +++++++++++++++++++
 .../r/galera_strict_require_innodb.result     | 24 ++++++++-
 mysql-test/suite/galera/r/mdev-30653.result   |  2 +-
 mysql-test/suite/galera/t/MDEV-36909.test     | 39 ++++++++++++++
 .../t/galera_strict_require_innodb.test       |  5 +-
 sql/wsrep_mysqld.cc                           | 30 ++++++-----
 6 files changed, 136 insertions(+), 16 deletions(-)
 create mode 100644 mysql-test/suite/galera/r/MDEV-36909.result
 create mode 100644 mysql-test/suite/galera/t/MDEV-36909.test

diff --git a/mysql-test/suite/galera/r/MDEV-36909.result b/mysql-test/suite/galera/r/MDEV-36909.result
new file mode 100644
index 00000000000..e774b6a9395
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-36909.result
@@ -0,0 +1,52 @@
+connection node_2;
+connection node_1;
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (a INT) ENGINE=Aria;
+CREATE TRIGGER trg AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t2 VALUES (NEW.a);
+SET GLOBAL wsrep_mode=replicate_aria;
+UPDATE t1 SET a=10;
+ERROR HY000: Transactional commit not supported by involved engine(s)
+SELECT * FROM t1;
+a
+1
+2
+SELECT * FROM t2;
+a
+connection node_2;
+SELECT * FROM t1;
+a
+1
+2
+SELECT * FROM t2;
+a
+connection node_1;
+DROP TRIGGER trg;
+DROP TABLE t1,t2;
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (a INT) ENGINE=InnoDB;
+CREATE TRIGGER trg AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t2 VALUES (NEW.a);
+UPDATE t1 SET a=10;
+SELECT * FROM t1;
+a
+10
+10
+SELECT * FROM t2;
+a
+10
+10
+connection node_2;
+SELECT * FROM t1;
+a
+10
+10
+SELECT * FROM t2;
+a
+10
+10
+connection node_1;
+DROP TRIGGER trg;
+DROP TABLE t1,t2;
+call mtr.add_suppression("WSREP: Replication of non-transactional engines is experimental. Storage engine Aria for table \'test\'\.\'t2\' is not supported in Galera");
+SET GLOBAL wsrep_mode=DEFAULT;
diff --git a/mysql-test/suite/galera/r/galera_strict_require_innodb.result b/mysql-test/suite/galera/r/galera_strict_require_innodb.result
index 47adc5e9285..852f517148f 100644
--- a/mysql-test/suite/galera/r/galera_strict_require_innodb.result
+++ b/mysql-test/suite/galera/r/galera_strict_require_innodb.result
@@ -1,6 +1,6 @@
 connection node_2;
 connection node_1;
-call mtr.add_suppression("WSREP: wsrep_mode = STRICT_REPLICATION enabled\\. Storage engine ");
+call mtr.add_suppression("WSREP: wsrep_mode = STRICT_REPLICATION enabled");
 CREATE TABLE t1(a int NOT NULL PRIMARY KEY, b varchar(50)) ENGINE=INNODB;
 CREATE TABLE t2(a int NOT NULL PRIMARY KEY, b varchar(50)) ENGINE=MYISAM;
 CREATE TABLE t3(a int NOT NULL PRIMARY KEY, b varchar(50)) ENGINE=ARIA;
@@ -9,7 +9,11 @@ SET GLOBAL log_warnings=2;
 SET GLOBAL wsrep_mode = "STRICT_REPLICATION,REPLICATE_MYISAM,REPLICATE_ARIA";
 INSERT INTO t1 values (1,'innodb1');
 INSERT INTO t2 values (1,'myisam1');
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MyISAM for table 'test'.'t2' is not supported in Galera
 INSERT INTO t3 values (1,'aria1');
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine Aria for table 'test'.'t3' is not supported in Galera
 INSERT INTO t4 values (1,'memory1');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MEMORY for table 'test'.'t4' is not supported in Galera
@@ -24,6 +28,8 @@ Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine Aria
 SET GLOBAL log_warnings=1;
 INSERT INTO t1 values (3,'innodb3');
 INSERT INTO t2 values (3,'myisam3');
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MyISAM for table 'test'.'t2' is not supported in Galera
 INSERT INTO t3 values (3,'aria3');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine Aria for table 'test'.'t3' is not supported in Galera
@@ -33,6 +39,8 @@ Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MEMO
 include/assert_grep.inc [WSREP: wsrep_mode = STRICT_REPLICATION enabled.]
 SET GLOBAL log_warnings=2;
 INSERT INTO t2 values (4,'myisam3');
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MyISAM for table 'test'.'t2' is not supported in Galera
 INSERT INTO t3 values (4,'aria2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine Aria for table 'test'.'t3' is not supported in Galera
@@ -40,6 +48,8 @@ INSERT INTO t4 values (4,'memory2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MEMORY for table 'test'.'t4' is not supported in Galera
 INSERT INTO t2 values (5,'myisam3');
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MyISAM for table 'test'.'t2' is not supported in Galera
 INSERT INTO t3 values (5,'aria2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine Aria for table 'test'.'t3' is not supported in Galera
@@ -47,6 +57,8 @@ INSERT INTO t4 values (5,'memory2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MEMORY for table 'test'.'t4' is not supported in Galera
 INSERT INTO t2 values (6,'myisam3');
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MyISAM for table 'test'.'t2' is not supported in Galera
 INSERT INTO t3 values (6,'aria2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine Aria for table 'test'.'t3' is not supported in Galera
@@ -54,6 +66,8 @@ INSERT INTO t4 values (6,'memory2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MEMORY for table 'test'.'t4' is not supported in Galera
 INSERT INTO t2 values (7,'myisam3');
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MyISAM for table 'test'.'t2' is not supported in Galera
 INSERT INTO t3 values (7,'aria2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine Aria for table 'test'.'t3' is not supported in Galera
@@ -61,6 +75,8 @@ INSERT INTO t4 values (7,'memory2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MEMORY for table 'test'.'t4' is not supported in Galera
 INSERT INTO t2 values (8,'myisam3');
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MyISAM for table 'test'.'t2' is not supported in Galera
 INSERT INTO t3 values (8,'aria2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine Aria for table 'test'.'t3' is not supported in Galera
@@ -68,6 +84,8 @@ INSERT INTO t4 values (8,'memory2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MEMORY for table 'test'.'t4' is not supported in Galera
 INSERT INTO t2 values (9,'myisam3');
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MyISAM for table 'test'.'t2' is not supported in Galera
 INSERT INTO t3 values (9,'aria2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine Aria for table 'test'.'t3' is not supported in Galera
@@ -75,6 +93,8 @@ INSERT INTO t4 values (9,'memory2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MEMORY for table 'test'.'t4' is not supported in Galera
 INSERT INTO t2 values (10,'myisam3');
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MyISAM for table 'test'.'t2' is not supported in Galera
 INSERT INTO t3 values (10,'aria2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine Aria for table 'test'.'t3' is not supported in Galera
@@ -82,6 +102,8 @@ INSERT INTO t4 values (10,'memory2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MEMORY for table 'test'.'t4' is not supported in Galera
 INSERT INTO t2 values (11,'myisam3');
+Warnings:
+Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine MyISAM for table 'test'.'t2' is not supported in Galera
 INSERT INTO t3 values (11,'aria2');
 Warnings:
 Warning	1290	WSREP: wsrep_mode = STRICT_REPLICATION enabled. Storage engine Aria for table 'test'.'t3' is not supported in Galera
diff --git a/mysql-test/suite/galera/r/mdev-30653.result b/mysql-test/suite/galera/r/mdev-30653.result
index 2a6099ae915..805ee57992c 100644
--- a/mysql-test/suite/galera/r/mdev-30653.result
+++ b/mysql-test/suite/galera/r/mdev-30653.result
@@ -43,7 +43,7 @@ id	val
 connection node_2;
 select * from t1;
 id	val
-1	23
+1	24
 select * from t2;
 id	val
 2	42
diff --git a/mysql-test/suite/galera/t/MDEV-36909.test b/mysql-test/suite/galera/t/MDEV-36909.test
new file mode 100644
index 00000000000..fa98df19cf5
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-36909.test
@@ -0,0 +1,39 @@
+--source include/galera_cluster.inc
+--source include/have_innodb.inc
+
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (a INT) ENGINE=Aria;
+CREATE TRIGGER trg AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t2 VALUES (NEW.a);
+SET GLOBAL wsrep_mode=replicate_aria;
+--error ER_ERROR_DURING_COMMIT
+UPDATE t1 SET a=10;
+SELECT * FROM t1;
+SELECT * FROM t2;
+
+--connection node_2
+SELECT * FROM t1;
+SELECT * FROM t2;
+
+--connection node_1
+DROP TRIGGER trg;
+DROP TABLE t1,t2;
+
+CREATE TABLE t1 (a INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1),(2);
+CREATE TABLE t2 (a INT) ENGINE=InnoDB;
+CREATE TRIGGER trg AFTER UPDATE ON t1 FOR EACH ROW INSERT INTO t2 VALUES (NEW.a);
+UPDATE t1 SET a=10;
+SELECT * FROM t1;
+SELECT * FROM t2;
+
+--connection node_2
+SELECT * FROM t1;
+SELECT * FROM t2;
+
+--connection node_1
+DROP TRIGGER trg;
+DROP TABLE t1,t2;
+
+call mtr.add_suppression("WSREP: Replication of non-transactional engines is experimental. Storage engine Aria for table \'test\'\.\'t2\' is not supported in Galera");
+SET GLOBAL wsrep_mode=DEFAULT;
diff --git a/mysql-test/suite/galera/t/galera_strict_require_innodb.test b/mysql-test/suite/galera/t/galera_strict_require_innodb.test
index 6ca95432dbc..9ef92847520 100644
--- a/mysql-test/suite/galera/t/galera_strict_require_innodb.test
+++ b/mysql-test/suite/galera/t/galera_strict_require_innodb.test
@@ -17,8 +17,9 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 --source include/have_aria.inc
+--source include/force_restart.inc
 
-call mtr.add_suppression("WSREP: wsrep_mode = STRICT_REPLICATION enabled\\. Storage engine ");
+call mtr.add_suppression("WSREP: wsrep_mode = STRICT_REPLICATION enabled");
 
 CREATE TABLE t1(a int NOT NULL PRIMARY KEY, b varchar(50)) ENGINE=INNODB;
 CREATE TABLE t2(a int NOT NULL PRIMARY KEY, b varchar(50)) ENGINE=MYISAM;
@@ -47,7 +48,7 @@ INSERT INTO t3 values (3,'aria3');
 INSERT INTO t4 values (3,'memory3');
 
 # test warnings
---let $assert_count = 3
+--let $assert_count = 5
 --let $assert_file = $MYSQLTEST_VARDIR/log/mysqld.1.err
 --let $assert_text = WSREP: wsrep_mode = STRICT_REPLICATION enabled.
 --let $assert_select = WSREP: wsrep_mode = STRICT_REPLICATION enabled.
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 4eece0b5471..38f46489258 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -1472,25 +1472,31 @@ bool wsrep_check_mode_after_open_table (THD *thd,
         wsrep_push_warning(thd, WSREP_REQUIRE_PRIMARY_KEY, hton, tables);
       }
 
+      if (wsrep_check_mode(WSREP_MODE_STRICT_REPLICATION))
+      {
+        /* Table is not an InnoDB table and strict replication is requested*/
+        wsrep_push_warning(thd, WSREP_REQUIRE_INNODB, hton, tables);
+      }
+
       // Check are we inside a transaction
-      bool not_used;
-      uint rw_ha_count= ha_check_and_coalesce_trx_read_only(thd, thd->transaction->all.ha_list, true, &not_used);
-      bool changes= wsrep_has_changes(thd);
+      const bool changes= wsrep_has_changes(thd);
+      const bool active= wsrep_is_active(thd);
+
+      // We should not start TOI if transaction has made already
+      // changes and is active
+      if (changes && active)
+      {
+        my_message(ER_ERROR_DURING_COMMIT, "Transactional commit not supported "
+                   "by involved engine(s)", MYF(0));
+        wsrep_push_warning(thd, WSREP_EXPERIMENTAL, hton, tables);
+        return false;
+      }
 
       // Roll back current stmt if exists
       wsrep_before_rollback(thd, true);
       wsrep_after_rollback(thd, true);
       wsrep_after_statement(thd);
 
-      // If there is updates, they would be lost above rollback
-      if (rw_ha_count > 0 && changes)
-      {
-	my_message(ER_ERROR_DURING_COMMIT, "Transactional commit not supported "
-                     "by involved engine(s)", MYF(0));
-        wsrep_push_warning(thd, WSREP_EXPERIMENTAL, hton, tables);
-	return false;
-      }
-
       WSREP_TO_ISOLATION_BEGIN(NULL, NULL, (tables));
     }
   } else if (db_type != DB_TYPE_UNKNOWN &&

From 8794f8c3d7e1a7dd8e1e2f8c93298ff3f8dbef95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Wed, 12 Nov 2025 09:18:55 +0200
Subject: [PATCH 027/119] MDEV-35810 test case fixup

A KILL QUERY of SET GLOBAL innodb_log_file_size would sometimes lead to
ER_QUERY_INTERRUPTED being reported.
---
 mysql-test/suite/innodb/t/log_file_size_online.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/suite/innodb/t/log_file_size_online.test b/mysql-test/suite/innodb/t/log_file_size_online.test
index fb6722ee8d7..8ea5e662d3b 100644
--- a/mysql-test/suite/innodb/t/log_file_size_online.test
+++ b/mysql-test/suite/innodb/t/log_file_size_online.test
@@ -43,6 +43,7 @@ send SET GLOBAL innodb_log_file_size=7340032;
 let $ignore= `SELECT @id := $ID`;
 KILL QUERY @id;
 --connection con1
+--error 0,ER_QUERY_INTERRUPTED
 reap;
 
 --connection default

From eb5712b865feb6b121e97c5f442dfb63e9afeff4 Mon Sep 17 00:00:00 2001
From: Aquila Macedo <aquilamacedo@riseup.net>
Date: Fri, 7 Nov 2025 21:09:05 -0300
Subject: [PATCH 028/119] MDEV-38046 Make func_regexp_pcre tolerant to PCRE2
 offset change

PCRE2 10.47 reports the invalid escape in 'A\q' at offset 3 instead of 2.
Update the expected result and add a --replace_regex in the test so the
suite passes with both older and newer PCRE2 versions.
---
 mysql-test/main/func_regexp_pcre.result | 2 +-
 mysql-test/main/func_regexp_pcre.test   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mysql-test/main/func_regexp_pcre.result b/mysql-test/main/func_regexp_pcre.result
index 229a60f4beb..8e39e162114 100644
--- a/mysql-test/main/func_regexp_pcre.result
+++ b/mysql-test/main/func_regexp_pcre.result
@@ -791,7 +791,7 @@ SELECT 'AB' RLIKE 'A# this is a comment\nB';
 1
 SET default_regex_flags=DEFAULT;
 SELECT 'Aq' RLIKE 'A\\q';
-ERROR 42000: Regex error 'unrecognized character follows \ at offset 2'
+ERROR 42000: Regex error 'unrecognized character follows \ at offset 3'
 SET default_regex_flags='EXTRA';
 SELECT 'A' RLIKE 'B';
 'A' RLIKE 'B'
diff --git a/mysql-test/main/func_regexp_pcre.test b/mysql-test/main/func_regexp_pcre.test
index 37411e07e66..28d96dd43c8 100644
--- a/mysql-test/main/func_regexp_pcre.test
+++ b/mysql-test/main/func_regexp_pcre.test
@@ -381,6 +381,8 @@ SELECT 'AB' RLIKE 'A B';
 SELECT 'AB' RLIKE 'A# this is a comment\nB';
 SET default_regex_flags=DEFAULT;
 
+# pcre2 versions differ in the reported error offset for invalid escapes
+--replace_regex /offset 2/offset 3/
 --error ER_REGEXP_ERROR
 SELECT 'Aq' RLIKE 'A\\q';
 

From f0c2753cd15a24858c52878896f108349f322ab0 Mon Sep 17 00:00:00 2001
From: sjaakola <seppo.jaakola@mariadb.com>
Date: Wed, 12 Nov 2025 10:12:28 +0200
Subject: [PATCH 029/119] MDEV-35511: Backport fix for Audit log not reporting
 user in Galera cluster

Setting a name for the the THD::security_ctx:user field for wsrep applier threads.
With this, the audit log events related to wsrep applying will be written in the
audit log.

Using user name <wsrep_applier> for wsrep appliers. This is for having identical
look with async replication, which uses: <replication_slave> for audit logging.

Using same approach as async replication to replace the security_ctx user name
with "system user" for processlist output.

Commit has also a mtr test galera.MDEV-35511, to verify wsrep applier audit logging.
The test does not install/uninstall audit log plugin, but loads the audit log plugin
before the test. This is because uninstalling the audit log plugin gives a warning
saying that plugin is busy and uninstall will be delayed until server shutdown.
This anomaly must be because of the applier thread being active audit logger.
Same problem with plugin uninstall happens also with async relication workers.
If plugn would remain installed, the post test sanity check complains of mismatching
state of pre and post test states, and test execution would fail for this.
---
 mysql-test/suite/galera/r/MDEV-35511.result | 22 +++++++++++++
 mysql-test/suite/galera/t/MDEV-35511.opt    |  1 +
 mysql-test/suite/galera/t/MDEV-35511.test   | 34 +++++++++++++++++++++
 sql/mysqld.cc                               |  3 +-
 sql/mysqld.h                                |  2 +-
 sql/sql_class.h                             |  2 +-
 sql/sql_show.cc                             |  9 ++++--
 sql/wsrep_mysqld.cc                         |  1 +
 8 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 mysql-test/suite/galera/r/MDEV-35511.result
 create mode 100644 mysql-test/suite/galera/t/MDEV-35511.opt
 create mode 100755 mysql-test/suite/galera/t/MDEV-35511.test

diff --git a/mysql-test/suite/galera/r/MDEV-35511.result b/mysql-test/suite/galera/r/MDEV-35511.result
new file mode 100644
index 00000000000..11a6ce9173e
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-35511.result
@@ -0,0 +1,22 @@
+connection node_2;
+connection node_1;
+connection node_2;
+SET GLOBAL server_audit_logging=ON;
+connection node_1;
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES (1);
+connection node_2;
+# Now checking the audit log
+TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'SET GLOBAL server_audit_logging=ON',0
+TIME,HOSTNAME,<wsrep_applier>,,ID,ID,CREATE,test,t1,
+TIME,HOSTNAME,<wsrep_applier>,,ID,ID,WRITE,test,t1,
+TIME,HOSTNAME,root,localhost,ID,ID,READ,test,t1,
+TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,table_stats,
+TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,column_stats,
+TIME,HOSTNAME,root,localhost,ID,ID,READ,mysql,index_stats,
+TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'SELECT COUNT(*) = 1 FROM test.t1',0
+TIME,HOSTNAME,root,localhost,ID,ID,QUERY,test,'SELECT @@datadir',0
+# resetting the test state
+SET GLOBAL server_audit_logging=DEFAULT;
+connection node_1;
+DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/MDEV-35511.opt b/mysql-test/suite/galera/t/MDEV-35511.opt
new file mode 100644
index 00000000000..f054341beb4
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-35511.opt
@@ -0,0 +1 @@
+--plugin-load=server_audit
\ No newline at end of file
diff --git a/mysql-test/suite/galera/t/MDEV-35511.test b/mysql-test/suite/galera/t/MDEV-35511.test
new file mode 100755
index 00000000000..8aa6f6e5c49
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-35511.test
@@ -0,0 +1,34 @@
+--source include/galera_cluster.inc
+
+if (!$SERVER_AUDIT_SO) {
+    skip No SERVER_AUDIT plugin;
+}
+
+# enable audit loggin in node 2
+--connection node_2
+SET GLOBAL server_audit_logging=ON;
+
+# replicate CREATE and INSERT, these should be seen in the audit log
+--connection node_1
+CREATE TABLE t1(a INT);
+INSERT INTO t1 VALUES (1);
+
+--connection node_2
+# make sure that the INSERT has been applied
+--let $wait_condition = SELECT COUNT(*) = 1 FROM test.t1;
+--source include/wait_condition.inc
+
+--echo # Now checking the audit log
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+--replace_regex /[0-9]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\,[^,]*\,/TIME,HOSTNAME,/ /\,[1-9][0-9]*\,/,1,/ /\,[1-9][0-9]*/,ID/
+cat_file $MYSQLD_DATADIR/server_audit.log;
+
+--echo # resetting the test state
+SET GLOBAL server_audit_logging=DEFAULT;
+
+--connection node_1
+DROP TABLE t1;
+
+#UNINSTALL PLUGIN server_audit;
+
+remove_file $MYSQLD_DATADIR/server_audit.log;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e2d4c96250b..f7e0100d6bf 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -303,7 +303,8 @@ static TYPELIB tc_heuristic_recover_typelib=
 
 const char *first_keyword= "first";
 const char *my_localhost= "localhost",
-           *delayed_user= "delayed", *slave_user= "<replication_slave>";
+           *delayed_user= "delayed", *slave_user= "<replication_slave>",
+           *wsrep_user= "<wsrep_applier>";
 
 bool opt_large_files= sizeof(my_off_t) > 4;
 static my_bool opt_autocommit; ///< for --autocommit command-line option
diff --git a/sql/mysqld.h b/sql/mysqld.h
index 7dcf14e3532..012be52fd86 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -268,7 +268,7 @@ extern time_t server_start_time, flush_status_time;
 extern char *opt_mysql_tmpdir, mysql_charsets_dir[];
 extern size_t mysql_unpacked_real_data_home_len;
 extern MYSQL_PLUGIN_IMPORT MY_TMPDIR mysql_tmpdir_list;
-extern const char *first_keyword, *delayed_user, *slave_user;
+extern const char *first_keyword, *delayed_user, *slave_user, *wsrep_user;
 extern MYSQL_PLUGIN_IMPORT const char  *my_localhost;
 extern MYSQL_PLUGIN_IMPORT const char **errmesg;			/* Error messages */
 extern const char *myisam_recover_options_str;
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 313a25f2af3..7b649d2db35 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1583,7 +1583,7 @@ public:
   bool check_access(const privilege_t want_access, bool match_any = false);
   bool is_priv_user(const char *user, const char *host);
   bool is_user_defined() const
-    { return user && user != delayed_user && user != slave_user; };
+    { return user && user != delayed_user && user != slave_user && user != wsrep_user; };
 };
 
 
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 5ab3c3f0cb8..b2e1a550aaa 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -2814,7 +2814,9 @@ static my_bool list_callback(THD *tmp, list_callback_arg *arg)
 
     thd_info->thread_id=tmp->thread_id;
     thd_info->os_thread_id=tmp->os_thread_id;
-    thd_info->user= arg->thd->strdup(tmp_sctx->user && tmp_sctx->user != slave_user ?
+    thd_info->user= arg->thd->strdup(tmp_sctx->user &&
+                                     (tmp_sctx->user != slave_user &&
+                                      tmp_sctx->user != wsrep_user) ?
                                        tmp_sctx->user :
                                        (tmp->system_thread ?
                                          "system user" : "unauthenticated user"));
@@ -3322,8 +3324,9 @@ static my_bool processlist_callback(THD *tmp, processlist_callback_arg *arg)
   /* ID */
   arg->table->field[0]->store((longlong) tmp->thread_id, TRUE);
   /* USER */
-  val= tmp_sctx->user && tmp_sctx->user != slave_user ? tmp_sctx->user :
-        (tmp->system_thread ? "system user" : "unauthenticated user");
+  val= tmp_sctx->user && (tmp_sctx->user != slave_user &&
+       tmp_sctx->user != wsrep_user) ? tmp_sctx->user :
+       (tmp->system_thread ? "system user" : "unauthenticated user");
   arg->table->field[1]->store(val, strlen(val), cs);
   /* HOST */
   if (tmp->peer_port && (tmp_sctx->host || tmp_sctx->ip) &&
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 38f46489258..cc91fe0e293 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -3877,6 +3877,7 @@ void* start_wsrep_THD(void *arg)
 
   thd->system_thread= SYSTEM_THREAD_SLAVE_SQL;
   thd->security_ctx->skip_grants();
+  thd->security_ctx->user = (char *)wsrep_user;
 
   /* handle_one_connection() again... */
   thd->mark_connection_idle();

From 98b094ced199c26d7b212561a04bef4fb1ad7ab5 Mon Sep 17 00:00:00 2001
From: Daniel Bartholomew <db@dbart.us>
Date: Fri, 14 Nov 2025 08:25:16 -0500
Subject: [PATCH 030/119] bump the VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index d08be0f5a2c..bd4fe0f69ae 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=11
 MYSQL_VERSION_MINOR=8
-MYSQL_VERSION_PATCH=5
+MYSQL_VERSION_PATCH=6
 SERVER_MATURITY=stable

From 4c94cd5da66b76722134eb53bdd93be1fa57ef39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Mon, 17 Nov 2025 14:52:10 +0200
Subject: [PATCH 031/119] MDEV-38069 Heavy contention on
 buf_pool.flush_list_mutex

buf_do_flush_list_batch(): Release and reacquire buf_pool.flush_list_mutex
after every 32 iterations, similar to how buf_flush_LRU_list_batch()
releases buf_pool.mutex ever since
commit 27ff972be22880a4046652bc94c2f97fffb456c9 (MDEV-26827 fixup).

This regression was introduced in
commit 22b62edaedddb1cabd5b855cdd39a5e90a5695a2 (MDEV-25113)
and made more prominent by the recent
commit a7f0d79f8c1fc66005401eae8de258dfe8c0a219 (MDEV-35155).

Reviewed by: Thirunarayanan Balathandayuthapani
Tested by: Saahil Alam
Tested by: Rahul Raj
---
 storage/innobase/buf/buf0flu.cc | 92 +++++++++++++++++++--------------
 1 file changed, 52 insertions(+), 40 deletions(-)

diff --git a/storage/innobase/buf/buf0flu.cc b/storage/innobase/buf/buf0flu.cc
index 5b408ae11bc..4e9f1e015ba 100644
--- a/storage/innobase/buf/buf0flu.cc
+++ b/storage/innobase/buf/buf0flu.cc
@@ -1463,7 +1463,16 @@ static ulint buf_do_flush_list_batch(ulint max_n, lsn_t lsn) noexcept
         buf_pool.delete_from_flush_list(bpage);
       skip:
         bpage= prev;
-        continue;
+        if (scanned & 31)
+          continue;
+        /* Release the buf_pool.flush_list_mutex every now and then
+        in order to reduce the wait time in buf_flush_ahead().
+        We attempt to preserve the pointer position while yielding.
+        Any thread that would remove 'prev' from buf_pool.flush_list
+        must adjust the hazard pointer. */
+        buf_pool.flush_hp.set(prev);
+        mysql_mutex_unlock(&buf_pool.flush_list_mutex);
+        goto next;
       }
 
       ut_ad(oldest_modification > 2);
@@ -1491,51 +1500,54 @@ static ulint buf_do_flush_list_batch(ulint max_n, lsn_t lsn) noexcept
       buf_pool.flush_hp.set(prev);
     }
 
-    const page_id_t page_id(bpage->id());
-    const uint32_t space_id= page_id.space();
-    if (!space || space->id != space_id)
     {
-      if (last_space_id != space_id)
+      const page_id_t page_id(bpage->id());
+      const uint32_t space_id= page_id.space();
+      if (!space || space->id != space_id)
+      {
+        if (last_space_id != space_id)
+        {
+          mysql_mutex_unlock(&buf_pool.flush_list_mutex);
+          mysql_mutex_unlock(&buf_pool.mutex);
+          if (space)
+            space->release();
+          auto p= buf_flush_space(space_id);
+          space= p.first;
+          last_space_id= space_id;
+          mysql_mutex_lock(&buf_pool.mutex);
+          buf_pool.stat.n_pages_written+= p.second;
+          mysql_mutex_lock(&buf_pool.flush_list_mutex);
+        }
+        else
+          ut_ad(!space);
+      }
+      else if (space->is_stopping_writes())
+      {
+        space->release();
+        space= nullptr;
+      }
+
+      if (!space)
+        buf_flush_discard_page(bpage);
+      else
       {
         mysql_mutex_unlock(&buf_pool.flush_list_mutex);
-        mysql_mutex_unlock(&buf_pool.mutex);
-        if (space)
-          space->release();
-        auto p= buf_flush_space(space_id);
-        space= p.first;
-        last_space_id= space_id;
-        mysql_mutex_lock(&buf_pool.mutex);
-        buf_pool.stat.n_pages_written+= p.second;
-        mysql_mutex_lock(&buf_pool.flush_list_mutex);
+        do
+        {
+          if (neighbors && space->is_rotational())
+            count+= buf_flush_try_neighbors(space, page_id, bpage,
+                                            neighbors == 1, count, max_n);
+          else if (bpage->flush(space))
+            ++count;
+          else
+            continue;
+          mysql_mutex_lock(&buf_pool.mutex);
+        }
+        while (0);
       }
-      else
-        ut_ad(!space);
-    }
-    else if (space->is_stopping_writes())
-    {
-      space->release();
-      space= nullptr;
-    }
-
-    if (!space)
-      buf_flush_discard_page(bpage);
-    else
-    {
-      mysql_mutex_unlock(&buf_pool.flush_list_mutex);
-      do
-      {
-        if (neighbors && space->is_rotational())
-          count+= buf_flush_try_neighbors(space, page_id, bpage,
-                                          neighbors == 1, count, max_n);
-        else if (bpage->flush(space))
-          ++count;
-        else
-          continue;
-        mysql_mutex_lock(&buf_pool.mutex);
-      }
-      while (0);
     }
 
+  next:
     mysql_mutex_lock(&buf_pool.flush_list_mutex);
     bpage= buf_pool.flush_hp.get();
   }

From 36b2696d6c025d6e3f1cf50811ac4cdb472c6497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Fri, 14 Nov 2025 12:14:29 +0200
Subject: [PATCH 032/119] MDEV-37981 : Test failure on
 galera.galera_temporary_sequences

Test case changes only. If DDL is made using RSU in only one
node, then all objects need also be dropped using RSU. Additionally,
added wait_conditions in second test case to verify that DDL and
DML has happened to second node before accessing them.

Also run MDEV-30764 separately and force restart before test
using --force-restart and different config because it does kill
whole cluster and this could disturb next test case run by same
worker.
---
 .../r/galera_temporary_sequences.result       | 12 +++++++----
 mysql-test/suite/galera/t/MDEV-30764.cnf      |  7 +++++++
 mysql-test/suite/galera/t/MDEV-30764.test     |  1 +
 .../galera/t/galera_temporary_sequences.test  | 21 +++++++++++++++----
 4 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 mysql-test/suite/galera/t/MDEV-30764.cnf

diff --git a/mysql-test/suite/galera/r/galera_temporary_sequences.result b/mysql-test/suite/galera/r/galera_temporary_sequences.result
index af80551c40b..184b410b974 100644
--- a/mysql-test/suite/galera/r/galera_temporary_sequences.result
+++ b/mysql-test/suite/galera/r/galera_temporary_sequences.result
@@ -3,16 +3,17 @@ connection node_1;
 connection node_2;
 SET AUTOCOMMIT=0;
 SET SESSION wsrep_OSU_method='RSU';
-CREATE TABLE t (i int primary key, j int);
+CREATE TABLE t (i int primary key, j int) ENGINE=InnoDB;
 CREATE TEMPORARY SEQUENCE seq2 NOCACHE ENGINE=InnoDB;
 COMMIT;
-SET SESSION wsrep_OSU_method='RSU';
 CREATE SEQUENCE seq1 NOCACHE ENGINE=InnoDB;
-SET SESSION wsrep_OSU_method='TOI';
+COMMIT;
 DROP TABLE t;
 DROP SEQUENCE seq2;
 DROP SEQUENCE seq1;
+SET SESSION wsrep_OSU_method='TOI';
 connection node_1;
+SET GLOBAL wsrep_OSU_method='TOI';
 CREATE TABLE t (i int primary key, j int) ENGINE=InnoDB;
 SET AUTOCOMMIT=0;
 INSERT INTO t VALUES (3,0);
@@ -20,8 +21,9 @@ CREATE TEMPORARY SEQUENCE seq1 NOCACHE ENGINE=InnoDB;
 COMMIT;
 INSERT INTO t VALUES (4,0);
 CREATE SEQUENCE seq2 NOCACHE ENGINE=InnoDB;
-commit;
+COMMIT;
 connection node_2;
+SET SESSION wsrep_sync_wait=0;
 SELECT * FROM t;
 i	j
 3	0
@@ -44,3 +46,5 @@ connection node_1;
 DROP TABLE t;
 DROP SEQUENCE seq1;
 DROP SEQUENCE seq2;
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera/t/MDEV-30764.cnf b/mysql-test/suite/galera/t/MDEV-30764.cnf
new file mode 100644
index 00000000000..3bfbe3f7de2
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-30764.cnf
@@ -0,0 +1,7 @@
+!include ../galera_2nodes.cnf
+
+[mysqld.1]
+loose-mdev-30764
+
+[mysqld.2]
+loose-mdev-30764
diff --git a/mysql-test/suite/galera/t/MDEV-30764.test b/mysql-test/suite/galera/t/MDEV-30764.test
index 67152ebea12..98fd913c10d 100644
--- a/mysql-test/suite/galera/t/MDEV-30764.test
+++ b/mysql-test/suite/galera/t/MDEV-30764.test
@@ -1,5 +1,6 @@
 --source include/galera_cluster.inc
 --source include/have_sequence.inc
+--source include/force_restart.inc
 
 # Save original auto_increment_offset values.
 --let $node_1=node_1
diff --git a/mysql-test/suite/galera/t/galera_temporary_sequences.test b/mysql-test/suite/galera/t/galera_temporary_sequences.test
index a85124950af..1ce8a69e737 100644
--- a/mysql-test/suite/galera/t/galera_temporary_sequences.test
+++ b/mysql-test/suite/galera/t/galera_temporary_sequences.test
@@ -4,17 +4,20 @@
 --connection node_2
 SET AUTOCOMMIT=0;
 SET SESSION wsrep_OSU_method='RSU';
-CREATE TABLE t (i int primary key, j int);
+CREATE TABLE t (i int primary key, j int) ENGINE=InnoDB;
 CREATE TEMPORARY SEQUENCE seq2 NOCACHE ENGINE=InnoDB;
 COMMIT;
-SET SESSION wsrep_OSU_method='RSU';
 CREATE SEQUENCE seq1 NOCACHE ENGINE=InnoDB;
-SET SESSION wsrep_OSU_method='TOI';
+COMMIT;
 DROP TABLE t;
 DROP SEQUENCE seq2;
 DROP SEQUENCE seq1;
+SET SESSION wsrep_OSU_method='TOI';
 
 --connection node_1
+--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+SET GLOBAL wsrep_OSU_method='TOI';
 CREATE TABLE t (i int primary key, j int) ENGINE=InnoDB;
 SET AUTOCOMMIT=0;
 INSERT INTO t VALUES (3,0);
@@ -22,9 +25,17 @@ CREATE TEMPORARY SEQUENCE seq1 NOCACHE ENGINE=InnoDB;
 COMMIT;
 INSERT INTO t VALUES (4,0);
 CREATE SEQUENCE seq2 NOCACHE ENGINE=InnoDB;
-commit;
+COMMIT;
 
 --connection node_2
+SET SESSION wsrep_sync_wait=0;
+--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't'
+--source include/wait_condition.inc
+--let $wait_condition = SELECT COUNT(*) = 2 FROM t
+--source include/wait_condition.inc
+
 SELECT * FROM t;
 --error ER_NO_SUCH_TABLE
 SHOW CREATE TABLE seq1;
@@ -34,3 +45,5 @@ SHOW CREATE TABLE seq2;
 DROP TABLE t;
 DROP SEQUENCE seq1;
 DROP SEQUENCE seq2;
+
+--source include/galera_end.inc

From 23bfe99b05289c375a8c01a02edead6bee4fd434 Mon Sep 17 00:00:00 2001
From: Denis Protivensky <denis.protivensky@mariadb.com>
Date: Tue, 11 Nov 2025 17:03:18 +0300
Subject: [PATCH 033/119] MDEV-38073: Unify setting variables for Wsrep schema
 threads

Use common variable initialization for all Wsrep schema threads.
Simplify the code for replay & recovery of SR transactions.
---
 sql/wsrep_schema.cc | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/sql/wsrep_schema.cc b/sql/wsrep_schema.cc
index 627b555cf1f..85fb8d0d29a 100644
--- a/sql/wsrep_schema.cc
+++ b/sql/wsrep_schema.cc
@@ -715,13 +715,8 @@ Wsrep_schema::Wsrep_schema() = default;
 
 Wsrep_schema::~Wsrep_schema() = default;
 
-static void wsrep_init_thd_for_schema(THD *thd)
+static void wsrep_init_thd_variables(THD *thd)
 {
-  thd->security_ctx->skip_grants();
-  thd->system_thread= SYSTEM_THREAD_GENERIC;
-  thd->real_id=pthread_self(); // Keep purify happy
-  thd->prior_thr_create_utime= thd->start_utime=
-    thd->thr_create_utime= microsecond_interval_timer();
   /* No Galera replication */
   thd->variables.wsrep_on= 0;
   /* No binlogging */
@@ -733,6 +728,17 @@ static void wsrep_init_thd_for_schema(THD *thd)
   thd->variables.option_bits|= OPTION_LOG_OFF;
   /* Read committed isolation to avoid gap locking */
   thd->variables.tx_isolation= ISO_READ_COMMITTED;
+}
+
+static void wsrep_init_thd_for_schema(THD *thd)
+{
+  thd->security_ctx->skip_grants();
+  thd->system_thread= SYSTEM_THREAD_GENERIC;
+  thd->real_id=pthread_self(); // Keep purify happy
+  thd->prior_thr_create_utime= thd->start_utime=
+    thd->thr_create_utime= microsecond_interval_timer();
+
+  wsrep_init_thd_variables(thd);
   wsrep_assign_from_threadvars(thd);
   wsrep_store_threadvars(thd);
 }
@@ -1356,9 +1362,6 @@ static int replay_transaction(THD* thd,
                               const wsrep::ws_meta& ws_meta,
                               const std::vector<wsrep::seqno>& fragments)
 {
-  Wsrep_schema_impl::wsrep_off  wsrep_off(thd);
-  Wsrep_schema_impl::binlog_off binlog_off(thd);
-  Wsrep_schema_impl::sql_safe_updates sql_safe_updates(thd);
   Wsrep_schema_impl::thd_context_switch thd_context_switch(orig_thd, thd);
 
   int ret= 1;
@@ -1483,6 +1486,7 @@ int Wsrep_schema::replay_transaction(THD* orig_thd,
   }
 
   thd->thread_stack= (orig_thd ? orig_thd->thread_stack : (char *) &thd);
+  wsrep_init_thd_variables(thd);
   wsrep_assign_from_threadvars(thd);
 
 
@@ -1504,9 +1508,6 @@ static int recover_sr_transactions(THD* storage_thd, THD* orig_thd)
   TABLE* cluster_table= 0;
   TABLE_LIST cluster_table_l;
   Wsrep_storage_service storage_service(storage_thd);
-  Wsrep_schema_impl::binlog_off binlog_off(storage_thd);
-  Wsrep_schema_impl::wsrep_off wsrep_off(storage_thd);
-  Wsrep_schema_impl::sql_safe_updates sql_safe_updates(storage_thd);
   Wsrep_schema_impl::thd_context_switch thd_context_switch(orig_thd,
                                                            storage_thd);
   Wsrep_server_state& server_state(Wsrep_server_state::instance());
@@ -1666,6 +1667,7 @@ int Wsrep_schema::recover_sr_transactions(THD *orig_thd)
   }
   storage_thd->thread_stack=
       (orig_thd ? orig_thd->thread_stack : (char *) &storage_thd);
+  wsrep_init_thd_variables(storage_thd);
   wsrep_assign_from_threadvars(storage_thd);
 
   int ret= ::recover_sr_transactions(storage_thd, orig_thd);

From 48f04bba78149d92b1cfa6d1f2dc13c8a24346a2 Mon Sep 17 00:00:00 2001
From: Denis Protivensky <denis.protivensky@mariadb.com>
Date: Wed, 12 Nov 2025 13:09:49 +0300
Subject: [PATCH 034/119] MDEV-38073: Always use tx_read_only=false for Wsrep
 system threads

Apparently, there was a separate issue with applier thread variables:
wsrep_plugins_post_init() would overwrite thd->variables for every
applier thread and forget to restore proper read only context.
Then, upon every server transaction termination,
trans_reset_one_shot_statistics() would set thread's read only context
to the one stored in thd->variables, thus spoiling the read only
context value for appliers.
---
 mysql-test/suite/galera/r/MDEV-38073.result | 17 +++++++++
 mysql-test/suite/galera/t/MDEV-38073.test   | 39 +++++++++++++++++++++
 sql/sql_plugin.cc                           |  2 ++
 sql/wsrep_high_priority_service.cc          |  4 +++
 sql/wsrep_schema.cc                         |  3 ++
 sql/wsrep_storage_service.cc                |  4 +++
 6 files changed, 69 insertions(+)
 create mode 100644 mysql-test/suite/galera/r/MDEV-38073.result
 create mode 100644 mysql-test/suite/galera/t/MDEV-38073.test

diff --git a/mysql-test/suite/galera/r/MDEV-38073.result b/mysql-test/suite/galera/r/MDEV-38073.result
new file mode 100644
index 00000000000..3ab032a0dfe
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-38073.result
@@ -0,0 +1,17 @@
+connection node_2;
+connection node_1;
+connection node_2;
+connection node_1;
+CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
+SET SESSION wsrep_trx_fragment_size=1;
+START TRANSACTION;
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+COMMIT;
+connection node_2;
+SELECT COUNT(*) = 2 FROM t1;
+COUNT(*) = 2
+1
+connection node_2;
+connection node_1;
+DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/MDEV-38073.test b/mysql-test/suite/galera/t/MDEV-38073.test
new file mode 100644
index 00000000000..b2f69219e25
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-38073.test
@@ -0,0 +1,39 @@
+#
+# Ensure that the transaction_read_only option does not apply to Wsrep system
+# threads (schema and appliers) and that the cluster keeps functioning.
+#
+
+--source include/galera_cluster.inc
+--source include/have_innodb.inc
+--source include/big_test.inc
+
+# Restart the node 2 in transaction_read_only mode.
+--connection node_2
+--source include/shutdown_mysqld.inc
+--let $start_mysqld_params=--transaction_read_only=TRUE
+--source include/start_mysqld.inc
+
+--connection node_1
+CREATE TABLE t1 (id INT PRIMARY KEY) ENGINE=InnoDB;
+
+# Note: this is not obligatory, but we want to test
+# SR transactions as well.
+SET SESSION wsrep_trx_fragment_size=1;
+
+START TRANSACTION;
+INSERT INTO t1 VALUES (1);
+INSERT INTO t1 VALUES (2);
+COMMIT;
+
+--connection node_2
+SELECT COUNT(*) = 2 FROM t1;
+
+# Restart the node 2 in normal mode.
+--connection node_2
+--source include/shutdown_mysqld.inc
+--let $start_mysqld_params=
+--source include/start_mysqld.inc
+
+# Cleanup
+--connection node_1
+DROP TABLE t1;
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index bc986386dfc..c7fad3a9a59 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -4543,6 +4543,8 @@ my_bool post_init_callback(THD *thd, void *)
     set_current_thd(thd);
     plugin_thdvar_init(thd);
 
+    // Restore proper transaction read-only context
+    thd->variables.tx_read_only= false;
     // Restore option_bits
     thd->variables.option_bits= option_bits_saved;
   }
diff --git a/sql/wsrep_high_priority_service.cc b/sql/wsrep_high_priority_service.cc
index ce3459db08e..ffd95161f66 100644
--- a/sql/wsrep_high_priority_service.cc
+++ b/sql/wsrep_high_priority_service.cc
@@ -168,6 +168,10 @@ Wsrep_high_priority_service::Wsrep_high_priority_service(THD* thd)
    */
   thd->variables.option_bits|= OPTION_BIN_LOG;
 
+  /* Allow applying in a transaction read-only context */
+  thd->tx_read_only= false;
+  thd->variables.tx_read_only= false;
+
   thd->net.vio= 0;
   thd->reset_db(&db_str);
   thd->clear_error();
diff --git a/sql/wsrep_schema.cc b/sql/wsrep_schema.cc
index 85fb8d0d29a..dcce91e71f0 100644
--- a/sql/wsrep_schema.cc
+++ b/sql/wsrep_schema.cc
@@ -719,6 +719,9 @@ static void wsrep_init_thd_variables(THD *thd)
 {
   /* No Galera replication */
   thd->variables.wsrep_on= 0;
+  /* Allow modifications in a transaction read-only context */
+  thd->tx_read_only= false;
+  thd->variables.tx_read_only= false;
   /* No binlogging */
   thd->variables.sql_log_bin= 0;
   thd->variables.option_bits&= ~OPTION_BIN_LOG;
diff --git a/sql/wsrep_storage_service.cc b/sql/wsrep_storage_service.cc
index 4885fd9f7e6..7e9229c65e0 100644
--- a/sql/wsrep_storage_service.cc
+++ b/sql/wsrep_storage_service.cc
@@ -55,6 +55,10 @@ Wsrep_storage_service::Wsrep_storage_service(THD* thd)
 
   /* No binlogging */
 
+  /* Allow modifications in a transaction read-only context */
+  thd->tx_read_only= false;
+  thd->variables.tx_read_only= false;
+
   /* No general log */
   thd->variables.option_bits |= OPTION_LOG_OFF;
 

From 9c6017474f988b926dfc562da3fa7113a7e5a36f Mon Sep 17 00:00:00 2001
From: Vlad Lesin <vlad_lesin@mail.ru>
Date: Fri, 14 Nov 2025 16:07:54 +0300
Subject: [PATCH 035/119] MDEV-36845 InnoDB: Failing assertion: tail.trx_no <=
 last_trx_no
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The scenario of the bug is the following. Before killing the server some
transaction A starts undo log writing in some undo segment U of rseg R.
It writes its trx_id into the undo log header. Then new trx_id is assigned
to transaction B, but undo log hasn't been started yet. Then transaction
A commits and writes trx_no into its undo log header. Transaction B
starts writing undo log into the undo segment U. So we have the
following undo logs in the undo segments U:

... undo log 1...
... undo log 2...
      ...
undo log A, trx_id: L, trx_no: M, ...
undo log B, trx_id: N, trx_no: 0, ...

Where L < N < M.

Then server is killed.

On recovery the maximum trx_no is extracted from each rseg, and the
maximum trx_no among all rsegs plus one is considered as a new value
for server-wide transaction id/no counter.

For each undo segment of each rseg we read the last undo log header. If
the last undo log is committed, then we read trx_no from the header,
otherwise we treat trx_id as trx_no. The maximum trx_no from all undo
log segments of the current rseg is treated as the maximum trx_no of the
rseg.

For the above case the undo log of transaction B is not committed and
its trx_no is 0. So we read trx_id and treat it as trx_no. But M < N. If
U is the last modified undo segment in rseg R, and trx_(id/no) N is the
maximum trx_no among all rsegs, then there can be the case when after
recovery some transaction with trx_no_C, such as N < trx_no_C <= M, is
committed.

During a purging we store trx_no of the last parsed undo log of a
committed transaction in purge_sys.tail.trx_no. So if the last parsed
undo log is the undo log of transaction A(transaction B was rolled back
on recovery and its undo log was also removed from the undo segment U),
then purse_sys.tail.trx_no = M. Than if some other transaction C with
trx_no_C <= M is being committed and purged, we hit
"tail.trx_no <= last_trx_no" assertion failure in
purge_sys_t::choose_next_log(), because purge queue is min-heap of
(trx_no, trx_sys.rseg_array index) pairs, where the key is trx_no, and it
must not be that trx_no of the last parsed undo log of a committed
transaction is greater than the last trx_no of the rseg at the top of
the queue.

The fix is to read the trx_no of the previous to last undo log in undo
segment, if the last undo log in that undo segment is not committed, and
set trx_no=max(trx_id of the last undo log, trx_no of the previous to
last undo log) during recovery.

We can do this because we need to extract the maximum
value of trx_no or trx_id of the undo log segment, and the maximum value
is either trx_id of the last undo log or trx_no of the previous to
last undo log, because undo segment can be assigned only to the one
transaction at time, and undo logs in the undo segment are ordered by
trx_id.

Reviewed by Marko Mäkelä.
---
 .../suite/innodb/r/max_trx_no_recovery.result | 114 +++++++++++++++
 .../suite/innodb/t/max_trx_no_recovery.test   | 135 ++++++++++++++++++
 storage/innobase/trx/trx0trx.cc               |   3 +
 storage/innobase/trx/trx0undo.cc              |  29 ++++
 4 files changed, 281 insertions(+)
 create mode 100644 mysql-test/suite/innodb/r/max_trx_no_recovery.result
 create mode 100644 mysql-test/suite/innodb/t/max_trx_no_recovery.test

diff --git a/mysql-test/suite/innodb/r/max_trx_no_recovery.result b/mysql-test/suite/innodb/r/max_trx_no_recovery.result
new file mode 100644
index 00000000000..e663cd7d868
--- /dev/null
+++ b/mysql-test/suite/innodb/r/max_trx_no_recovery.result
@@ -0,0 +1,114 @@
+CREATE TABLE t_2_9(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0;
+INSERT INTO t_2_9 SET a = 10;
+CREATE TABLE t_2_8(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0;
+INSERT INTO t_2_8 SET a = 10;
+CREATE TABLE t_2_7(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0;
+INSERT INTO t_2_7 SET a = 10;
+CREATE TABLE t_2_6(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0;
+INSERT INTO t_2_6 SET a = 10;
+CREATE TABLE t_2_5(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0;
+INSERT INTO t_2_5 SET a = 10;
+CREATE TABLE t_2_4(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0;
+INSERT INTO t_2_4 SET a = 10;
+CREATE TABLE t_2_3(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0;
+INSERT INTO t_2_3 SET a = 10;
+CREATE TABLE t_2_2(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0;
+INSERT INTO t_2_2 SET a = 10;
+CREATE TABLE t_2_1(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0;
+INSERT INTO t_2_1 SET a = 10;
+CREATE TABLE t_1_0(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0;
+INSERT INTO t_1_0 SET a = 10;
+CREATE TABLE t_2_0(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0;
+INSERT INTO t_2_0 SET a = 10;
+InnoDB		0 transactions not purged
+connect  prevent_purge,localhost,root,,;
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+SET GLOBAL DEBUG_DBUG ="+d,assign_same_rseg";
+connection default;
+UPDATE t_2_1 SET a=150;
+connect  con_1_0, localhost,root,,;
+BEGIN;
+UPDATE t_1_0 SET a=15;
+connect  con_2_0, localhost,root,,;
+BEGIN;
+SET DEBUG_SYNC="before_undo_log_trx_id_write SIGNAL before_0 WAIT_FOR cont_0";
+SET DEBUG_SYNC="after_undo_log_trx_id_write SIGNAL after_0";
+UPDATE t_2_0 SET a=15;
+connection con_1_0;
+SET DEBUG_SYNC="now WAIT_FOR before_0";
+connect  con_2_1, localhost,root,,;
+BEGIN;
+SET DEBUG_SYNC="before_undo_log_trx_id_write SIGNAL before_1 WAIT_FOR cont_1";
+UPDATE t_2_1 SET a=15;
+connection default;
+SET DEBUG_SYNC="now WAIT_FOR before_1";
+connect  con_2_2, localhost,root,,;
+BEGIN;
+SET DEBUG_SYNC="before_undo_log_trx_id_write SIGNAL before_2 WAIT_FOR cont_2";
+UPDATE t_2_2 SET a=15;
+connection default;
+SET DEBUG_SYNC="now WAIT_FOR before_2";
+connect  con_2_3, localhost,root,,;
+BEGIN;
+SET DEBUG_SYNC="before_undo_log_trx_id_write SIGNAL before_3 WAIT_FOR cont_3";
+UPDATE t_2_3 SET a=15;
+connection default;
+SET DEBUG_SYNC="now WAIT_FOR before_3";
+connect  con_2_4, localhost,root,,;
+BEGIN;
+SET DEBUG_SYNC="before_undo_log_trx_id_write SIGNAL before_4 WAIT_FOR cont_4";
+UPDATE t_2_4 SET a=15;
+connection default;
+SET DEBUG_SYNC="now WAIT_FOR before_4";
+connect  con_2_5, localhost,root,,;
+BEGIN;
+SET DEBUG_SYNC="before_undo_log_trx_id_write SIGNAL before_5 WAIT_FOR cont_5";
+UPDATE t_2_5 SET a=15;
+connection default;
+SET DEBUG_SYNC="now WAIT_FOR before_5";
+connect  con_2_6, localhost,root,,;
+BEGIN;
+SET DEBUG_SYNC="before_undo_log_trx_id_write SIGNAL before_6 WAIT_FOR cont_6";
+UPDATE t_2_6 SET a=15;
+connection default;
+SET DEBUG_SYNC="now WAIT_FOR before_6";
+connect  con_2_7, localhost,root,,;
+BEGIN;
+SET DEBUG_SYNC="before_undo_log_trx_id_write SIGNAL before_7 WAIT_FOR cont_7";
+UPDATE t_2_7 SET a=15;
+connection default;
+SET DEBUG_SYNC="now WAIT_FOR before_7";
+connect  con_2_8, localhost,root,,;
+BEGIN;
+SET DEBUG_SYNC="before_undo_log_trx_id_write SIGNAL before_8 WAIT_FOR cont_8";
+UPDATE t_2_8 SET a=15;
+connection default;
+SET DEBUG_SYNC="now WAIT_FOR before_8";
+connect  con_2_9, localhost,root,,;
+BEGIN;
+SET DEBUG_SYNC="before_undo_log_trx_id_write SIGNAL before_9 WAIT_FOR cont_9";
+UPDATE t_2_9 SET a=15;
+connection default;
+SET DEBUG_SYNC="now WAIT_FOR before_9";
+connection con_1_0;
+COMMIT;
+SET DEBUG_SYNC="now SIGNAL cont_0";
+SET DEBUG_SYNC="now WAIT_FOR after_0";
+# Kill and restart
+INSERT INTO t_2_1 SET a = 20;
+INSERT INTO t_2_1 SET a = 30;
+INSERT INTO t_2_1 SET a = 40;
+INSERT INTO t_2_1 SET a = 50;
+INSERT INTO t_2_1 SET a = 60;
+SET GLOBAL innodb_max_purge_lag_wait=0;
+DROP TABLE t_2_9;
+DROP TABLE t_2_8;
+DROP TABLE t_2_7;
+DROP TABLE t_2_6;
+DROP TABLE t_2_5;
+DROP TABLE t_2_4;
+DROP TABLE t_2_3;
+DROP TABLE t_2_2;
+DROP TABLE t_2_1;
+DROP TABLE t_1_0;
+DROP TABLE t_2_0;
diff --git a/mysql-test/suite/innodb/t/max_trx_no_recovery.test b/mysql-test/suite/innodb/t/max_trx_no_recovery.test
new file mode 100644
index 00000000000..3a2c2cfe1c8
--- /dev/null
+++ b/mysql-test/suite/innodb/t/max_trx_no_recovery.test
@@ -0,0 +1,135 @@
+--source include/have_innodb.inc
+# The embedded server tests do not support restarting.
+--source include/not_embedded.inc
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+
+--let transactions_count=10
+--let perl_inc_file=$MYSQL_TMP_DIR/max_trx_no_recovery.inc
+
+--let $i=$transactions_count
+# We need several tables to avoid blocking on records locking and pages latching
+while($i) {
+--dec $i
+if ($i == 0) {
+--eval CREATE TABLE t_1_$i(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0
+--eval INSERT INTO t_1_$i SET a = 10
+}
+--eval CREATE TABLE t_2_$i(a INT primary key) Engine=InnoDB STATS_PERSISTENT=0
+--eval INSERT INTO t_2_$i SET a = 10
+}
+--source include/wait_all_purged.inc
+
+--connect (prevent_purge,localhost,root,,)
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+
+# Let all the following redo logs will be pushed in the same rseg
+SET GLOBAL DEBUG_DBUG ="+d,assign_same_rseg";
+
+--connection default
+# Add the first undo log to the history of trx_sys.rseg_array[0] to fordbid
+# "if (auto len= flst_get_len(TRX_RSEG + TRX_RSEG_HISTORY + ...)" branch of
+# "trx_rseg_mem_restore()" to update rseg->needs_purge. Let trx_id and trx_no
+# of the following transaction is L and M correspondingly.
+UPDATE t_2_1 SET a=150;
+
+--connect (con_1_0, localhost,root,,)
+BEGIN;
+# After the following transaction the undo segment will contain the following
+# undo logs:
+# sn: 0, trx_id: L, trx_no: M
+# sn: 1, trx_id: N=M+1, trx_no: 0
+UPDATE t_1_0 SET a=15;
+--connect (con_2_0, localhost,root,,)
+BEGIN;
+# Stop the following "UPDATE" just before the undo log creating.
+SET DEBUG_SYNC="before_undo_log_trx_id_write SIGNAL before_0 WAIT_FOR cont_0";
+SET DEBUG_SYNC="after_undo_log_trx_id_write SIGNAL after_0";
+--send UPDATE t_2_0 SET a=15
+--connection con_1_0
+SET DEBUG_SYNC="now WAIT_FOR before_0";
+
+# The following trick with perl code, which generates mysqltest code, is applied
+# to bypass the restriction of mysqltest in substitution variable values in
+# connection names.
+--perl END_OF_FILE
+  use strict;
+  use warnings;
+  my $out_file = $ENV{'perl_inc_file'};
+  my $transactions_count = $ENV{'transactions_count'};
+  open (my $output, '>', $out_file) or die $!;
+  my $i = 1;
+  while ($i < $transactions_count) {
+    print $output
+      "--connect (con_2_$i, localhost,root,,)\n".
+      "BEGIN;\n".
+      "SET DEBUG_SYNC=\"before_undo_log_trx_id_write SIGNAL before_$i WAIT_FOR cont_$i\";\n".
+      "--send UPDATE t_2_$i SET a=15\n".
+      "--connection default\n".
+      "SET DEBUG_SYNC=\"now WAIT_FOR before_$i\";\n";
+      ++$i;
+  }
+  close $output;
+END_OF_FILE
+
+# The generated code starts rw transactions just to increase
+# trx_sys.m_max_trx_id by the number of started transactions S.
+--source $perl_inc_file
+--remove_file $perl_inc_file
+
+--connection con_1_0
+# After the following COMMIT and debug sync points the undo segment will contain
+# the following undo logs:
+# sn: 0, trx_id: L, trx_no: M
+# sn: 1, trx_id: N=M+1, trx_no: N+S
+# sn: 2, trx_id: N+1, trx_no: 0
+COMMIT;
+SET DEBUG_SYNC="now SIGNAL cont_0";
+SET DEBUG_SYNC="now WAIT_FOR after_0";
+
+--source include/kill_and_restart_mysqld.inc
+
+# The trx_no of the last undo log is 0 and it's in active state, that's why
+# the rseg->needs_purge is set to trx_id+1 = N+1+1 in
+# trx_undo_mem_create_at_db_start(). The trx_sys.m_max_trx_id is set to maximum
+# value of rseg->needs_purge among all rsegs + 1, i.e. for our case it's
+# N+1+1+1.
+#
+# After uncommitted transactions rolling back on recovery, the undo
+# segment will contain the following undo logs:
+# sn: 0, trx_id: L, trx_no: M
+# sn: 1, trx_id: N=M+1, trx_no: N+S
+# and
+# trx_sys.m_max_trx_id =
+#  N + 3(see above)
+#  + 1(row_merge_drop_temp_indexes())
+#  + 1(active transaction rollback)
+# So trx_sys.m_max_trx_id = N + 5.
+#
+# The trx_no of the last undo log in the above undo segment is N+S. In the case
+# if S > 5, the trx_no of one of the following transactions will be greater than
+# N + S, i.e. the trx_no of the last undo log in the undo segment.
+#
+# That is treated as error in purge thread, because purge queue is
+# min-heap of (trx_no, trx_sys.rseg_array index) pairs, where the key is trx_no,
+# and it must not be that trx_no of the last parsed undo log of a committed
+# transaction is greater than the last trx_no of the rseg at the top of
+# the queue.
+INSERT INTO t_2_1 SET a = 20;
+INSERT INTO t_2_1 SET a = 30;
+INSERT INTO t_2_1 SET a = 40;
+INSERT INTO t_2_1 SET a = 50;
+INSERT INTO t_2_1 SET a = 60;
+
+# Assertion ut_a(tail.trx_no <= last_trx_no) failures in
+# purge_sys_t::choose_next_log if the bug is not fixed.
+SET GLOBAL innodb_max_purge_lag_wait=0;
+
+--let $i=$transactions_count
+while($i) {
+--dec $i
+if ($i == 0) {
+--eval DROP TABLE t_1_$i
+}
+--eval DROP TABLE t_2_$i
+}
\ No newline at end of file
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
index 8418acdd64e..6c8fcda7350 100644
--- a/storage/innobase/trx/trx0trx.cc
+++ b/storage/innobase/trx/trx0trx.cc
@@ -808,6 +808,7 @@ static void trx_assign_rseg_low(trx_t *trx)
 	undo tablespaces that are scheduled for truncation. */
 	static Atomic_counter<unsigned>	rseg_slot;
 	unsigned slot = rseg_slot++ % TRX_SYS_N_RSEGS;
+	DBUG_EXECUTE_IF("assign_same_rseg", slot= 0;);
 	ut_d(const auto start_scan_slot = slot);
 	ut_d(bool look_for_rollover = false);
 	trx_rseg_t*	rseg;
@@ -820,6 +821,8 @@ static void trx_assign_rseg_low(trx_t *trx)
 			ut_ad(!look_for_rollover || start_scan_slot != slot);
 			ut_d(look_for_rollover = true);
 			slot = (slot + 1) % TRX_SYS_N_RSEGS;
+			DBUG_EXECUTE_IF("assign_same_rseg",
+				slot= (slot - 1) % TRX_SYS_N_RSEGS;);
 
 			if (!rseg->space) {
 				continue;
diff --git a/storage/innobase/trx/trx0undo.cc b/storage/innobase/trx/trx0undo.cc
index 1b60cad5e0b..593723dc044 100644
--- a/storage/innobase/trx/trx0undo.cc
+++ b/storage/innobase/trx/trx0undo.cc
@@ -1015,6 +1015,33 @@ corrupted_type:
 	case TRX_UNDO_ACTIVE:
 	case TRX_UNDO_PREPARED:
 		if (UNIV_LIKELY(type != 1)) {
+			/* The undo log of a previously committed
+			transaction that was logged in this page may
+			have trx_no greater than the trx_id of the
+			current undo log, because the trx_id of the
+			current transaction can be assigned before the
+			previous transaction is committed.
+
+			An undo page can contain several small
+			transactions when a TRX_UNDO_CACHED page is
+			being reused. Only the last (uncommitted)
+			transaction may lack a trx_no. By design, any
+			preceding transactions must be committed and
+			have a trx_no, and the last committed
+			transaction in the page must have the largest
+			trx_no. */
+			const uint16 prev_offset = mach_read_from_2(
+				undo_header + TRX_UNDO_PREV_LOG);
+			if (!prev_offset) {
+				break;
+			}
+			const trx_ulogf_t* const prev_undo_header=
+				block->page.frame + prev_offset;
+			const trx_id_t trx_no_prev = mach_read_from_8(
+				prev_undo_header + TRX_UNDO_TRX_NO);
+			if (trx_no_prev > trx_id) {
+				trx_no = trx_no_prev + 1;
+			}
 			break;
 		}
 		sql_print_error("InnoDB: upgrade from older version than"
@@ -1401,6 +1428,7 @@ trx_undo_assign_low(trx_t *trx, trx_rseg_t *rseg, trx_undo_t **undo,
 	);
 
 	*err = DB_SUCCESS;
+	DEBUG_SYNC_C("before_undo_log_trx_id_write");
 	rseg->latch.wr_lock(SRW_LOCK_CALL);
 	if (is_temp) {
 		ut_ad(!UT_LIST_GET_LEN(rseg->undo_cached));
@@ -1421,6 +1449,7 @@ got_block:
 
 func_exit:
 	rseg->latch.wr_unlock();
+	DEBUG_SYNC_C("after_undo_log_trx_id_write");
 	return block;
 }
 

From 6c2d2841d6799138f848222f4ccc7612a6365a9f Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Tue, 18 Nov 2025 12:51:09 +0200
Subject: [PATCH 036/119] Fix failing & wrong test galera.MDEV_35748

---
 mysql-test/include/check_connect.inc        | 6 ++++++
 mysql-test/suite/galera/r/MDEV-35748.result | 7 +------
 mysql-test/suite/galera/t/MDEV-35748.cnf    | 5 +++++
 mysql-test/suite/galera/t/MDEV-35748.opt    | 1 -
 mysql-test/suite/galera/t/MDEV-35748.test   | 4 ++--
 5 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 mysql-test/include/check_connect.inc
 create mode 100644 mysql-test/suite/galera/t/MDEV-35748.cnf
 delete mode 100644 mysql-test/suite/galera/t/MDEV-35748.opt

diff --git a/mysql-test/include/check_connect.inc b/mysql-test/include/check_connect.inc
new file mode 100644
index 00000000000..e34d3a4a0d1
--- /dev/null
+++ b/mysql-test/include/check_connect.inc
@@ -0,0 +1,6 @@
+# Check if connect engine is loaded and enabled
+
+if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'CONNECT' AND support IN ('YES', 'DEFAULT', 'ENABLED')`)
+{
+  --skip Test requires connect engine
+}
diff --git a/mysql-test/suite/galera/r/MDEV-35748.result b/mysql-test/suite/galera/r/MDEV-35748.result
index b39a1cdd1c2..1563ba0c085 100644
--- a/mysql-test/suite/galera/r/MDEV-35748.result
+++ b/mysql-test/suite/galera/r/MDEV-35748.result
@@ -1,7 +1,6 @@
 connection node_2;
 connection node_1;
 connection node_1;
-INSTALL PLUGIN IF NOT EXISTS connect SONAME 'ha_connect';
 CREATE TABLE t1 (f INT) ENGINE=CONNECT;
 Warnings:
 Warning	1105	No table_type. Will be set to DOS
@@ -15,10 +14,7 @@ Error	1235	This version of MariaDB doesn't yet support 'non-InnoDB sequences in
 Note	1235	ENGINE=SEQUENCE not supported by Galera
 connection node_2;
 show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f` int(11) DEFAULT NULL
-) ENGINE=CONNECT DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
+ERROR 42S02: Table 'test.t1' doesn't exist
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -28,4 +24,3 @@ show create table t3;
 ERROR 42S02: Table 'test.t3' doesn't exist
 connection node_1;
 DROP TABLE t1, t2;
-UNINSTALL PLUGIN IF EXISTS connect;
diff --git a/mysql-test/suite/galera/t/MDEV-35748.cnf b/mysql-test/suite/galera/t/MDEV-35748.cnf
new file mode 100644
index 00000000000..db2573d5f91
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-35748.cnf
@@ -0,0 +1,5 @@
+!include ../my.cnf
+
+[mysqld.1]
+plugin-load-add=@ENV.HA_CONNECT_SO
+loose-enable-connect
diff --git a/mysql-test/suite/galera/t/MDEV-35748.opt b/mysql-test/suite/galera/t/MDEV-35748.opt
deleted file mode 100644
index df675545bf9..00000000000
--- a/mysql-test/suite/galera/t/MDEV-35748.opt
+++ /dev/null
@@ -1 +0,0 @@
---plugin-load=$HA_ROCKSDB_SO
diff --git a/mysql-test/suite/galera/t/MDEV-35748.test b/mysql-test/suite/galera/t/MDEV-35748.test
index 0c0e83dcff7..b79c9350746 100644
--- a/mysql-test/suite/galera/t/MDEV-35748.test
+++ b/mysql-test/suite/galera/t/MDEV-35748.test
@@ -3,7 +3,7 @@
 --source include/have_rocksdb.inc
 
 --connection node_1
-INSTALL PLUGIN IF NOT EXISTS connect SONAME 'ha_connect';
+--source include/check_connect.inc
 
 CREATE TABLE t1 (f INT) ENGINE=CONNECT;
 CREATE TABLE t2 (f INT) ENGINE=ROCKSDB;
@@ -12,6 +12,7 @@ CREATE TABLE t3 (f INT) ENGINE=SEQUENCE;
 show warnings;
 
 --connection node_2
+--error ER_NO_SUCH_TABLE
 show create table t1;
 show create table t2;
 --error ER_NO_SUCH_TABLE
@@ -19,4 +20,3 @@ show create table t3;
 
 --connection node_1
 DROP TABLE t1, t2;
-UNINSTALL PLUGIN IF EXISTS connect;

From 79926f1c090e6e5e45b457814ab77e2bc4b94352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Wed, 19 Nov 2025 08:59:58 +0200
Subject: [PATCH 037/119] MDEV-36528 : Test failure on galera.mdev-22543

Test case changes only. Replace sleep with wait_condition
that makes sure that node_1 is still Donor after
node_2 has requested SST and is actually stuck on
debug sync wait.
---
 mysql-test/suite/galera/r/mdev-22543.result | 6 ++++++
 mysql-test/suite/galera/t/mdev-22543.test   | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mysql-test/suite/galera/r/mdev-22543.result b/mysql-test/suite/galera/r/mdev-22543.result
index 9386b7405d4..c4b32b5aece 100644
--- a/mysql-test/suite/galera/r/mdev-22543.result
+++ b/mysql-test/suite/galera/r/mdev-22543.result
@@ -11,9 +11,15 @@ connection node_1_ctrl;
 SET DEBUG_SYNC = "now WAIT_FOR sync_point_reached";
 connection node_2;
 connection node_1_ctrl;
+# Node should be in Donor/Desynced state as node_2 has not yet joined
+SHOW STATUS LIKE 'wsrep_local_state_comment';
+Variable_name	Value
+wsrep_local_state_comment	Donor/Desynced
 SET DEBUG_SYNC = "now SIGNAL sync_point_continue";
 connection node_1;
 SET DEBUG_SYNC = "RESET";
 connection node_2;
 connection node_1;
 DROP TABLE t1;
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera/t/mdev-22543.test b/mysql-test/suite/galera/t/mdev-22543.test
index 26257b28814..fde2655b40a 100644
--- a/mysql-test/suite/galera/t/mdev-22543.test
+++ b/mysql-test/suite/galera/t/mdev-22543.test
@@ -39,9 +39,12 @@ SET DEBUG_SYNC = "now WAIT_FOR sync_point_reached";
 --write_line "restart:$start_mysqld_params" $_expect_file_name
 # If the bug is present, FTWRL times out on node_1 in couple of
 # seconds and node_2 fails to join.
---sleep 10
 
 --connection node_1_ctrl
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment' and VARIABLE_VALUE = 'Donor/Desynced'
+--source include/wait_condition.inc
+--echo # Node should be in Donor/Desynced state as node_2 has not yet joined
+SHOW STATUS LIKE 'wsrep_local_state_comment';
 SET DEBUG_SYNC = "now SIGNAL sync_point_continue";
 
 --connection node_1
@@ -56,3 +59,4 @@ SET DEBUG_SYNC = "RESET";
 DROP TABLE t1;
 
 --source include/auto_increment_offset_restore.inc
+--source include/galera_end.inc

From 7a1ad32118a13d35c5f57d09872a622a548e7916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Wed, 19 Nov 2025 09:22:08 +0200
Subject: [PATCH 038/119] MDEV-37986 : Test failure on
 galera.galera_provider_options_long

Test configuration fixes only. Test failed because SSL-configuration
was incorrect and was missing ssl_ca parameter. Fixed by adding
correct SSL-configuration.
---
 mysql-test/suite/galera/t/galera_provider_options_long.cnf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/suite/galera/t/galera_provider_options_long.cnf b/mysql-test/suite/galera/t/galera_provider_options_long.cnf
index ee8c6e590f4..b7baff62708 100644
--- a/mysql-test/suite/galera/t/galera_provider_options_long.cnf
+++ b/mysql-test/suite/galera/t/galera_provider_options_long.cnf
@@ -5,7 +5,7 @@ loose-galera-ssl-upgrade=1
 wsrep-debug=1
 
 [mysqld.1]
-wsrep_provider_options='socket.ssl=yes;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/galera-cert.pem;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/galera-key.pem;repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;pc.wait_prim_timeout=PT60S;gcache.size=10M'
+wsrep_provider_options='socket.ssl=yes;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/server-cert.pem;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/server-key.pem;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem;repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;pc.wait_prim_timeout=PT60S;gcache.size=10M'
 
 [mysqld.2]
-wsrep_provider_options='socket.ssl=yes;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/galera-cert.pem;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/galera-key.pem;repl.causal_read_timeout=PT90S;base_port=@mysqld.2.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;pc.wait_prim_timeout=PT60S;gcache.size=10M'
+wsrep_provider_options='socket.ssl=yes;socket.ssl_cert=@ENV.MYSQL_TEST_DIR/std_data/server-cert.pem;socket.ssl_key=@ENV.MYSQL_TEST_DIR/std_data/server-key.pem;socket.ssl_ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem;repl.causal_read_timeout=PT90S;base_port=@mysqld.2.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;pc.wait_prim_timeout=PT60S;gcache.size=10M'

From 6737d68a8e7440f1b71e347a73f5e7446fb0ba9b Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Wed, 5 Nov 2025 11:48:07 +0200
Subject: [PATCH 039/119] MDEV-32266 All queries in stored procedures increment
 empty_queries counter

Fixed by setting server_status SERVER_STATUS_RETURNED_ROW if send_data
is called for stored procedures.

This make the definition of Empty_queries well defined:
"Empty_queries" is the number of SELECT queries that returns 0 rows.
---
 include/mysql_com.h         | 10 ++++++++-
 mysql-test/main/show.result | 44 +++++++++++++++++++++++++++++++++++++
 mysql-test/main/show.test   | 42 +++++++++++++++++++++++++++++++++++
 sql/sql_class.cc            |  5 +++++
 sql/sql_parse.cc            |  9 ++++++--
 5 files changed, 107 insertions(+), 3 deletions(-)

diff --git a/include/mysql_com.h b/include/mysql_com.h
index 28627e38364..31d888c7052 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -422,6 +422,13 @@ enum mariadb_field_attr_t
 
 #define SERVER_STATUS_ANSI_QUOTES       32768U
 
+/*
+  Set for stored procedures if the select query returned a row
+  To check for an empty query, one must also check thd::get_sent_row_count()
+*/
+
+#define SERVER_STATUS_RETURNED_ROW      (1U << 16)
+
 /**
   Server status flags that must be cleared when starting
   execution of a new SQL statement.
@@ -438,7 +445,8 @@ enum mariadb_field_attr_t
                                  SERVER_STATUS_DB_DROPPED |\
                                  SERVER_STATUS_CURSOR_EXISTS|\
                                  SERVER_STATUS_LAST_ROW_SENT|\
-                                 SERVER_SESSION_STATE_CHANGED)
+                                 SERVER_SESSION_STATE_CHANGED|\
+                                 SERVER_STATUS_RETURNED_ROW)
 
 #define MYSQL_ERRMSG_SIZE	512
 #define NET_READ_TIMEOUT	30		/* Timeout on read */
diff --git a/mysql-test/main/show.result b/mysql-test/main/show.result
index f03fb6f6e4b..f0ceff52bd5 100644
--- a/mysql-test/main/show.result
+++ b/mysql-test/main/show.result
@@ -98,4 +98,48 @@ SHOW STATUS LIKE "Empty_queries";
 Variable_name	Value
 Empty_queries	2
 DROP TABLE t1, t2;
+#
+# MDEV-32266 All queries in stored procedures increment empty_queries counter
+#
+show status like "Empty_queries";
+Variable_name	Value
+Empty_queries	2
+CREATE TABLE t1 (id INT);
+insert into t1 values (1),(2);
+CREATE PROCEDURE proc1 (OUT cnt INT, id_var int)
+BEGIN
+SELECT COUNT(*) INTO cnt FROM t1 where id=id_var;
+END$$
+CREATE PROCEDURE proc2 (id_var int)
+BEGIN
+declare cnt int;
+SELECT id INTO cnt FROM t1 where id=id_var;
+END$$
+create function f1(x int) returns int return (x in ((select id from t1 where id <= 4)));
+flush status;
+show status like "Empty_queries";
+Variable_name	Value
+Empty_queries	0
+CALL proc1(@cnt,1);
+CALL proc1(@cnt,3);
+CALL proc2(1);
+select f1(1);
+f1(1)
+1
+select f1(8);
+f1(8)
+0
+show status like "Empty_queries";
+Variable_name	Value
+Empty_queries	0
+CALL proc2(4);
+Warnings:
+Warning	1329	No data - zero rows fetched, selected, or processed
+show status like "Empty_queries";
+Variable_name	Value
+Empty_queries	1
+drop procedure proc1;
+drop procedure proc2;
+drop function f1;
+drop table t1;
 # End of 10.11 tests
diff --git a/mysql-test/main/show.test b/mysql-test/main/show.test
index 27b7ab39b0b..4e793eca564 100644
--- a/mysql-test/main/show.test
+++ b/mysql-test/main/show.test
@@ -92,4 +92,46 @@ SHOW STATUS LIKE "Empty_queries";
 
 DROP TABLE t1, t2;
 
+--echo #
+--echo # MDEV-32266 All queries in stored procedures increment empty_queries counter
+--echo #
+
+show status like "Empty_queries";
+
+CREATE TABLE t1 (id INT);
+insert into t1 values (1),(2);
+
+DELIMITER $$;
+CREATE PROCEDURE proc1 (OUT cnt INT, id_var int)
+BEGIN
+SELECT COUNT(*) INTO cnt FROM t1 where id=id_var;
+END$$
+CREATE PROCEDURE proc2 (id_var int)
+BEGIN
+declare cnt int;
+SELECT id INTO cnt FROM t1 where id=id_var;
+END$$
+DELIMITER ;$$
+create function f1(x int) returns int return (x in ((select id from t1 where id <= 4)));
+
+flush status;
+show status like "Empty_queries";
+
+# These should not increase empty queries
+CALL proc1(@cnt,1);
+CALL proc1(@cnt,3);
+CALL proc2(1);
+select f1(1);
+select f1(8);
+show status like "Empty_queries";
+
+# These should increase empty queries
+CALL proc2(4);
+show status like "Empty_queries";
+
+drop procedure proc1;
+drop procedure proc2;
+drop function f1;
+drop table t1;
+
 --echo # End of 10.11 tests
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 0b155f9de9a..5c4b3d8cc0a 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -3475,6 +3475,7 @@ int select_export::send_data(List<Item> &items)
   tmp.length(0);
 
   row_count++;
+  thd->server_status|= SERVER_STATUS_RETURNED_ROW;
   Item *item;
   uint used_length=0,items_left=items.elements;
   List_iterator_fast<Item> li(items);
@@ -3746,6 +3747,7 @@ int select_dump::send_data(List<Item> &items)
       goto err;
     }
   }
+  thd->server_status|= SERVER_STATUS_RETURNED_ROW;
   DBUG_RETURN(0);
 err:
   DBUG_RETURN(1);
@@ -4346,6 +4348,7 @@ bool select_dumpvar::send_data_to_var_list(List<Item> &items)
     if (mv->set(thd, item))
       DBUG_RETURN(true);
   }
+  thd->server_status|= SERVER_STATUS_RETURNED_ROW;
   DBUG_RETURN(false);
 }
 
@@ -4365,6 +4368,7 @@ int select_dumpvar::send_data(List<Item> &items)
       send_data_to_var_list(items))
     DBUG_RETURN(1);
 
+  thd->server_status|= SERVER_STATUS_RETURNED_ROW;
   DBUG_RETURN(thd->is_error());
 }
 
@@ -4464,6 +4468,7 @@ int select_materialize_with_stats::send_data(List<Item> &items)
     return 0;
 
   ++count_rows;
+  thd->server_status|= SERVER_STATUS_RETURNED_ROW;
 
   while ((cur_item= item_it++))
   {
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 65c38818c83..1f34b30e110 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -6480,8 +6480,13 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
       }
     }
   }
-  /* Count number of empty select queries */
-  if (!thd->is_cursor_execution() && !thd->get_sent_row_count() && !res)
+  /*
+    Count number of empty select queries.
+    is_cursor_execution is used to handle opening of cursor.
+    For cursors, Empty_queries will be set when using the cursor.
+   */
+  if (unlikely(!thd->get_sent_row_count() && !thd->is_cursor_execution() &&
+               !(thd->server_status & SERVER_STATUS_RETURNED_ROW) && !res))
     status_var_increment(thd->status_var.empty_queries);
   else
     status_var_add(thd->status_var.rows_sent, thd->get_sent_row_count());

From e168384abeb59802e8a0d38609930c94e2a269e0 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Wed, 19 Nov 2025 13:28:41 +0200
Subject: [PATCH 040/119] Fixed that perfschema.misc_session_status is ignored
 with valgrind builds

---
 mariadb-plugin-columnstore.install.generated           | 1 +
 mysql-test/suite/perfschema/t/misc_session_status.test | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 mariadb-plugin-columnstore.install.generated

diff --git a/mariadb-plugin-columnstore.install.generated b/mariadb-plugin-columnstore.install.generated
new file mode 100644
index 00000000000..d987525f2a6
--- /dev/null
+++ b/mariadb-plugin-columnstore.install.generated
@@ -0,0 +1 @@
+#File is generated by ColumnstoreLibrary.cmake, do not edit
diff --git a/mysql-test/suite/perfschema/t/misc_session_status.test b/mysql-test/suite/perfschema/t/misc_session_status.test
index f32896d6077..6d7d0c0ac1a 100644
--- a/mysql-test/suite/perfschema/t/misc_session_status.test
+++ b/mysql-test/suite/perfschema/t/misc_session_status.test
@@ -1,7 +1,7 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 --source include/not_msan.inc
---source include/not_valgrind.inc
+--source include/not_valgrind_build.inc
 # This does not crash on 32 bit because of less memory used
 --source include/have_64bit.inc
 --echo #

From 6944e2be6d79d53fe52a613e5b7bf8eaf00554ce Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Tue, 18 Nov 2025 12:52:32 +0200
Subject: [PATCH 041/119] Add mariadb-plugin-columnstore.install.generated to
 .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index adcf9a90245..342a31c02ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ Docs/INFO_BIN
 Docs/INFO_SRC
 Makefile
 TAGS
+mariadb-plugin-columnstore.install.generated
 Testing/
 tmp/
 VERSION.dep

From 442a7f1e731f51235331f664070dd06b1b07a44e Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Wed, 19 Nov 2025 12:48:43 +0200
Subject: [PATCH 042/119] MDEV-38130 Add Option File Syntax '?' to ignore
 unreadable directories

This is useful if one has MariaDB config files in /etc that should only be
visible for the super user and the MariaDB server but one still want to
provide options for normal users, like skip-ssl.
---
 mysys/my_default.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/mysys/my_default.c b/mysys/my_default.c
index 0b50235aa69..5e7b1bb3fca 100644
--- a/mysys/my_default.c
+++ b/mysys/my_default.c
@@ -39,6 +39,8 @@
 #include <m_string.h>
 #include <m_ctype.h>
 #include <my_dir.h>
+#include <errno.h>
+#include <mysys_err.h>
 #ifdef _WIN32
 #include <winbase.h>
 #endif
@@ -676,8 +678,9 @@ static int search_default_file_with_ext(struct handle_option_ctx *ctx,
       continue;
 
     /* Configuration File Directives */
-    if (*ptr == '!')
+    if (*ptr == '!' || *ptr == '?')
     {
+      my_bool ignore_permissions= *ptr == '?';
       if (recursion_level >= max_recursion_level)
       {
         for (end= ptr + strlen(ptr) - 1; 
@@ -705,9 +708,17 @@ static int search_default_file_with_ext(struct handle_option_ctx *ctx,
                                 ptr, name, line)))
 	  goto err;
 
-        if (!(search_dir= my_dir(ptr, MYF(MY_WME | MY_WANT_SORT))))
+        if (!(search_dir= my_dir(ptr, MYF(ignore_permissions ? MY_WANT_SORT :
+                                          MY_WME | MY_WANT_SORT))))
+        {
+          if (ignore_permissions)
+          {
+            if (my_errno == EACCES)
+            continue;                           /* Ignore error */
+            my_error(EE_DIR, MYF(ME_BELL), ptr);
+          }
           goto err;
-
+        }
         for (i= 0; i < search_dir->number_of_files; i++)
         {
           search_file= search_dir->dir_entry + i;

From 27f55ad9080bce064156bb6e8edf82fe8c2d8114 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Wed, 19 Nov 2025 15:14:05 +0200
Subject: [PATCH 043/119] Fixed uninitalized memory used error with rpl_gtid

THD::m_last_commit_gtid was not fully intialized, which caused valgrind
warnings when creating a hash of domains.

Fixed by initialzing all members of m_last_commit_gtid
---
 sql/sql_class.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index cdf8ef9e468..4dde96a1f1b 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -1387,7 +1387,7 @@ void THD::init()
   bzero((char *) &org_status_var, sizeof(org_status_var));
   status_in_global= 0;
   start_bytes_received= 0;
-  m_last_commit_gtid.seq_no= 0;
+  bzero(&m_last_commit_gtid, sizeof(m_last_commit_gtid));
   last_stmt= NULL;
   /* Reset status of last insert id */
   arg_of_last_insert_id_function= FALSE;

From b2f6216695bed0e5f18028a7e89d492cd29728c4 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Wed, 19 Nov 2025 12:00:48 +0200
Subject: [PATCH 044/119] MDEV-37808 "Local temporary space limit reached" on
 not so rare occasions

This bug happens when using galera, max_tmp_session_space_usage and a
transaction that uses temporary file of a size between 'binlog-cache-size'
(default 32K) and 64K followed by a change user command.

In the case of a transaction of size between 32k and 64k, the server don't
truncate the binary log file on disk to speed up things, which is fine.

The bug was that change_user() reset the tmp_space_used variable and the
next time the temporary_file was truncated, we got a negative value for
tmp_space_used, which caused the error "Local temporary space limit
reached".

Fixed by not resetting tmp_space_used in init(), which is called by
change_user().

Other things
- Truncate binary log cache files when change_user() is called. This
  makes the new users session not depending on log file sizes by previous
  user.
- Some new ASSERT and DBUG_ENTER
- Fixed typo in DBUG output in ma_pagecache.c
---
 .../suite/galera/r/tmp_space_usage.result     | 29 ++++++++++++++++
 .../suite/galera/t/tmp_space_usage.test       | 33 +++++++++++++++++++
 mysys/mf_iocache.c                            | 16 ++++++---
 sql/log.cc                                    | 10 ++++++
 sql/log.h                                     |  1 +
 sql/log_cache.h                               |  9 ++++-
 sql/sql_class.cc                              |  8 +++++
 sql/sql_class.h                               | 27 ++++++++++-----
 storage/maria/ma_pagecache.c                  |  2 +-
 9 files changed, 120 insertions(+), 15 deletions(-)
 create mode 100644 mysql-test/suite/galera/r/tmp_space_usage.result
 create mode 100644 mysql-test/suite/galera/t/tmp_space_usage.test

diff --git a/mysql-test/suite/galera/r/tmp_space_usage.result b/mysql-test/suite/galera/r/tmp_space_usage.result
new file mode 100644
index 00000000000..a995a728242
--- /dev/null
+++ b/mysql-test/suite/galera/r/tmp_space_usage.result
@@ -0,0 +1,29 @@
+connection node_2;
+connection node_1;
+#
+# MDEV-37808 "Local temporary space limit reached" on not so rare
+# occasions
+#
+connection node_1;
+set @@max_tmp_session_space_usage=1024*1024*1024;
+create user foo;
+grant all privileges on *.* to foo;
+use test;
+create table t1(a int, b varchar(1024)) engine=innodb;
+insert into t1 select seq, repeat("a", 500) from seq_1_to_100;
+create table t2(a int, b varchar(1024)) engine=myisam;
+insert into t2 select seq, repeat("a", 500) from seq_1_to_100;
+show status like "%tmp_space%";
+Variable_name	Value
+Max_tmp_space_used	102054
+Tmp_space_used	102054
+use test;
+select count(*) from t1;
+count(*)
+100
+show status like "%tmp_space%";
+Variable_name	Value
+Max_tmp_space_used	102054
+Tmp_space_used	0
+drop table t1,t2;
+drop user foo;
diff --git a/mysql-test/suite/galera/t/tmp_space_usage.test b/mysql-test/suite/galera/t/tmp_space_usage.test
new file mode 100644
index 00000000000..5c34910c680
--- /dev/null
+++ b/mysql-test/suite/galera/t/tmp_space_usage.test
@@ -0,0 +1,33 @@
+--source include/galera_cluster.inc
+--source include/have_sequence.inc
+--source include/have_log_bin.inc
+--source include/have_binlog_format_row.inc
+
+--echo #
+--echo # MDEV-37808 "Local temporary space limit reached" on not so rare
+--echo # occasions
+--echo #
+
+--connection node_1
+
+set @@max_tmp_session_space_usage=1024*1024*1024;
+
+create user foo;
+grant all privileges on *.* to foo;
+
+use test;
+create table t1(a int, b varchar(1024)) engine=innodb;
+insert into t1 select seq, repeat("a", 500) from seq_1_to_100;
+create table t2(a int, b varchar(1024)) engine=myisam;
+insert into t2 select seq, repeat("a", 500) from seq_1_to_100;
+
+show status like "%tmp_space%";
+
+change_user foo;
+use test;
+select count(*) from t1;
+show status like "%tmp_space%";
+
+drop table t1,t2;
+change_user root;
+drop user foo;
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index 7afe3400dd6..8b35ec953dc 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -76,6 +76,7 @@ int (*_my_b_encr_write)(IO_CACHE *info,const uchar *Buffer,size_t Count)= 0;
 
 static inline my_bool tmp_file_track(IO_CACHE *info, ulonglong file_size)
 {
+  DBUG_ENTER("tmp_file_track");
   if ((info->myflags & (MY_TRACK | MY_TRACK_WITH_LIMIT)) &&
       update_tmp_file_size)
   {
@@ -90,11 +91,11 @@ static inline my_bool tmp_file_track(IO_CACHE *info, ulonglong file_size)
         if (info->myflags & MY_WME)
           my_error(error, MYF(0));
         info->error= -1;
-        return 1;
+        DBUG_RETURN(1);
       }
     }
   }
-  return 0;
+  DBUG_RETURN(0);
 }
 
 my_bool io_cache_tmp_file_track(IO_CACHE *info, ulonglong file_size)
@@ -122,7 +123,8 @@ static void reset_tracking_io_cache(IO_CACHE *info)
 
 void truncate_io_cache(IO_CACHE *info)
 {
-  if (my_chsize(info->file, 0, 0, MYF(MY_WME)) == 0)
+  if (mysql_file_seek(info->file, 0L, MY_SEEK_END, MYF(0)) != 0 &&
+      my_chsize(info->file, 0, 0, MYF(MY_WME)) == 0)
     reset_tracking_io_cache(info);
 }
 
@@ -1849,7 +1851,7 @@ int end_io_cache(IO_CACHE *info)
 {
   int error=0;
   DBUG_ENTER("end_io_cache");
-  DBUG_PRINT("enter",("cache: %p", info));
+  DBUG_PRINT("enter",("cache: %p  file: %d", info, info->file));
 
   /*
     Every thread must call remove_io_thread(). The last one destroys
@@ -1870,12 +1872,18 @@ int end_io_cache(IO_CACHE *info)
     /* Destroy allocated mutex */
     mysql_mutex_destroy(&info->append_buffer_lock);
   }
+  /*
+    We have to call reset_tracking_io_cache() also in case of file == -1
+    because close_cached_file() sets file to -1 to avoid flushing
+  */
   reset_tracking_io_cache(info);
   info->share= 0;
   info->type= TYPE_NOT_SET; /* Ensure that flush_io_cache() does nothing */
   info->write_end= 0;       /* Ensure that my_b_write() fails */
   info->write_function= 0;  /* my_b_write will crash if used */
 
+  DBUG_ASSERT(info->tracking.file_size == 0 &&
+              info->tracking.previous_file_size == 0);
   DBUG_RETURN(error);
 } /* end_io_cache */
 
diff --git a/sql/log.cc b/sql/log.cc
index 0b56492296f..7350e986738 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -509,6 +509,12 @@ public:
       last_commit_pos_offset= 0;
     }
   }
+  /* Truncate temporary files if needed. Used with change_user */
+  void truncate_tmp_files()
+  {
+    stmt_cache.truncate_cache_file();
+    trx_cache.truncate_cache_file();
+  }
 
   binlog_cache_data* get_binlog_cache_data(bool is_transactional)
   {
@@ -6923,6 +6929,10 @@ int binlog_flush_pending_rows_event(THD *thd, bool stmt_end,
   return error;
 }
 
+void binlog_truncate_tmp_files(binlog_cache_mngr *cache_mngr)
+{
+  cache_mngr->truncate_tmp_files();
+}
 
 /*
   Check if there are pending row events in the binlog cache
diff --git a/sql/log.h b/sql/log.h
index d44bcd7ccee..5007bd149a1 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -1412,6 +1412,7 @@ int binlog_flush_pending_rows_event(THD *thd, bool stmt_end,
                                     bool is_transactional,
                                     Event_log *bin_log,
                                     binlog_cache_data *cache_data);
+void binlog_truncate_tmp_files(binlog_cache_mngr *cache_mngr);
 Rows_log_event* binlog_get_pending_rows_event(binlog_cache_mngr *cache_mngr,
                                               bool use_trans_cache);
 int online_alter_log_row(TABLE* table, const uchar *before_record,
diff --git a/sql/log_cache.h b/sql/log_cache.h
index 7115f44120d..a66080ca4ef 100644
--- a/sql/log_cache.h
+++ b/sql/log_cache.h
@@ -131,6 +131,13 @@ public:
     DBUG_ASSERT(empty());
   }
 
+  void truncate_cache_file()
+  {
+    DBUG_ASSERT(empty());
+    if (cache_log.file != -1)
+      truncate_io_cache(&cache_log);
+  }
+
   my_off_t get_byte_position() const
   {
     DBUG_ASSERT(cache_log.type == WRITE_CACHE);
@@ -358,7 +365,7 @@ private:
 
   /*
     It truncates the cache to a certain position. This includes deleting the
-    pending event.
+    pending event. Note that file size does not change.
    */
   void truncate(my_off_t pos, bool reset_cache=0)
   {
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 4dde96a1f1b..7a6e7073973 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -799,6 +799,7 @@ THD::THD(my_thread_id id, bool is_wsrep_applier)
   status_var.local_memory_used= sizeof(THD);
   status_var.max_local_memory_used= status_var.local_memory_used;
   status_var.global_memory_used= 0;
+  status_var.tmp_space_used= 0;
   variables.pseudo_thread_id= thread_id;
   variables.max_mem_used= global_system_variables.max_mem_used;
   main_da.init();
@@ -916,6 +917,7 @@ THD::THD(my_thread_id id, bool is_wsrep_applier)
   reset_open_tables_state();
 
   init();
+
   debug_sync_init_thread(this);
 #if defined(ENABLED_PROFILING)
   profiling.set_thd(this);
@@ -1383,6 +1385,7 @@ void THD::init()
   reset_binlog_local_stmt_filter();
   /* local_memory_used was setup in THD::THD() */
   set_status_var_init(clear_for_new_connection);
+  status_var.max_tmp_space_used= status_var.tmp_space_used; // Should be 0
   status_var.max_local_memory_used= status_var.local_memory_used;
   bzero((char *) &org_status_var, sizeof(org_status_var));
   status_in_global= 0;
@@ -1574,6 +1577,7 @@ void THD::change_user(void)
                HASH_THREAD_SPECIFIC);
   sp_caches_clear();
   opt_trace.delete_traces();
+  binlog_truncate_tmp_files();
 }
 
 /**
@@ -1730,6 +1734,7 @@ void THD::cleanup(void)
 
 void THD::free_connection()
 {
+  DBUG_ENTER("free_connection");
   DBUG_ASSERT(free_connection_done == 0);
   my_free(const_cast<char*>(db.str));
   db= null_clex_str;
@@ -1756,6 +1761,9 @@ void THD::free_connection()
   profiling.restart();                          // Reset profiling
 #endif
   debug_sync_reset_thread(this);
+  DBUG_ASSERT(status_var.tmp_space_used == 0 ||
+              !debug_assert_on_not_freed_memory);
+  DBUG_VOID_RETURN;
 }
 
 /*
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 37ce08512ff..0a2e6f690ce 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1091,13 +1091,15 @@ typedef struct system_status_var
   double last_query_cost;
   uint32 threads_running;
 
-  /* Following variables are not cleared by FLUSH STATUS */
+  /* Memory used by internal temporary tables and on disk transaction cache */
   ulonglong max_tmp_space_used;
   /* Memory used for thread local storage */
   int64 max_local_memory_used;
-  /* Don't copy variables back to THD after this in show status */
+  /*
+    Following variables are not cleared by FLUSH STATUS
+    Don't copy them back to THD after show status
+  */
   ulonglong tmp_space_used;
-  /* Don't reset variables after this */
   volatile int64 local_memory_used;
   /* Memory allocated for global usage */
   volatile int64 global_memory_used;
@@ -1116,12 +1118,12 @@ typedef struct system_status_var
 
 #define STATUS_OFFSET(A) offsetof(STATUS_VAR,A)
 /* Clear as part of flush */
-#define clear_for_flush_status      STATUS_OFFSET(tmp_space_used)
-/* Clear as part of startup */
-#define clear_for_new_connection         STATUS_OFFSET(local_memory_used)
+#define clear_for_flush_status           STATUS_OFFSET(tmp_space_used)
+/* Clear as part of a new connection and reuse connection */
+#define clear_for_new_connection         STATUS_OFFSET(max_tmp_space_used)
 /* Full initialization. Note that global_memory_used is updated early! */
-#define clear_for_server_start  STATUS_OFFSET(global_memory_used)
-#define last_restored_status_var        clear_for_flush_status
+#define clear_for_server_start           STATUS_OFFSET(global_memory_used)
+#define last_restored_status_var         clear_for_flush_status
 
 
 /** Number of contiguous global status variables */
@@ -3369,7 +3371,7 @@ public:
   {
     if (!log_current_statement())
       return false;
-    auto *cache_mngr= binlog_get_cache_mngr();
+    binlog_cache_mngr *cache_mngr= binlog_get_cache_mngr();
     if (!cache_mngr)
       return true;
     return !binlog_get_pending_rows_event(cache_mngr,
@@ -3379,6 +3381,13 @@ public:
 
   bool binlog_for_noop_dml(bool transactional_table);
 
+  void binlog_truncate_tmp_files()
+  {
+    binlog_cache_mngr *cache_mngr= binlog_get_cache_mngr();
+    if (cache_mngr)
+      ::binlog_truncate_tmp_files(cache_mngr);
+  }
+
   /**
     Determine the binlog format of the current statement.
 
diff --git a/storage/maria/ma_pagecache.c b/storage/maria/ma_pagecache.c
index 1e70a23c2dc..20907489cb4 100644
--- a/storage/maria/ma_pagecache.c
+++ b/storage/maria/ma_pagecache.c
@@ -5232,7 +5232,7 @@ int flush_pagecache_blocks_with_filter(PAGECACHE *pagecache,
 {
   int res;
   DBUG_ENTER("flush_pagecache_blocks_with_filter");
-  DBUG_PRINT("enter", ("pagecache: %p  fd: %di", pagecache, file->file));
+  DBUG_PRINT("enter", ("pagecache: %p  fd: %d", pagecache, file->file));
 
   if (pagecache->disk_blocks <= 0)
     DBUG_RETURN(0);

From 0f5e5ced376f8904cb3822525b60feba9f5f9105 Mon Sep 17 00:00:00 2001
From: Brandon Nesterenko <brandon.nesterenko@mariadb.com>
Date: Wed, 15 Oct 2025 14:29:08 -0600
Subject: [PATCH 045/119] MDEV-37662: Binlog Corruption When tmpdir is Full

The binary log could be corrupted when committing a large transaction
(i.e. one whose data exceeds the binlog_cache_size limit and spills
into a tmp file) in binlog_format=row if the server's --tmp-dir is
full. The corruption that happens is only the GTID of the errored
transaction would be written into the binary log, without any
body/finalizing events.  This would happen because the content of the
transaction wasn't flushed at the proper time, and the transaction's
binlog cache data was not durable while trying to copy the content
from the binlog cache file into the binary log itself. While switching
the tmp file from a WRITE_CACHE to a READ_CACHE, the server would see
there is still data to flush in the cache, and first try to flush it.
This is not a valid time to flush that data to the temporary file
though, as:

  1. The GTID event has already been written directly to the binary
     log. So if this flushing fails, it leaves the binary log in a
     corrupted state.

  2. This is done during group commit, and will slow down other
     concurrent transactions, which are otherwise ready to commit.

This patch fixes these issues by ensuring all transaction data is
fully flushed to its temporary file (if used) before starting any
critical paths, i.e. in binlog_flush_cache(). Note that if the binlog
cache is solely in-memory, this flush-to-temporary-file is skipped.

Reviewed-by: Andrei Elkin <andrei.elkin@mariadb.com>
Signed-off-by: Brandon Nesterenko <brandon.nesterenko@mariadb.com>
---
 ...pl_row_binlog_tmp_file_flush_enospc.result | 39 +++++++++
 .../rpl_row_binlog_tmp_file_flush_enospc.test | 64 ++++++++++++++
 mysys/my_write.c                              |  1 +
 sql/log.cc                                    | 85 +++++++++++++++++--
 4 files changed, 181 insertions(+), 8 deletions(-)
 create mode 100644 mysql-test/suite/rpl/r/rpl_row_binlog_tmp_file_flush_enospc.result
 create mode 100644 mysql-test/suite/rpl/t/rpl_row_binlog_tmp_file_flush_enospc.test

diff --git a/mysql-test/suite/rpl/r/rpl_row_binlog_tmp_file_flush_enospc.result b/mysql-test/suite/rpl/r/rpl_row_binlog_tmp_file_flush_enospc.result
new file mode 100644
index 00000000000..91e4c7f8e31
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_row_binlog_tmp_file_flush_enospc.result
@@ -0,0 +1,39 @@
+include/master-slave.inc
+[connection master]
+connection master;
+set @old_binlog_cache_size= @@global.binlog_cache_size;
+set @@global.binlog_cache_size=4096;
+CALL mtr.add_suppression('Error writing file');
+#
+# Initialize test data
+connection master;
+create table t1 (a int, b longtext default NULL) engine=innodb;
+#
+# Create transaction with cache data larger than the binlog_cache_size
+# so it spills into a tmp file, then simulate ENOSPC while flushing
+# the tmp file.
+#
+set @@session.debug_dbug="+d,simulate_binlog_tmp_file_no_space_left_on_flush";
+insert into t1 values (2, repeat("y", 8192));
+ERROR HY000: Error writing file '.../tmp/<FILENAME>' (Errcode: 28 "No space left on device")
+set @@session.debug_dbug="";
+#
+# Create another transaction to make sure the server/replication can
+# continue working normally after the error
+#
+insert into t1 values (3, repeat("z", 8192));
+include/save_master_gtid.inc
+connection slave;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [master:test.t1,slave:test.t1]
+#
+# Cleanup
+connection master;
+drop table t1;
+include/save_master_gtid.inc
+connection slave;
+include/sync_with_master_gtid.inc
+connection master;
+set @@global.binlog_cache_size= @old_binlog_cache_size;
+include/rpl_end.inc
+# End of rpl_row_binlog_tmp_file_flush_enospc.test
diff --git a/mysql-test/suite/rpl/t/rpl_row_binlog_tmp_file_flush_enospc.test b/mysql-test/suite/rpl/t/rpl_row_binlog_tmp_file_flush_enospc.test
new file mode 100644
index 00000000000..d9cc4fa6ef9
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_binlog_tmp_file_flush_enospc.test
@@ -0,0 +1,64 @@
+#
+# This test ensures that a large transaction (i.e. one whose data exceeds the
+# binlog_cache_size limit and spills into a tmp file) that errors while
+# flushing the tmp file (e.g. due to no space on disk) does not corrupt the
+# binlog, and that the server/replication can continue working normally after
+# the error. To simulate the error, the test uses debug_dbug to inject a
+# failure in the my_write() function, which is called when flushing the tmp
+# file.
+#
+# References:
+#   MDEV-37662: Binlog Corruption When tmpdir is Full
+#
+--source include/have_debug.inc
+--source include/have_innodb.inc
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+--connection master
+set @old_binlog_cache_size= @@global.binlog_cache_size;
+set @@global.binlog_cache_size=4096;
+CALL mtr.add_suppression('Error writing file');
+
+--echo #
+--echo # Initialize test data
+--connection master
+create table t1 (a int, b longtext default NULL) engine=innodb;
+
+--echo #
+--echo # Create transaction with cache data larger than the binlog_cache_size
+--echo # so it spills into a tmp file, then simulate ENOSPC while flushing
+--echo # the tmp file.
+--echo #
+set @@session.debug_dbug="+d,simulate_binlog_tmp_file_no_space_left_on_flush";
+--replace_regex /Error writing file '[^']+\/tmp\/[^']+'/Error writing file '...\/tmp\/<FILENAME>'/
+--error 3
+insert into t1 values (2, repeat("y", 8192));
+set @@session.debug_dbug="";
+
+--echo #
+--echo # Create another transaction to make sure the server/replication can
+--echo # continue working normally after the error
+--echo #
+insert into t1 values (3, repeat("z", 8192));
+--source include/save_master_gtid.inc
+--connection slave
+--source include/sync_with_master_gtid.inc
+
+--let $diff_tables=master:test.t1,slave:test.t1
+--source include/diff_tables.inc
+
+--echo #
+--echo # Cleanup
+--connection master
+drop table t1;
+--source include/save_master_gtid.inc
+
+--connection slave
+--source include/sync_with_master_gtid.inc
+
+--connection master
+set @@global.binlog_cache_size= @old_binlog_cache_size;
+
+--source include/rpl_end.inc
+--echo # End of rpl_row_binlog_tmp_file_flush_enospc.test
diff --git a/mysys/my_write.c b/mysys/my_write.c
index 06914b25641..68f568605fc 100644
--- a/mysys/my_write.c
+++ b/mysys/my_write.c
@@ -57,6 +57,7 @@ size_t my_write(File Filedes, const uchar *Buffer, size_t Count, myf MyFlags)
                      if (!errors) {
                        errno= ENOSPC;
                        writtenbytes= (size_t) -1;
+                       MyFlags&= ~MY_WAIT_IF_FULL;
                      });
 
     if (writtenbytes == Count)
diff --git a/sql/log.cc b/sql/log.cc
index 8339d7c5b23..60290d14883 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1899,6 +1899,31 @@ static int binlog_close_connection(handlerton *hton, THD *thd)
   DBUG_RETURN(0);
 }
 
+/*
+  Ensures that the input IO Cache is consistent with where its data is stored,
+  i.e that the data is entirely either stored in-memory or backed by a
+  temporary file. In actuality, it is simple: if the IO Cache is actively
+  backed by a temporary file (i.e. the transaction or statement data is
+  sufficiently large to exceed its respective binlog_cache_size), then ensure
+  all data is flushed to the temporary file. Otherwise, the data is in-memory
+  by default, and we don't need to do anything.
+
+  Returns TRUE on success, FALSE on error.
+*/
+inline my_bool flush_write_buffer_if_file_backed(IO_CACHE *info)
+{
+  my_bool ret= 0;
+  DBUG_ENTER("binlog_flush_cache_log_to_disk");
+  DBUG_ASSERT(info);
+  DBUG_ASSERT(!info->error);
+  DBUG_EXECUTE_IF("simulate_binlog_tmp_file_no_space_left_on_flush",
+                  { DBUG_SET("+d,simulate_file_write_error"); });
+  ret= info->pos_in_file && flush_io_cache(info);
+  DBUG_EXECUTE_IF("simulate_binlog_tmp_file_no_space_left_on_flush",
+                  { DBUG_SET("-d,simulate_file_write_error"); });
+  DBUG_RETURN(ret);
+}
+
 /*
   This function flushes a cache upon commit/rollback.
 
@@ -1938,9 +1963,34 @@ binlog_flush_cache(THD *thd, binlog_cache_mngr *cache_mngr,
       (using_trx && !cache_mngr->trx_cache.empty())   ||
       thd->transaction->xid_state.is_explicit_XA())
   {
-    if (using_stmt && thd->binlog_flush_pending_rows_event(TRUE, FALSE))
+    /*
+      thd->binlog_flush_pending_rows_event() ensures that the pending row event
+      is flushed into the respective IO cache. We also need to make sure that
+      the IO cache is consistent where its data is stored, i.e. it should
+      either be entirely in-memory or backed by a temporary file. So if
+      necessary (i.e if the cache data exceeds its binlog_cache_size), flush
+      the IO cache to its tmp file on disk.
+
+      Technically, this reconciliation would happen automatically when writing
+      the cache data to the actual binlog file. We pre-empt it though because:
+        1) we write the GTID event separately to the binlog directly before
+           moving the cache data, and if the reconciliation fails (e.g. if the
+           directory storing the tmp file is full), the binlog would get
+           corrupted with a standalone GTID event
+        2) that happens during group commit with locks held, and other
+           ready-to-commit (concurrent) transactions could be stalled
+    */
+    if (using_stmt && !thd->binlog_flush_pending_rows_event(TRUE, FALSE) &&
+        flush_write_buffer_if_file_backed(
+            cache_mngr->get_binlog_cache_log(FALSE)))
       DBUG_RETURN(1);
-    if (using_trx && thd->binlog_flush_pending_rows_event(TRUE, TRUE))
+
+    /*
+      See statment cache comment above.
+    */
+    if (using_trx && !thd->binlog_flush_pending_rows_event(TRUE, TRUE) &&
+        flush_write_buffer_if_file_backed(
+            cache_mngr->get_binlog_cache_log(TRUE)))
       DBUG_RETURN(1);
 
 #ifdef WITH_WSREP
@@ -7708,8 +7758,12 @@ int MYSQL_BIN_LOG::write_cache(THD *thd, IO_CACHE *cache)
   DBUG_ENTER("MYSQL_BIN_LOG::write_cache");
 
   mysql_mutex_assert_owner(&LOCK_log);
+  DBUG_EXECUTE_IF("simulate_binlog_tmp_file_no_space_left_on_flush",
+                  { DBUG_SET("+d,simulate_file_write_error"); });
   if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0))
     DBUG_RETURN(ER_ERROR_ON_WRITE);
+  DBUG_EXECUTE_IF("simulate_binlog_tmp_file_no_space_left_on_flush",
+                  { DBUG_SET("-d,simulate_file_write_error"); });
   size_t length= my_b_bytes_in_cache(cache), group, carry, hdr_offs;
   size_t val;
   size_t end_log_pos_inc= 0; // each event processed adds BINLOG_CHECKSUM_LEN 2 t
@@ -8983,12 +9037,27 @@ MYSQL_BIN_LOG::write_transaction_or_stmt(group_commit_entry *entry,
   }
 #endif /* WITH_WSREP */
 
-  /*
-    An error in the trx_cache will truncate the cache to the last good
-    statement, it won't leave a lingering error. Assert that this holds.
-  */
-  DBUG_ASSERT(!(entry->using_trx_cache && !mngr->trx_cache.empty() &&
-                mngr->get_binlog_cache_log(TRUE)->error));
+
+#ifndef DBUG_OFF
+  if (entry->using_trx_cache)
+  {
+    IO_CACHE *cache= mngr->get_binlog_cache_log(TRUE);
+    /*
+      An error in the trx_cache will truncate the cache to the last good
+      statement, it won't leave a lingering error. Assert that this holds.
+    */
+    DBUG_ASSERT(mngr->trx_cache.empty() ||
+                !cache->error);
+
+    /*
+      If the transaction uses the IO cache temporary file (i.e if it is
+      sufficiently large), it should be fully flushed to disk by now.
+    */
+    DBUG_ASSERT(!cache->pos_in_file ||
+                cache->write_pos == cache->write_buffer);
+  }
+#endif
+
   /*
     An error in the stmt_cache would be caught on the higher level and result
     in an incident event being written over a (possibly corrupt) cache content.

From a61a746f08d3378cb4e5a3ea4452dc867a164b7f Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@gmail.com>
Date: Wed, 19 Nov 2025 13:01:56 +0100
Subject: [PATCH 046/119] MDEV-38029 my_tzinfo-t fails for certain TZ values on
 musl

The test fails for TZ values such as `PST8PDT` (present but outdated in
tzdb) and custom forms like `GST-1GDT`. On musl, these values do not
trigger the expected DST transitions, leading to incorrect DST offsets
or abbreviations.

This appears to be a musl libc bug; the same TZ values behave correctly
elsewhere, including Windows. We work around it by skipping the
affected tests when musl is detected.
---
 unittest/mysys/my_tzinfo-t.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/unittest/mysys/my_tzinfo-t.c b/unittest/mysys/my_tzinfo-t.c
index b38ebd37a61..585d52f8285 100644
--- a/unittest/mysys/my_tzinfo-t.c
+++ b/unittest/mysys/my_tzinfo-t.c
@@ -112,6 +112,20 @@ void test_timezone(const char *tz_env, const char **expected_tznames,
     }
   }
   ok(found, "%s: timezone_name = %s", tz_env, timezone_name);
+
+#if defined __linux__ && !defined __GLIBC__ && !defined __UCLIBC__
+  /*
+    MUSL incorrectly calculates UTC offsets and abbreviations
+    for certain values of TZ (DST related). See MDEV-38029
+    Skip tests in this case.
+  */
+  if (!strcmp(tz_env, "PST8PDT") || !strcmp(tz_env, "GST-1GDT"))
+  {
+    skip(6, "musl UTC offset/abbreviation bug, tzname %s, see MDEV-38029", tz_env);
+    return;
+  }
+#endif
+
   my_tzinfo(SUMMER_TIMESTAMP, &tz);
   ok(summer_gmt_off == tz.seconds_offset, "%s: Summer GMT offset %ld", tz_env, tz.seconds_offset);
   check_utc_offset(SUMMER_TIMESTAMP,tz.seconds_offset, tz_env);

From 5e6903769ffc2fd0456f43169b6d294c9bfe1de5 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Thu, 20 Nov 2025 13:24:43 +1100
Subject: [PATCH 047/119] MDEV-38137 s3.cnf still suggests changing
 plugin-maturity to alpha

S3 became stable in a49f5525bbe1. Adjust the configuration file
not to require a low plugin-maturity setting.

Thanks Mike Griffin for the bug report.
---
 storage/maria/s3.cnf | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/storage/maria/s3.cnf b/storage/maria/s3.cnf
index 345bddd1cb1..8f24cda36ef 100644
--- a/storage/maria/s3.cnf
+++ b/storage/maria/s3.cnf
@@ -1,9 +1,3 @@
-[mariadbd]
-#
-# Uncomment line to enable
-#
-#plugin-maturity = alpha
-
 [mariadb]
 #
 # Uncomment line to enable

From 5b0c2ed259943968e0240b94b03474e1d2b29fd4 Mon Sep 17 00:00:00 2001
From: Sergey Vojtovich <svojtovich@gmail.com>
Date: Fri, 24 Oct 2025 18:38:46 +0400
Subject: [PATCH 048/119] MDEV-13257 - main.kill-2 failed in buildbot

Test output was affected by incompletely closed preceding connections.

Make test agnostic to concurrent connections by querying
information_schema.processlist only for connections that it uses.

Avoid querying for i_s.processlist db column. It is unstable due to
trylock_short(), can be "" if concurrent connection is holding
LOCK_thd_data.
---
 mysql-test/main/kill-2.result | 13 ++++++-------
 mysql-test/main/kill-2.test   |  8 +++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/mysql-test/main/kill-2.result b/mysql-test/main/kill-2.result
index 0f9d069aacc..95164fda164 100644
--- a/mysql-test/main/kill-2.result
+++ b/mysql-test/main/kill-2.result
@@ -4,10 +4,9 @@
 create user foo@'127.0.0.1';
 connect  con1,127.0.0.1,foo,,;
 connection default;
-select user from information_schema.processlist;
+select user from information_schema.processlist where id=$con1_id;
 user
 foo
-root
 kill user foo@'127.0.0.1';
 drop user foo@'127.0.0.1';
 #
@@ -28,11 +27,11 @@ Id	User	Host	db	Command	Time	State	Info	Progress
 kill user a;
 kill user x;
 connection a;
-show processlist;
-Id	User	Host	db	Command	Time	State	Info	Progress
-#	root	#	test	#	#	#	#	#
-#	a	#	NULL	#	#	#	#	#
-#	b	#	test	#	#	#	#	#
+select user from information_schema.processlist where id in (connection_id(), $b_id, $default_id) order by user;
+user
+a
+b
+root
 kill user b;
 ERROR HY000: Operation KILL USER failed for b@%
 connection default;
diff --git a/mysql-test/main/kill-2.test b/mysql-test/main/kill-2.test
index 9bc4fe03346..1fdf693c414 100644
--- a/mysql-test/main/kill-2.test
+++ b/mysql-test/main/kill-2.test
@@ -16,9 +16,10 @@
 create user foo@'127.0.0.1';
 
 --connect (con1,127.0.0.1,foo,,)
+let $con1_id= `select connection_id()`;
 
 --connection default
-select user from information_schema.processlist;
+evalp select user from information_schema.processlist where id=$con1_id;
 kill user foo@'127.0.0.1';
 
 let $wait_condition=
@@ -31,6 +32,7 @@ drop user foo@'127.0.0.1';
 --echo #
 --echo # KILL USER and missing privileges
 --echo #
+let $default_id= `select connection_id()`;
 create user a@'127.0.0.1';
 create user b@'127.0.0.1';
 grant process on *.* to a@'127.0.0.1';
@@ -38,13 +40,13 @@ grant select on *.* to b@'127.0.0.1';
 --connect a,127.0.0.1,a
 show grants;
 --connect b,127.0.0.1,b
+let $b_id= `select connection_id()`;
 --replace_column 1 # 3 # 5 # 6 # 9 #
 show processlist;
 kill user a; # existing connection, but not visible to current_user
 kill user x; # not existing connection
 --connection a
---replace_column 1 # 3 # 5 # 6 # 7 # 8 # 9 #
-show processlist;
+evalp select user from information_schema.processlist where id in (connection_id(), $b_id, $default_id) order by user;
 --error ER_KILL_DENIED_ERROR
 kill user b;
 --connection default

From 733be587b06a44136567fd303810bf2fffe5bf16 Mon Sep 17 00:00:00 2001
From: Yuchen Pei <ycp@mariadb.com>
Date: Fri, 21 Nov 2025 14:45:49 +1100
Subject: [PATCH 049/119] MDEV-38040 Fix uninitialised
 key_compare_result_on_equal

MDEV-34413 introduced a new overriding ha_partition::set_end_range,
which causes handler::set_end_range to not be called which would set
key_compare_result_on_equal, causing it to be uninitialized. In this
patch we recover the call to handler::set_end_range in
ha_partition::set_end_range.
---
 .../r/key_compare_result_on_equal.result      | 31 +++++++++++++++++++
 .../parts/t/key_compare_result_on_equal.test  | 27 ++++++++++++++++
 sql/ha_partition.cc                           |  1 +
 3 files changed, 59 insertions(+)
 create mode 100644 mysql-test/suite/parts/r/key_compare_result_on_equal.result
 create mode 100644 mysql-test/suite/parts/t/key_compare_result_on_equal.test

diff --git a/mysql-test/suite/parts/r/key_compare_result_on_equal.result b/mysql-test/suite/parts/r/key_compare_result_on_equal.result
new file mode 100644
index 00000000000..17d0befb903
--- /dev/null
+++ b/mysql-test/suite/parts/r/key_compare_result_on_equal.result
@@ -0,0 +1,31 @@
+# MDEV-38040 unitialized handler::key_compare_result_on_equal in
+# loose index scan of partition tables
+CREATE TABLE t1 (
+a INT,
+b INT,
+KEY ( a, b )
+) PARTITION BY RANGE COLUMNS(a) (
+PARTITION `p1` VALUES LESS THAN (10),
+PARTITION `p2` VALUES LESS THAN (20),
+PARTITION `p3` VALUES LESS THAN (30),
+PARTITION `p4` VALUES LESS THAN (40),
+PARTITION `p5` VALUES LESS THAN MAXVALUE
+);
+insert into t1 select seq, seq from seq_1_to_50;
+FLUSH status;
+SELECT a, MIN(b) FROM t1 WHERE a > 18 and a < 21 GROUP BY a;
+a	MIN(b)
+19	19
+20	20
+show status like 'handler_read_%';
+Variable_name	Value
+Handler_read_first	0
+Handler_read_key	6
+Handler_read_last	0
+Handler_read_next	0
+Handler_read_prev	0
+Handler_read_retry	0
+Handler_read_rnd	0
+Handler_read_rnd_deleted	0
+Handler_read_rnd_next	0
+DROP TABLE t1;
diff --git a/mysql-test/suite/parts/t/key_compare_result_on_equal.test b/mysql-test/suite/parts/t/key_compare_result_on_equal.test
new file mode 100644
index 00000000000..4e98a4facec
--- /dev/null
+++ b/mysql-test/suite/parts/t/key_compare_result_on_equal.test
@@ -0,0 +1,27 @@
+--source include/have_partition.inc
+--source include/have_sequence.inc
+--echo # MDEV-38040 unitialized handler::key_compare_result_on_equal in
+--echo # loose index scan of partition tables
+--disable_ps2_protocol
+CREATE TABLE t1 (
+ a INT,
+ b INT,
+ KEY ( a, b )
+) PARTITION BY RANGE COLUMNS(a) (
+ PARTITION `p1` VALUES LESS THAN (10),
+ PARTITION `p2` VALUES LESS THAN (20),
+ PARTITION `p3` VALUES LESS THAN (30),
+ PARTITION `p4` VALUES LESS THAN (40),
+ PARTITION `p5` VALUES LESS THAN MAXVALUE
+);
+
+insert into t1 select seq, seq from seq_1_to_50;
+
+FLUSH status;
+--disable_view_protocol
+SELECT a, MIN(b) FROM t1 WHERE a > 18 and a < 21 GROUP BY a;
+--enable_view_protocol
+show status like 'handler_read_%';
+
+DROP TABLE t1;
+--enable_ps2_protocol
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 97f6259ac0b..a0bee5040cd 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -6433,6 +6433,7 @@ int ha_partition::read_range_next()
 void ha_partition::set_end_range(const key_range *end_key,
                                  enum_range_scan_direction direction)
 {
+  handler::set_end_range(end_key, direction);
   for (uint i= bitmap_get_first_set(&m_part_info->read_partitions);
        i < m_tot_parts;
        i= bitmap_get_next_set(&m_part_info->read_partitions, i))

From 3de6d11321ff371f26d39ed87d611f0eda2671ab Mon Sep 17 00:00:00 2001
From: Denis Protivensky <denis.protivensky@mariadb.com>
Date: Thu, 23 Oct 2025 13:59:43 +0300
Subject: [PATCH 050/119] MDEV-34124: Improve sequences replication with Galera

- use shared key for sequence update certification
- employ native replication's code to apply changes for sequences
which handles all corner cases properly
- fix the tests to allow more transactions using sequences to be
accepted

That way the sequence is always updated to the maximum value
independent of the order of updates, and shared certification keys
allow to improve acceptance ratio of concurrent transactions that
use sequences. It's reflected in the test changes.
---
 .../suite/galera/r/galera_sequences.result    |  2 +-
 .../r/galera_sequences_transaction.result     | 28 +++++++++++++++----
 mysql-test/suite/galera/r/mdev-22063.result   |  2 +-
 .../suite/galera/t/galera_sequences.test      | 11 ++------
 .../t/galera_sequences_transaction.test       |  2 --
 sql/log_event_server.cc                       | 20 ++++++++-----
 storage/innobase/handler/ha_innodb.cc         | 19 ++++++++-----
 storage/innobase/include/ha_prototypes.h      |  6 ++--
 storage/innobase/row/row0ins.cc               |  2 +-
 9 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/mysql-test/suite/galera/r/galera_sequences.result b/mysql-test/suite/galera/r/galera_sequences.result
index 7cdeffff1e3..bacd0f07c97 100644
--- a/mysql-test/suite/galera/r/galera_sequences.result
+++ b/mysql-test/suite/galera/r/galera_sequences.result
@@ -206,7 +206,7 @@ t	CREATE TABLE `t` (
 ) ENGINE=InnoDB SEQUENCE=1
 connection node_1;
 DROP SEQUENCE t;
-CREATE SEQUENCE t INCREMENT BY 1 NOCACHE ENGINE=INNODB;
+CREATE SEQUENCE t INCREMENT BY 0 CACHE 1 ENGINE=INNODB;
 CREATE TABLE t1(a int not null primary key default nextval(t), b int) engine=innodb;
 connection node_2;
 # Wait DDL to replicate
diff --git a/mysql-test/suite/galera/r/galera_sequences_transaction.result b/mysql-test/suite/galera/r/galera_sequences_transaction.result
index c1cfdc4aa20..80bfe44093e 100644
--- a/mysql-test/suite/galera/r/galera_sequences_transaction.result
+++ b/mysql-test/suite/galera/r/galera_sequences_transaction.result
@@ -72,7 +72,7 @@ LASTVAL(s)
 connection node_1a;
 SELECT LASTVAL(s);
 LASTVAL(s)
-79
+81
 connection node_1;
 SELECT * FROM t1;
 f1	f2
@@ -106,7 +106,6 @@ f1	f2
 56	1
 58	1
 60	1
-61	1
 63	1
 65	1
 67	1
@@ -116,6 +115,7 @@ f1	f2
 75	1
 77	1
 79	1
+81	1
 connection node_2;
 SELECT * FROM t1;
 f1	f2
@@ -149,7 +149,6 @@ f1	f2
 56	1
 58	1
 60	1
-61	1
 63	1
 65	1
 67	1
@@ -159,6 +158,7 @@ f1	f2
 75	1
 77	1
 79	1
+81	1
 connection node_1;
 DROP TABLE t1;
 DROP SEQUENCE s;
@@ -299,10 +299,8 @@ connection node_1a;
 ROLLBACK;
 connection node_2;
 COMMIT;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 connection node_2a;
 ROLLBACK;
-ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
 connection node_2;
 SELECT LASTVAL(s);
 LASTVAL(s)
@@ -332,6 +330,16 @@ f1	f2
 15	1
 17	1
 19	1
+22	1
+24	1
+26	1
+28	1
+30	1
+32	1
+34	1
+36	1
+38	1
+40	1
 connection node_2;
 SELECT * FROM t1;
 f1	f2
@@ -345,6 +353,16 @@ f1	f2
 15	1
 17	1
 19	1
+22	1
+24	1
+26	1
+28	1
+30	1
+32	1
+34	1
+36	1
+38	1
+40	1
 connection node_1;
 DROP TABLE t1;
 DROP SEQUENCE s;
diff --git a/mysql-test/suite/galera/r/mdev-22063.result b/mysql-test/suite/galera/r/mdev-22063.result
index 228f63d6688..886a84b05e3 100644
--- a/mysql-test/suite/galera/r/mdev-22063.result
+++ b/mysql-test/suite/galera/r/mdev-22063.result
@@ -22,7 +22,7 @@ SELECT * FROM t1;
 a
 SELECT * FROM s;
 next_not_cached_value	minimum_value	maximum_value	start_value	increment	cache_size	cycle_option	cycle_count
-1	1	9223372036854775806	1	1	1000	0	0
+1	1	9223372036854775806	1	1	0	0	0
 connection node_1;
 SET GLOBAL WSREP_MODE='REPLICATE_ARIA,REPLICATE_MYISAM';
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/galera_sequences.test b/mysql-test/suite/galera/t/galera_sequences.test
index 9e18353893b..c9ab8db237a 100644
--- a/mysql-test/suite/galera/t/galera_sequences.test
+++ b/mysql-test/suite/galera/t/galera_sequences.test
@@ -163,7 +163,8 @@ SHOW CREATE TABLE t;
 
 --connection node_1
 DROP SEQUENCE t;
-CREATE SEQUENCE t INCREMENT BY 1 NOCACHE ENGINE=INNODB;
+# Don't use NOCACHE as it may produce duplicate entries from multiple nodes
+CREATE SEQUENCE t INCREMENT BY 0 CACHE 1 ENGINE=INNODB;
 CREATE TABLE t1(a int not null primary key default nextval(t), b int) engine=innodb;
 
 --connection node_2
@@ -193,15 +194,11 @@ SET SESSION wsrep_sync_wait=0;
 while ($count)
 {
 --connection node_1
---error 0,ER_LOCK_WAIT_TIMEOUT,ER_LOCK_DEADLOCK
 INSERT INTO t1(b) values (1);
 --connection node_2
---error 0,ER_LOCK_WAIT_TIMEOUT,ER_LOCK_DEADLOCK
 INSERT INTO t1(b) values (2);
---error 0,ER_LOCK_WAIT_TIMEOUT,ER_LOCK_DEADLOCK
 INSERT INTO t1(b) values (2);
 --connection node_1
---error 0,ER_LOCK_WAIT_TIMEOUT,ER_LOCK_DEADLOCK
 INSERT INTO t1(b) values (1);
 --dec $count
 }
@@ -251,15 +248,11 @@ SET SESSION wsrep_sync_wait=0;
 while ($count)
 {
 --connection node_1
---error 0,ER_LOCK_WAIT_TIMEOUT,ER_LOCK_DEADLOCK
 INSERT INTO t1(b) values (1),(2),(3),(4),(5),(6),(7),(8),(9);
 --connection node_2
---error 0,ER_LOCK_WAIT_TIMEOUT,ER_LOCK_DEADLOCK
 INSERT INTO t1(b) values (21),(22),(23),(24),(25),(26),(27),(28),(29);
---error 0,ER_LOCK_WAIT_TIMEOUT,ER_LOCK_DEADLOCK
 INSERT INTO t1(b) values (21),(22),(23),(24),(25),(26),(27),(28),(29);
 --connection node_1
---error 0,ER_LOCK_WAIT_TIMEOUT,ER_LOCK_DEADLOCK
 INSERT INTO t1(b) values (1),(2),(3),(4),(5),(6),(7),(8),(9);
 --dec $count
 }
diff --git a/mysql-test/suite/galera/t/galera_sequences_transaction.test b/mysql-test/suite/galera/t/galera_sequences_transaction.test
index f3dc7d51285..facf65a02fe 100644
--- a/mysql-test/suite/galera/t/galera_sequences_transaction.test
+++ b/mysql-test/suite/galera/t/galera_sequences_transaction.test
@@ -230,10 +230,8 @@ COMMIT;
 --connection node_1a
 ROLLBACK;
 --connection node_2
---error ER_LOCK_DEADLOCK
 COMMIT;
 --connection node_2a
---error ER_LOCK_DEADLOCK
 ROLLBACK;
 
 --connection node_2
diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc
index c93aea23ad0..9ad2c5ebb1e 100644
--- a/sql/log_event_server.cc
+++ b/sql/log_event_server.cc
@@ -7928,15 +7928,21 @@ int Rows_log_event::update_sequence()
   bool old_master= false;
   int err= 0;
 
-  if (!bitmap_is_set(table->rpl_write_set, MIN_VALUE_FIELD_NO) ||
-      (
-#if defined(WITH_WSREP)
-       ! WSREP(thd) &&
+  rpl_group_info *table_rgi=
+#ifdef WITH_WSREP
+  WSREP(thd) ? thd->wsrep_rgi :
 #endif
-       table->in_use->rgi_slave &&
-       !(table->in_use->rgi_slave->gtid_ev_flags2 & Gtid_log_event::FL_DDL) &&
+  table->in_use->rgi_slave;
+  rpl_group_info *thd_rgi=
+#ifdef WITH_WSREP
+  WSREP(thd) ? thd->wsrep_rgi :
+#endif
+  thd->rgi_slave;
+  if (!bitmap_is_set(table->rpl_write_set, MIN_VALUE_FIELD_NO) ||
+      (table_rgi &&
+       !(table_rgi->gtid_ev_flags2 & Gtid_log_event::FL_DDL) &&
        !(old_master=
-         rpl_master_has_bug(thd->rgi_slave->rli,
+         rpl_master_has_bug(thd_rgi->rli,
                             29621, FALSE, FALSE, FALSE, TRUE))))
   {
     /* This event come from a setval function executed on the master.
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 00ac0223a3c..6d87fe65b1b 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -8457,12 +8457,15 @@ wsrep_calc_row_hash(
 	return(0);
 }
 
-/** Append table-level exclusive key.
+/** Append table-level exclusive/shared key.
 @param thd   MySQL thread handle
 @param table table
+@param exclusive Exclusive not shared certification key.
 @retval false on success
 @retval true on failure */
-ATTRIBUTE_COLD bool wsrep_append_table_key(MYSQL_THD thd, const dict_table_t &table)
+ATTRIBUTE_COLD bool wsrep_append_table_key(MYSQL_THD thd,
+                                           const dict_table_t &table,
+                                           bool exclusive)
 {
   char db_buf[NAME_LEN + 1];
   char tbl_buf[NAME_LEN + 1];
@@ -8475,9 +8478,11 @@ ATTRIBUTE_COLD bool wsrep_append_table_key(MYSQL_THD thd, const dict_table_t &ta
     return true;
   }
 
-  /* Append table-level exclusive key */
-  const int rcode = wsrep_thd_append_table_key(thd, db_buf,
-                                               tbl_buf, WSREP_SERVICE_KEY_EXCLUSIVE);
+  /* Append table-level key */
+  const enum Wsrep_service_key_type key_type = exclusive
+                                               ? WSREP_SERVICE_KEY_EXCLUSIVE
+                                               : WSREP_SERVICE_KEY_SHARED;
+  const int rcode = wsrep_thd_append_table_key(thd, db_buf, tbl_buf, key_type);
   if (rcode)
   {
     WSREP_ERROR("Appending table key failed: %s, %d",
@@ -8640,10 +8645,10 @@ func_exit:
 	    && (thd_sql_command(m_user_thd) != SQLCOM_LOAD ||
 	        thd_binlog_format(m_user_thd) == BINLOG_FORMAT_ROW)) {
 
-		/* We use table-level exclusive key for SEQUENCES
+		/* We use table-level shared key for SEQUENCES
 		   and normal key append for others. */
 		if (table->s->table_type == TABLE_TYPE_SEQUENCE) {
-			if (wsrep_append_table_key(m_user_thd, *m_prebuilt->table))
+			if (wsrep_append_table_key(m_user_thd, *m_prebuilt->table, false))
 				DBUG_RETURN(HA_ERR_INTERNAL_ERROR);
 		} else if (wsrep_append_keys(m_user_thd,
 					     wsrep_protocol_version >= 4
diff --git a/storage/innobase/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h
index 34d1c9fb7a7..26a498e749c 100644
--- a/storage/innobase/include/ha_prototypes.h
+++ b/storage/innobase/include/ha_prototypes.h
@@ -409,13 +409,15 @@ char *dict_table_lookup(LEX_CSTRING db, LEX_CSTRING name,
                         dict_table_t **table, mem_heap_t *heap) noexcept;
 
 #ifdef WITH_WSREP
-/** Append table-level exclusive key.
+/** Append table-level exclusive/shared key.
 @param thd   MySQL thread handle
 @param table table
+@param exclusive Exclusive not shared certification key.
 @retval false on success
 @retval true on failure */
 struct dict_table_t;
-bool wsrep_append_table_key(MYSQL_THD thd, const dict_table_t &table);
+bool wsrep_append_table_key(MYSQL_THD thd, const dict_table_t &table,
+                            bool exclusive);
 #endif /* WITH_WSREP */
 
 #endif /* !UNIV_INNOCHECKSUM */
diff --git a/storage/innobase/row/row0ins.cc b/storage/innobase/row/row0ins.cc
index e57f6fa7275..9ece5dd1567 100644
--- a/storage/innobase/row/row0ins.cc
+++ b/storage/innobase/row/row0ins.cc
@@ -2798,7 +2798,7 @@ avoid_bulk:
 			}
 #ifdef WITH_WSREP
 			if (trx->is_wsrep() &&
-			    wsrep_append_table_key(trx->mysql_thd, *index->table))
+			    wsrep_append_table_key(trx->mysql_thd, *index->table, true))
 			{
 				trx->error_state = DB_ROLLBACK;
 				goto err_exit;

From adf9f56041ffa9943a03b966a6d9886ecc8b6095 Mon Sep 17 00:00:00 2001
From: Denis Protivensky <denis.protivensky@mariadb.com>
Date: Fri, 24 Oct 2025 16:23:28 +0300
Subject: [PATCH 051/119] MDEV-34124: Test sequences recovery after crash in
 Galera cluster

---
 .../galera/r/galera_sequences_recovery.result | 132 ++++++++++++++++++
 .../galera/t/galera_sequences_recovery.cnf    |   9 ++
 .../t/galera_sequences_recovery.combinations  |   5 +
 .../galera/t/galera_sequences_recovery.test   | 123 ++++++++++++++++
 4 files changed, 269 insertions(+)
 create mode 100644 mysql-test/suite/galera/r/galera_sequences_recovery.result
 create mode 100644 mysql-test/suite/galera/t/galera_sequences_recovery.cnf
 create mode 100644 mysql-test/suite/galera/t/galera_sequences_recovery.combinations
 create mode 100644 mysql-test/suite/galera/t/galera_sequences_recovery.test

diff --git a/mysql-test/suite/galera/r/galera_sequences_recovery.result b/mysql-test/suite/galera/r/galera_sequences_recovery.result
new file mode 100644
index 00000000000..1125f3faf81
--- /dev/null
+++ b/mysql-test/suite/galera/r/galera_sequences_recovery.result
@@ -0,0 +1,132 @@
+connection node_2;
+connection node_1;
+connection node_1;
+CREATE SEQUENCE s INCREMENT=0 CACHE=5 ENGINE=InnoDB;
+CREATE TABLE t1 (f1 INT PRIMARY KEY DEFAULT NEXTVAL(s), f2 INT) ENGINE=InnoDB;
+connection node_1;
+BEGIN;
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+connection node_2;
+BEGIN;
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+Killing server ...
+SELECT NEXTVAL(s);
+NEXTVAL(s)
+12
+connection node_1;
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+COMMIT;
+SELECT LASTVAL(s);
+LASTVAL(s)
+29
+SELECT * FROM t1;
+f1	f2
+1	1
+3	1
+5	1
+7	1
+9	1
+21	1
+23	1
+25	1
+27	1
+29	1
+connection node_2;
+SELECT LASTVAL(s);
+LASTVAL(s)
+12
+SELECT NEXTVAL(s);
+NEXTVAL(s)
+32
+SELECT * FROM t1;
+f1	f2
+1	1
+3	1
+5	1
+7	1
+9	1
+21	1
+23	1
+25	1
+27	1
+29	1
+connection node_1;
+DROP TABLE t1;
+DROP SEQUENCE s;
+connection node_1;
+CREATE SEQUENCE s INCREMENT=0 CACHE=5 ENGINE=InnoDB;
+CREATE TABLE t1 (f1 INT PRIMARY KEY DEFAULT NEXTVAL(s), f2 INT) ENGINE=InnoDB;
+connection node_1;
+BEGIN;
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+connection node_2;
+BEGIN;
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+Killing server ...
+connection node_1;
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+COMMIT;
+SELECT LASTVAL(s);
+LASTVAL(s)
+19
+SELECT * FROM t1;
+f1	f2
+1	1
+3	1
+5	1
+7	1
+9	1
+11	1
+13	1
+15	1
+17	1
+19	1
+connection node_2;
+SELECT NEXTVAL(s);
+NEXTVAL(s)
+22
+SELECT * FROM t1;
+f1	f2
+1	1
+3	1
+5	1
+7	1
+9	1
+11	1
+13	1
+15	1
+17	1
+19	1
+connection node_1;
+SELECT LASTVAL(s);
+LASTVAL(s)
+19
+SELECT NEXTVAL(s);
+NEXTVAL(s)
+33
+connection node_1;
+DROP TABLE t1;
+DROP SEQUENCE s;
diff --git a/mysql-test/suite/galera/t/galera_sequences_recovery.cnf b/mysql-test/suite/galera/t/galera_sequences_recovery.cnf
new file mode 100644
index 00000000000..8701e86db5f
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_sequences_recovery.cnf
@@ -0,0 +1,9 @@
+!include ../galera_2nodes.cnf
+
+[mysqld.1]
+auto-increment-increment=2
+auto-increment-offset=1
+
+[mysqld.2]
+auto-increment-increment=2
+auto-increment-offset=2
diff --git a/mysql-test/suite/galera/t/galera_sequences_recovery.combinations b/mysql-test/suite/galera/t/galera_sequences_recovery.combinations
new file mode 100644
index 00000000000..cef98e75213
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_sequences_recovery.combinations
@@ -0,0 +1,5 @@
+[binlogon]
+log-bin
+log-slave-updates
+
+[binlogoff]
diff --git a/mysql-test/suite/galera/t/galera_sequences_recovery.test b/mysql-test/suite/galera/t/galera_sequences_recovery.test
new file mode 100644
index 00000000000..4b59d0ad1af
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_sequences_recovery.test
@@ -0,0 +1,123 @@
+#
+# Test sequences crash recovery.
+#
+
+--source include/galera_cluster.inc
+--source include/have_sequence.inc
+--source include/big_test.inc
+
+--disable_ps2_protocol
+
+#
+# Case 1: Crash a node during a transaction, bring the
+# sequence in sync by receiving higher current value
+#
+--connection node_1
+CREATE SEQUENCE s INCREMENT=0 CACHE=5 ENGINE=InnoDB;
+CREATE TABLE t1 (f1 INT PRIMARY KEY DEFAULT NEXTVAL(s), f2 INT) ENGINE=InnoDB;
+
+--connection node_1
+BEGIN;
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+
+--connection node_2
+BEGIN;
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+
+# Crash and restart the node, losing the transaciton
+--source include/kill_galera.inc
+--let $start_mysqld_params =
+--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
+--source include/start_mysqld.inc
+
+# Check and update the last written sequence value
+SELECT NEXTVAL(s);
+
+--connection node_1
+# Update the sequence value further
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+
+COMMIT;
+SELECT LASTVAL(s);
+SELECT * FROM t1;
+
+--connection node_2
+# The next value should be in sync now, but the last
+# value is still the same
+SELECT LASTVAL(s);
+SELECT NEXTVAL(s);
+SELECT * FROM t1;
+
+--connection node_1
+DROP TABLE t1;
+DROP SEQUENCE s;
+
+#
+# Case 2: Crash a node during a transaction, bring the
+# sequence in sync by sending higher current value
+#
+--connection node_1
+CREATE SEQUENCE s INCREMENT=0 CACHE=5 ENGINE=InnoDB;
+CREATE TABLE t1 (f1 INT PRIMARY KEY DEFAULT NEXTVAL(s), f2 INT) ENGINE=InnoDB;
+
+--connection node_1
+BEGIN;
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+
+--connection node_2
+# Exhaust the cached values once, but no replication happens even
+# though the sequnce table is updated
+BEGIN;
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+INSERT INTO t1(f2) values (2);
+
+# Crash and restart the node, losing the transaciton
+--source include/kill_galera.inc
+--let $start_mysqld_params =
+--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
+--source include/start_mysqld.inc
+
+--connection node_1
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+INSERT INTO t1(f2) values (1);
+
+COMMIT;
+SELECT LASTVAL(s);
+SELECT * FROM t1;
+
+--connection node_2
+# Check and update the last written sequence value, it's still
+# higher than the one from the other node
+SELECT NEXTVAL(s);
+SELECT * FROM t1;
+
+--connection node_1
+# The next value should be in sync now, but the last
+# value is still the same
+SELECT LASTVAL(s);
+SELECT NEXTVAL(s);
+
+--connection node_1
+DROP TABLE t1;
+DROP SEQUENCE s;

From 021b979014f04db5d5305bbd18bece138690fd77 Mon Sep 17 00:00:00 2001
From: Denis Protivensky <denis.protivensky@mariadb.com>
Date: Wed, 22 Oct 2025 15:10:04 +0300
Subject: [PATCH 052/119] MDEV-34124: Fix streaming replication offset for
 binlog stmt cache

As the binlog statement cache is only replicated with the last
fragment, it's safe to pass zero offset instead of the stored
log position, which is used only for the binlog transaction cache.
---
 sql/wsrep_binlog.cc         |  8 +++++---
 sql/wsrep_binlog.h          |  2 ++
 sql/wsrep_client_service.cc | 10 ++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/sql/wsrep_binlog.cc b/sql/wsrep_binlog.cc
index 84392facba3..c680ba416ef 100644
--- a/sql/wsrep_binlog.cc
+++ b/sql/wsrep_binlog.cc
@@ -118,12 +118,13 @@ cleanup:
  */
 static int wsrep_write_cache_inc(THD*      const thd,
                                  IO_CACHE* const cache,
+                                 size_t    const log_position,
                                  size_t*   const len)
 {
   DBUG_ENTER("wsrep_write_cache_inc");
   my_off_t const saved_pos(my_b_tell(cache));
 
-  if (reinit_io_cache(cache, READ_CACHE, thd->wsrep_sr().log_position(), 0, 0))
+  if (reinit_io_cache(cache, READ_CACHE, log_position, 0, 0))
   {
     WSREP_ERROR("failed to initialize io-cache");
     DBUG_RETURN(1);;
@@ -157,7 +158,7 @@ static int wsrep_write_cache_inc(THD*      const thd,
     } while ((cache->file >= 0) && (length= my_b_fill(cache)));
     if (ret == 0)
     {
-      assert(total_length + thd->wsrep_sr().log_position() == saved_pos);
+      assert(total_length + log_position == saved_pos);
     }
   }
 
@@ -178,9 +179,10 @@ cleanup:
  */
 int wsrep_write_cache(THD*      const thd,
                       IO_CACHE* const cache,
+                      size_t    const log_position,
                       size_t*   const len)
 {
-  return wsrep_write_cache_inc(thd, cache, len);
+  return wsrep_write_cache_inc(thd, cache, log_position, len);
 }
 
 void wsrep_dump_rbr_buf(THD *thd, const void* rbr_buf, size_t buf_len)
diff --git a/sql/wsrep_binlog.h b/sql/wsrep_binlog.h
index 252fbe602d2..44985c8a5fb 100644
--- a/sql/wsrep_binlog.h
+++ b/sql/wsrep_binlog.h
@@ -36,11 +36,13 @@ int wsrep_write_cache_buf(IO_CACHE *cache, uchar **buf, size_t *buf_len);
   This function quite the same as MYSQL_BIN_LOG::write_cache(),
   with the exception that here we write in buffer instead of log file.
 
+  @param log_position position to start writing the cache from
   @param len  total amount of data written
   @return     wsrep error status
  */
 int  wsrep_write_cache(THD*      thd,
                        IO_CACHE* cache,
+                       size_t    log_position,
                        size_t*   len);
 
 /* Dump replication buffer to disk */
diff --git a/sql/wsrep_client_service.cc b/sql/wsrep_client_service.cc
index 268ad0e432d..d6448dddee6 100644
--- a/sql/wsrep_client_service.cc
+++ b/sql/wsrep_client_service.cc
@@ -95,9 +95,11 @@ int Wsrep_client_service::prepare_data_for_replication()
     size_t transactional_data_len= 0;
     size_t stmt_data_len= 0;
 
-    // Write transactional cache
+    // Write transactional cache from the last remembered position
     if (transactional_cache &&
-        wsrep_write_cache(m_thd, transactional_cache, &transactional_data_len))
+        wsrep_write_cache(m_thd, transactional_cache,
+                          m_thd->wsrep_sr().log_position(),
+                          &transactional_data_len))
     {
       WSREP_ERROR("rbr write fail, data_len: %zu",
                   data_len);
@@ -105,8 +107,8 @@ int Wsrep_client_service::prepare_data_for_replication()
       DBUG_RETURN(1);
     }
 
-    // Write stmt cache
-    if (stmt_cache && wsrep_write_cache(m_thd, stmt_cache, &stmt_data_len))
+    // Write stmt cache fully as it's only written upon transaction commit
+    if (stmt_cache && wsrep_write_cache(m_thd, stmt_cache, 0u, &stmt_data_len))
     {
       WSREP_ERROR("rbr write fail, data_len: %zu",
                   data_len);

From c4264c9e2f6fd9aabc3ed8e6b069c95367eeb060 Mon Sep 17 00:00:00 2001
From: Denis Protivensky <denis.protivensky@mariadb.com>
Date: Wed, 22 Oct 2025 15:10:25 +0300
Subject: [PATCH 053/119] MDEV-34124: Make sequences work with streaming
 replication

- extend galera_sequences_transaction test with streaming replication
combinations (it demonstrates the exact results compared to the regular
Wsrep replication)
- remove MDEV-28971 test as it's not applicable after fixing the binlog
statement cache replication with Wsrep
---
 .../t/galera_sequences_recovery.combinations  |  8 +++++++
 .../galera_sequences_transaction.combinations |  8 +++++++
 .../suite/galera_sr/r/MDEV-28971.result       | 17 ---------------
 mysql-test/suite/galera_sr/t/MDEV-28971.test  | 21 -------------------
 sql/ha_sequence.cc                            |  8 -------
 5 files changed, 16 insertions(+), 46 deletions(-)
 delete mode 100644 mysql-test/suite/galera_sr/r/MDEV-28971.result
 delete mode 100644 mysql-test/suite/galera_sr/t/MDEV-28971.test

diff --git a/mysql-test/suite/galera/t/galera_sequences_recovery.combinations b/mysql-test/suite/galera/t/galera_sequences_recovery.combinations
index cef98e75213..fe14ec5e063 100644
--- a/mysql-test/suite/galera/t/galera_sequences_recovery.combinations
+++ b/mysql-test/suite/galera/t/galera_sequences_recovery.combinations
@@ -3,3 +3,11 @@ log-bin
 log-slave-updates
 
 [binlogoff]
+
+[binlogon-sr]
+log-bin
+log-slave-updates
+wsrep-trx-fragment-size=1
+
+[binlogoff-sr]
+wsrep-trx-fragment-size=1
diff --git a/mysql-test/suite/galera/t/galera_sequences_transaction.combinations b/mysql-test/suite/galera/t/galera_sequences_transaction.combinations
index cef98e75213..fe14ec5e063 100644
--- a/mysql-test/suite/galera/t/galera_sequences_transaction.combinations
+++ b/mysql-test/suite/galera/t/galera_sequences_transaction.combinations
@@ -3,3 +3,11 @@ log-bin
 log-slave-updates
 
 [binlogoff]
+
+[binlogon-sr]
+log-bin
+log-slave-updates
+wsrep-trx-fragment-size=1
+
+[binlogoff-sr]
+wsrep-trx-fragment-size=1
diff --git a/mysql-test/suite/galera_sr/r/MDEV-28971.result b/mysql-test/suite/galera_sr/r/MDEV-28971.result
deleted file mode 100644
index 0826f5e6b66..00000000000
--- a/mysql-test/suite/galera_sr/r/MDEV-28971.result
+++ /dev/null
@@ -1,17 +0,0 @@
-connection node_2;
-connection node_1;
-CREATE SEQUENCE SEQ NOCACHE ENGINE=InnoDB;
-SET SESSION wsrep_trx_fragment_size=1;
-SET collation_connection=utf16_thai_520_w2;
-SET autocommit=0;
-CREATE TABLE t1 (a BLOB UNIQUE);
-INSERT INTO t1 VALUES ('AAF');
-SELECT SETVAL (SEQ, 100);
-ERROR 42000: This version of MariaDB doesn't yet support 'SEQUENCEs with streaming replication in Galera cluster'
-ALTER TABLE t1 ADD CONSTRAINT constraint_1 UNIQUE (a);
-Warnings:
-Note	1831	Duplicate index `constraint_1`. This is deprecated and will be disallowed in a future release
-INSERT INTO t1 VALUES();
-ALTER TABLE t1 ADD KEY(b (50));
-ERROR 42000: Key column 'b' doesn't exist in table
-DROP TABLE t1,SEQ;
diff --git a/mysql-test/suite/galera_sr/t/MDEV-28971.test b/mysql-test/suite/galera_sr/t/MDEV-28971.test
deleted file mode 100644
index 2f924e3bec8..00000000000
--- a/mysql-test/suite/galera_sr/t/MDEV-28971.test
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# MDEV-28971 - Assertion `total_length + thd->wsrep_sr().log_position() == saved_pos'
-# failed in int wsrep_write_cache_inc(THD*, IO_CACHE*, size_t*)
-#
-
---source include/galera_cluster.inc
---source include/have_sequence.inc
-
-CREATE SEQUENCE SEQ NOCACHE ENGINE=InnoDB;
-SET SESSION wsrep_trx_fragment_size=1;
-SET collation_connection=utf16_thai_520_w2;
-SET autocommit=0;
-CREATE TABLE t1 (a BLOB UNIQUE);
-INSERT INTO t1 VALUES ('AAF');
---error ER_NOT_SUPPORTED_YET
-SELECT SETVAL (SEQ, 100);
-ALTER TABLE t1 ADD CONSTRAINT constraint_1 UNIQUE (a);
-INSERT INTO t1 VALUES();
---error ER_KEY_COLUMN_DOES_NOT_EXIST
-ALTER TABLE t1 ADD KEY(b (50));
-DROP TABLE t1,SEQ;
diff --git a/sql/ha_sequence.cc b/sql/ha_sequence.cc
index 1e0e253a618..1dd0e4a3637 100644
--- a/sql/ha_sequence.cc
+++ b/sql/ha_sequence.cc
@@ -273,14 +273,6 @@ int ha_sequence::write_row(const uchar *buf)
 #ifdef WITH_WSREP
   if (WSREP_ON && WSREP(thd) && wsrep_thd_is_local(thd))
   {
-    if (sequence_locked &&
-        (wsrep_thd_is_SR(thd) || wsrep_streaming_enabled(thd)))
-    {
-      my_error(ER_NOT_SUPPORTED_YET, MYF(0),
-               "SEQUENCEs with streaming replication in Galera cluster");
-      DBUG_RETURN(HA_ERR_UNSUPPORTED);
-    }
-
     /*
        We need to start Galera transaction for select NEXT VALUE FOR
        sequence if it is not yet started. Note that ALTER is handled

From 3a16fcdab0f5a07c574802d625bd08e2f7f16af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Wed, 26 Nov 2025 16:59:46 +0200
Subject: [PATCH 054/119] MDEV-38126: Remove dead code for MySQL 5.7 and old
 MariaDB

The release of MySQL 5.7.44 (the last one in the 5.7 series) took place in
August 2023.

Also, the release of MariaDB 5.5.68 (the last one in the 5.5 series)
took place in May 2020.

Let us remove some dead code that is related to these, as well as
attempts to detect the server version by symbol lookup.
The audit plugin will typically be built and distributed together
with the current MariaDB server version.
---
 plugin/server_audit/CMakeLists.txt    |   2 +-
 plugin/server_audit/plugin_audit_v4.h | 561 --------------------------
 plugin/server_audit/server_audit.c    | 416 ++-----------------
 plugin/server_audit/test_audit_v4.c   | 163 --------
 4 files changed, 30 insertions(+), 1112 deletions(-)
 delete mode 100644 plugin/server_audit/plugin_audit_v4.h
 delete mode 100644 plugin/server_audit/test_audit_v4.c

diff --git a/plugin/server_audit/CMakeLists.txt b/plugin/server_audit/CMakeLists.txt
index 8a5333cfb9f..a30f431b92e 100644
--- a/plugin/server_audit/CMakeLists.txt
+++ b/plugin/server_audit/CMakeLists.txt
@@ -13,6 +13,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
 
-SET(SOURCES server_audit.c test_audit_v4.c plugin_audit_v4.h)
+SET(SOURCES server_audit.c)
 
 MYSQL_ADD_PLUGIN(server_audit ${SOURCES} MODULE_ONLY RECOMPILE_FOR_EMBEDDED)
diff --git a/plugin/server_audit/plugin_audit_v4.h b/plugin/server_audit/plugin_audit_v4.h
deleted file mode 100644
index a2a38806f4f..00000000000
--- a/plugin/server_audit/plugin_audit_v4.h
+++ /dev/null
@@ -1,561 +0,0 @@
-/* Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
-
-   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 the Free Software Foundation; version 2 of
-   the License.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
-
-#ifndef _my_audit_h
-#define _my_audit_h
-
-#ifndef PLUGIN_CONTEXT
-#include "plugin.h"
-#include "mysql/mysql_lex_string.h"
-#ifndef MYSQL_ABI_CHECK
-#include "m_string.h"
-#endif
-#include "my_command.h"
-#include "my_sqlcommand.h"
-#endif /*PLUGIN_CONTEXT*/
-
-#define MYSQL_AUDIT_INTERFACE_VERSION 0x0401
-
-/**
- @enum mysql_event_class_t
-
- Audit event classes.
-*/
-typedef enum
-{
-  MYSQL_AUDIT_GENERAL_CLASS          = 0,
-  MYSQL_AUDIT_CONNECTION_CLASS       = 1,
-  MYSQL_AUDIT_PARSE_CLASS            = 2,
-  MYSQL_AUDIT_AUTHORIZATION_CLASS    = 3,
-  MYSQL_AUDIT_TABLE_ACCESS_CLASS     = 4,
-  MYSQL_AUDIT_GLOBAL_VARIABLE_CLASS  = 5,
-  MYSQL_AUDIT_SERVER_STARTUP_CLASS   = 6,
-  MYSQL_AUDIT_SERVER_SHUTDOWN_CLASS  = 7,
-  MYSQL_AUDIT_COMMAND_CLASS          = 8,
-  MYSQL_AUDIT_QUERY_CLASS            = 9,
-  MYSQL_AUDIT_STORED_PROGRAM_CLASS   = 10,
-  /* This item must be last in the list. */
-  MYSQL_AUDIT_CLASS_MASK_SIZE
-} mysql_event_class_t;
-
-/**
-  @struct st_mysql_audit
-
-  The descriptor structure that is referred from st_mysql_plugin.
-*/
-struct st_mysql_audit
-{
-  /**
-    Interface version.
-  */
-  int interface_version;
-
-  /**
-    Event occurs when the event class consumer is to be
-    disassociated from the specified THD.This would typically occur
-    before some operation which may require sleeping - such as when
-    waiting for the next query from the client.
-  */
-  void (*release_thd)(MYSQL_THD);
-
-  /**
-    Invoked whenever an event occurs which is of any
-    class for which the plugin has interest.The second argument
-    indicates the specific event class and the third argument is data
-    as required for that class.
-  */
-  int (*event_notify)(MYSQL_THD, mysql_event_class_t, const void *);
-
-  /**
-    An array of bits used to indicate what event classes
-    that this plugin wants to receive.
-  */
-  unsigned long class_mask[MYSQL_AUDIT_CLASS_MASK_SIZE];
-};
-
-/**
-  @typedef enum_sql_command_t
-
-  SQL command type definition.
-*/
-typedef enum enum_sql_command enum_sql_command_t;
-
-/**
-  @enum mysql_event_general_subclass_t
-
-  Events for the MYSQL_AUDIT_GENERAL_CLASS event class.
-*/
-typedef enum
-{
-  /** occurs before emitting to the general query log. */
-  MYSQL_AUDIT_GENERAL_LOG    = 1 << 0,
-  /** occurs before transmitting errors to the user. */
-  MYSQL_AUDIT_GENERAL_ERROR  = 1 << 1,
-  /** occurs after transmitting a resultset to the user. */
-  MYSQL_AUDIT_GENERAL_RESULT = 1 << 2,
-  /** occurs after transmitting a resultset or errors */
-  MYSQL_AUDIT_GENERAL_STATUS = 1 << 3
-} mysql_event_general_subclass_t;
-
-#define MYSQL_AUDIT_GENERAL_ALL (MYSQL_AUDIT_GENERAL_LOG | \
-                                 MYSQL_AUDIT_GENERAL_ERROR | \
-                                 MYSQL_AUDIT_GENERAL_RESULT | \
-                                 MYSQL_AUDIT_GENERAL_STATUS)
-/**
-  @struct mysql_event_general
-
-  Structure for the MYSQL_AUDIT_GENERAL_CLASS event class.
-*/
-struct mysql_event_general
-{
-  mysql_event_general_subclass_t event_subclass;
-  int                            general_error_code;
-  unsigned long                  general_thread_id;
-  MYSQL_LEX_CSTRING              general_user;
-  MYSQL_LEX_CSTRING              general_command;
-  MYSQL_LEX_CSTRING              general_query;
-  struct charset_info_st         *general_charset;
-  unsigned long long             general_time;
-  unsigned long long             general_rows;
-  MYSQL_LEX_CSTRING              general_host;
-  MYSQL_LEX_CSTRING              general_sql_command;
-  MYSQL_LEX_CSTRING              general_external_user;
-  MYSQL_LEX_CSTRING              general_ip;
-};
-
-/**
-  @enum mysql_event_connection_subclass_t
-
-  Events for MYSQL_AUDIT_CONNECTION_CLASS event class.
-*/
-typedef enum
-{
-  /** occurs after authentication phase is completed. */
-  MYSQL_AUDIT_CONNECTION_CONNECT          = 1 << 0,
-  /** occurs after connection is terminated. */
-  MYSQL_AUDIT_CONNECTION_DISCONNECT       = 1 << 1,
-  /** occurs after COM_CHANGE_USER RPC is completed. */
-  MYSQL_AUDIT_CONNECTION_CHANGE_USER      = 1 << 2,
-  /** occurs before authentication. */
-  MYSQL_AUDIT_CONNECTION_PRE_AUTHENTICATE = 1 << 3
-} mysql_event_connection_subclass_t;
-
-#define MYSQL_AUDIT_CONNECTION_ALL (MYSQL_AUDIT_CONNECTION_CONNECT | \
-                                    MYSQL_AUDIT_CONNECTION_DISCONNECT | \
-                                    MYSQL_AUDIT_CONNECTION_CHANGE_USER | \
-                                    MYSQL_AUDIT_CONNECTION_PRE_AUTHENTICATE)
-/**
-  @struct mysql_event_connection
-
-  Structure for the MYSQL_AUDIT_CONNECTION_CLASS event class.
-*/
-struct mysql_event_connection
-{
-  /** Event subclass. */
-  mysql_event_connection_subclass_t event_subclass;
-  /** Current status of the connection. */
-  int                               status;
-  /** Connection id. */
-  unsigned long                     connection_id;
-  /** User name of this connection. */
-  MYSQL_LEX_CSTRING                 user;
-  /** Priv user name. */
-  MYSQL_LEX_CSTRING                 priv_user;
-  /** External user name. */
-  MYSQL_LEX_CSTRING                 external_user;
-  /** Proxy user used for this connection. */
-  MYSQL_LEX_CSTRING                 proxy_user;
-  /** Connection host. */
-  MYSQL_LEX_CSTRING                 host;
-  /** IP of the connection. */
-  MYSQL_LEX_CSTRING                 ip;
-  /** Database name specified at connection time. */
-  MYSQL_LEX_CSTRING                 database;
-  /** Connection type:
-        - 0 Undefined
-        - 1 TCP/IP
-        - 2 Socket
-        - 3 Named pipe
-        - 4 SSL
-        - 5 Shared memory
-  */
-  int                               connection_type;
-};
-
-/**
-@enum mysql_event_parse_subclass_t
-
-Events for MYSQL_AUDIT_PARSE_CLASS event class.
-*/
-typedef enum
-{
-  /** occurs before the query parsing. */
-  MYSQL_AUDIT_PARSE_PREPARSE  = 1 << 0,
-  /** occurs after the query parsing. */
-  MYSQL_AUDIT_PARSE_POSTPARSE = 1 << 1
-} mysql_event_parse_subclass_t;
-
-#define MYSQL_AUDIT_PARSE_ALL (MYSQL_AUDIT_PARSE_PREPARSE | \
-                               MYSQL_AUDIT_PARSE_POSTPARSE)
-
-typedef enum
-{
-  MYSQL_AUDIT_PARSE_REWRITE_PLUGIN_NONE                  = 0,
-  /// mysql_event_parse::flags Must be set by a plugin if the query is rewritten.
-  MYSQL_AUDIT_PARSE_REWRITE_PLUGIN_QUERY_REWRITTEN       = 1 << 0,
-  /// mysql_event_parse::flags Is set by the server if the query is prepared statement.
-  MYSQL_AUDIT_PARSE_REWRITE_PLUGIN_IS_PREPARED_STATEMENT = 1 << 1
-} mysql_event_parse_rewrite_plugin_flag;
-
-/** Data for the MYSQL_AUDIT_PARSE events */
-struct mysql_event_parse
-{
-  /** MYSQL_AUDIT_[PRE|POST]_PARSE event id */
-  mysql_event_parse_subclass_t           event_subclass;
-
-  /** one of FLAG_REWRITE_PLUGIN_* */
-  mysql_event_parse_rewrite_plugin_flag *flags;
-
-  /** input: the original query text */
-  MYSQL_LEX_CSTRING                     query;
-
-  /** output: returns the null-terminated rewritten query allocated by my_malloc() */
-  MYSQL_LEX_CSTRING                     *rewritten_query;
-};
-
-/**
-  @enum mysql_event_authorization_subclass_t
-
-  Events for MYSQL_AUDIT_AUTHORIZATION_CLASS event class.
-*/
-typedef enum
-{
-  MYSQL_AUDIT_AUTHORIZATION_USER      = 1 << 0,
-  /** Occurs when database privilege is checked. */
-  MYSQL_AUDIT_AUTHORIZATION_DB        = 1 << 1,
-  /** Occurs when table privilege is checked. */
-  MYSQL_AUDIT_AUTHORIZATION_TABLE     = 1 << 2,
-  /** Occurs when column privilege is checked. */
-  MYSQL_AUDIT_AUTHORIZATION_COLUMN    = 1 << 3,
-  /** Occurs when procedure privilege is checked. */
-  MYSQL_AUDIT_AUTHORIZATION_PROCEDURE = 1 << 4,
-  /** Occurs when proxy privilege is checked. */
-  MYSQL_AUDIT_AUTHORIZATION_PROXY     = 1 << 5
-} mysql_event_authorization_subclass_t;
-
-#define MYSQL_AUDIT_AUTHORIZATION_ALL (MYSQL_AUDIT_AUTHORIZATION_USER | \
-                                       MYSQL_AUDIT_AUTHORIZATION_DB | \
-                                       MYSQL_AUDIT_AUTHORIZATION_TABLE | \
-                                       MYSQL_AUDIT_AUTHORIZATION_COLUMN  | \
-                                       MYSQL_AUDIT_AUTHORIZATION_PROCEDURE | \
-                                       MYSQL_AUDIT_AUTHORIZATION_PROXY)
-/**
-  @struct mysql_event_authorization
-
-  Structure for MYSQL_AUDIT_AUTHORIZATION_CLASS event class.
-*/
-struct mysql_event_authorization
-{
-  /** Event subclass. */
-  mysql_event_authorization_subclass_t event_subclass;
-  /** Event status. */
-  int                                  status;
-  /** Connection id. */
-  unsigned int                         connection_id;
-  /** SQL command id. */
-  enum_sql_command_t                   sql_command_id;
-  /** SQL query text. */
-  MYSQL_LEX_CSTRING                    query;
-  /** SQL query charset. */
-  const struct charset_info_st         *query_charset;
-  /** Database name. */
-  MYSQL_LEX_CSTRING                    database;
-  /** Table name. */
-  MYSQL_LEX_CSTRING                    table;
-  /** Other name associated with the event. */
-  MYSQL_LEX_CSTRING                    object;
-  /** Requested authorization privileges. */
-  unsigned long                        requested_privilege;
-  /** Currently granted authorization privileges. */
-  unsigned long                        granted_privilege;
-};
-
-/**
-  @enum mysql_event_table_row_access_subclass_t
-
-  Events for MYSQL_AUDIT_TABLE_ACCES_CLASS event class.
-*/
-typedef enum
-{
-  /** Occurs when table data are read. */
-  MYSQL_AUDIT_TABLE_ACCESS_READ   = 1 << 0,
-  /** Occurs when table data are inserted. */
-  MYSQL_AUDIT_TABLE_ACCESS_INSERT = 1 << 1,
-  /** Occurs when table data are updated. */
-  MYSQL_AUDIT_TABLE_ACCESS_UPDATE = 1 << 2,
-  /** Occurs when table data are deleted. */
-  MYSQL_AUDIT_TABLE_ACCESS_DELETE = 1 << 3
-} mysql_event_table_access_subclass_t;
-
-#define MYSQL_AUDIT_TABLE_ACCESS_ALL (MYSQL_AUDIT_TABLE_ACCESS_READ | \
-                                      MYSQL_AUDIT_TABLE_ACCESS_INSERT | \
-                                      MYSQL_AUDIT_TABLE_ACCESS_UPDATE | \
-                                      MYSQL_AUDIT_TABLE_ACCESS_DELETE)
-
-/**
-  @struct mysql_event_table_row_access
-
-  Structure for MYSQL_AUDIT_TABLE_ACCES_CLASS event class.
-*/
-struct mysql_event_table_access
-{
-  /** Event subclass. */
-  mysql_event_table_access_subclass_t event_subclass;
-  /** Connection id. */
-  unsigned long                           connection_id;
-  /** SQL command id. */
-  enum_sql_command_t                      sql_command_id;
-  /** SQL query. */
-  MYSQL_LEX_CSTRING                       query;
-  /** SQL query charset. */
-  const struct charset_info_st            *query_charset;
-  /** Database name. */
-  MYSQL_LEX_CSTRING                       table_database;
-  /** Table name. */
-  MYSQL_LEX_CSTRING                       table_name;
-};
-
-/**
-  @enum mysql_event_global_variable_subclass_t
-
-  Events for MYSQL_AUDIT_GLOBAL_VARIABLE_CLASS event class.
-*/
-typedef enum
-{
-  /** Occurs when global variable is retrieved. */
-  MYSQL_AUDIT_GLOBAL_VARIABLE_GET = 1 << 0,
-  /** Occurs when global variable is set. */
-  MYSQL_AUDIT_GLOBAL_VARIABLE_SET = 1 << 1
-} mysql_event_global_variable_subclass_t;
-
-#define MYSQL_AUDIT_GLOBAL_VARIABLE_ALL (MYSQL_AUDIT_GLOBAL_VARIABLE_GET | \
-                                         MYSQL_AUDIT_GLOBAL_VARIABLE_SET)
-
-/** Events for MYSQL_AUDIT_GLOBAL_VARIABLE_CLASS event class. */
-struct mysql_event_global_variable
-{
-  /** Event subclass. */
-  mysql_event_global_variable_subclass_t event_subclass;
-  /** Connection id. */
-  unsigned long                          connection_id;
-  /** SQL command id. */
-  enum_sql_command_t                     sql_command_id;
-  /** Variable name. */
-  MYSQL_LEX_CSTRING                      variable_name;
-  /** Variable value. */
-  MYSQL_LEX_CSTRING                      variable_value;
-};
-
-/**
-  @enum mysql_event_server_startup_subclass_t
-
-  Events for MYSQL_AUDIT_SERVER_STARTUP_CLASS event class.
-*/
-typedef enum
-{
-  /** Occurs after all subsystem are initialized during system start. */
-  MYSQL_AUDIT_SERVER_STARTUP_STARTUP = 1 << 0
-} mysql_event_server_startup_subclass_t;
-
-#define MYSQL_AUDIT_SERVER_STARTUP_ALL (MYSQL_AUDIT_SERVER_STARTUP_STARTUP)
-
-/**
-  @struct mysql_event_server_startup
-
-  Structure for MYSQL_AUDIT_SERVER_STARTUP_CLASS event class.
-*/
-struct mysql_event_server_startup
-{
-  /** Event subclass. */
-  mysql_event_server_startup_subclass_t event_subclass;
-  /** Command line arguments. */
-  const char                            **argv;
-  /** Command line arguments count. */
-  unsigned int                          argc;
-};
-
-/**
-  @enum mysql_event_server_shutdown_subclass_t
-
-  Events for MYSQL_AUDIT_SERVER_SHUTDOWN_CLASS event class.
-*/
-typedef enum
-{
-  /** Occurs when global variable is set. */
-  MYSQL_AUDIT_SERVER_SHUTDOWN_SHUTDOWN = 1 << 0
-} mysql_event_server_shutdown_subclass_t;
-
-#define MYSQL_AUDIT_SERVER_SHUTDOWN_ALL (MYSQL_AUDIT_SERVER_SHUTDOWN_SHUTDOWN)
-
-/**
-  @enum mysql_server_shutdown_reason_t
-
-  Server shutdown reason.
-*/
-typedef enum
-{
-  /** User requested shut down. */
-  MYSQL_AUDIT_SERVER_SHUTDOWN_REASON_SHUTDOWN,
-  /** The server aborts. */
-  MYSQL_AUDIT_SERVER_SHUTDOWN_REASON_ABORT
-} mysql_server_shutdown_reason_t;
-
-/**
-  @struct mysql_event_server_shutdown
-
-  Structure for MYSQL_AUDIT_SERVER_SHUTDOWN_CLASS event class.
-*/
-struct mysql_event_server_shutdown
-{
-  /** Shutdown event. */
-  mysql_event_server_shutdown_subclass_t event_subclass;
-  /** Exit code associated with the shutdown event. */
-  int                                    exit_code;
-  /** Shutdown reason. */
-  mysql_server_shutdown_reason_t         reason;
-};
-
-/**
-  @enum mysql_event_command_subclass_t
-
-  Events for MYSQL_AUDIT_COMMAND_CLASS event class.
-*/
-typedef enum
-{
-  /** Command start event. */
-  MYSQL_AUDIT_COMMAND_START = 1 << 0,
-  /** Command end event. */
-  MYSQL_AUDIT_COMMAND_END   = 1 << 1
-} mysql_event_command_subclass_t;
-
-#define MYSQL_AUDIT_COMMAND_ALL (MYSQL_AUDIT_COMMAND_START | \
-                                 MYSQL_AUDIT_COMMAND_END)
-/**
-  @typedef enum_server_command_t
-
-  Server command type definition.
-*/
-typedef enum enum_server_command enum_server_command_t;
-
-/**
-  @struct mysql_event_command
-
-  Event for MYSQL_AUDIT_COMMAND_CLASS event class.
-  Events generated as a result of RPC command requests.
-*/
-struct mysql_event_command
-{
-  /** Command event subclass. */
-  mysql_event_command_subclass_t event_subclass;
-  /** Command event status. */
-  int                            status;
-  /** Connection id. */
-  unsigned long                  connection_id;
-  /** Command id. */
-  enum_server_command_t          command_id;
-};
-
-/**
-  @enum mysql_event_query_subclass_t
-
-  Events for MYSQL_AUDIT_QUERY_CLASS event class.
-*/
-typedef enum
-{
-  /** Query start event. */
-  MYSQL_AUDIT_QUERY_START             = 1 << 0,
-  /** Nested query start event. */
-  MYSQL_AUDIT_QUERY_NESTED_START      = 1 << 1,
-  /** Query post parse event. */
-  MYSQL_AUDIT_QUERY_STATUS_END        = 1 << 2,
-  /** Nested query status end event. */
-  MYSQL_AUDIT_QUERY_NESTED_STATUS_END = 1 << 3
-} mysql_event_query_subclass_t;
-
-#define MYSQL_AUDIT_QUERY_ALL (MYSQL_AUDIT_QUERY_START | \
-                               MYSQL_AUDIT_QUERY_NESTED_START | \
-                               MYSQL_AUDIT_QUERY_STATUS_END | \
-                               MYSQL_AUDIT_QUERY_NESTED_STATUS_END)
-/**
-  @struct mysql_event_command
-
-  Event for MYSQL_AUDIT_COMMAND_CLASS event class.
-*/
-struct mysql_event_query
-{
-  /** Event subclass. */
-  mysql_event_query_subclass_t event_subclass;
-  /** Event status. */
-  int                          status;
-  /** Connection id. */
-  unsigned long                connection_id;
-  /** SQL command id. */
-  enum_sql_command_t           sql_command_id;
-  /** SQL query. */
-  MYSQL_LEX_CSTRING            query;
-  /** SQL query charset. */
-  const struct charset_info_st *query_charset;
-};
-
-/**
-  @enum mysql_event_stored_program_subclass_t
-
-  Events for MYSQL_AUDIT_STORED_PROGRAM_CLASS event class.
-*/
-typedef enum
-{
-  /** Stored program execution event. */
-  MYSQL_AUDIT_STORED_PROGRAM_EXECUTE = 1 << 0
-} mysql_event_stored_program_subclass_t;
-
-#define MYSQL_AUDIT_STORED_PROGRAM_ALL (MYSQL_AUDIT_STORED_PROGRAM_EXECUTE)
-
-/**
-  @struct mysql_event_command
-
-Event for MYSQL_AUDIT_COMMAND_CLASS event class.
-*/
-struct mysql_event_stored_program
-{
-  /** Event subclass. */
-  mysql_event_stored_program_subclass_t event_subclass;
-  /** Connection id. */
-  unsigned long                         connection_id;
-  /** SQL command id. */
-  enum_sql_command_t                    sql_command_id;
-  /** SQL query text. */
-  MYSQL_LEX_CSTRING                     query;
-  /** SQL query charset. */
-  const struct charset_info_st          *query_charset;
-  /** The Database the procedure is defined in. */
-  MYSQL_LEX_CSTRING                     database;
-  /** Name of the stored program. */
-  MYSQL_LEX_CSTRING                     name;
-  /** Stored program parameters. */
-  void                                  *parameters;
-};
-
-#endif
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c
index bfda256c83b..57c9ada2d51 100644
--- a/plugin/server_audit/server_audit.c
+++ b/plugin/server_audit/server_audit.c
@@ -18,8 +18,6 @@
 #define PLUGIN_VERSION 0x106
 #define PLUGIN_STR_VERSION "1.6.0"
 
-#define _my_thread_var loc_thread_var
-
 #include <my_config.h>
 #include <assert.h>
 
@@ -72,17 +70,6 @@ static void closelog() {}
 
 #endif /*!_WIN32*/
 
-/*
-   Defines that can be used to reshape the pluging:
-   #define MARIADB_ONLY
-   #define USE_MARIA_PLUGIN_INTERFACE
-*/
-
-#if !defined(MYSQL_DYNAMIC_PLUGIN) && !defined(MARIADB_ONLY)
-#include <typelib.h>
-#define MARIADB_ONLY
-#endif /*MYSQL_PLUGIN_DYNAMIC*/
-
 #include <my_global.h>
 #include <my_base.h>
 #include <typelib.h>
@@ -95,10 +82,6 @@ static void closelog() {}
 #define RTLD_DEFAULT NULL
 #endif
 
-static char **int_mysql_data_home;
-static char *default_home= (char *)".";
-#define mysql_data_home (*int_mysql_data_home)
-
 #ifndef HOSTNAME_LENGTH
 #define HOSTNAME_LENGTH 255
 #endif
@@ -128,20 +111,11 @@ static char *default_home= (char *)".";
 #endif /*WIN32*/
 
 
-extern MYSQL_PLUGIN_IMPORT char server_version[];
-static const char *serv_ver= NULL;
 const char *(*thd_priv_host_ptr)(MYSQL_THD thd, size_t *length);
-static int started_mysql= 0;
-static int mysql_57_started= 0;
-static int debug_server_started= 0;
-static int use_event_data_for_disconnect= 0;
-static int started_mariadb= 0;
-static int maria_55_started= 0;
-static int maria_above_5= 0;
 static char *incl_users, *excl_users,
             *file_path, *syslog_info;
 static char path_buffer[FN_REFLEN];
-static unsigned int mode, mode_readonly= 0;
+static unsigned int mode;
 static ulong output_type;
 static ulong syslog_facility, syslog_priority;
 
@@ -400,8 +374,6 @@ static long log_write_failures= 0;
 static char current_log_buf[FN_REFLEN]= "";
 static char last_error_buf[512]= "";
 
-extern void *mysql_v4_descriptor;
-
 static struct st_mysql_show_var audit_status[]=
 {
   {"server_audit_active", (char *)&is_active, SHOW_BOOL},
@@ -422,13 +394,7 @@ static PSI_rwlock_info rwlock_key_list[]=
 static mysql_prlock_t lock_operations;
 static mysql_mutex_t lock_atomic;
 
-/* The Percona server and partly MySQL don't support         */
-/* launching client errors in the 'update_variable' methods. */
-/* So the client errors just disabled for them.              */
-/* The possible solution is to implement the 'check_variable'*/
-/* methods there properly, but at the moment i'm not sure it */
-/* worths doing.                                             */
-#define CLIENT_ERROR if (!started_mysql) my_printf_error
+#define CLIENT_ERROR my_printf_error
 
 #define ADD_ATOMIC(x, a)              \
   do {                                \
@@ -1102,13 +1068,7 @@ static void setup_connection_connect(MYSQL_THD thd,struct connection_info *cn,
       // 5 is "'" around host and user and "@"
       priv_host= event->proxy_user +
             sizeof(char[MAX_HOSTNAME + USERNAME_LENGTH + 5]);
-      if (mysql_57_started)
-      {
-        priv_host+= sizeof(size_t);
-        priv_host_length= *(size_t *) (priv_host + MAX_HOSTNAME);
-      }
-      else
-        priv_host_length= strlen(priv_host);
+      priv_host_length= strlen(priv_host);
     }
 
 
@@ -2028,12 +1988,8 @@ static void update_connection_info(MYSQL_THD thd, struct connection_info *cn,
           if (init_db_command)
           {
             /* Change DB */
-            if (mysql_57_started)
-              get_str_n(cn->db, &cn->db_length, sizeof(cn->db),
-                  event->database.str, event->database.length);
-            else
-              get_str_n(cn->db, &cn->db_length, sizeof(cn->db),
-                  event->general_query, event->general_query_length);
+            get_str_n(cn->db, &cn->db_length, sizeof(cn->db),
+                      event->general_query, event->general_query_length);
           }
           cn->query_id= mode ? query_counter++ : event->query_id;
           cn->query= event->general_query;
@@ -2176,34 +2132,7 @@ void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev)
   if (!thd || internal_stop_logging)
     return;
 
-  if (maria_55_started && debug_server_started &&
-      event_class == MYSQL_AUDIT_GENERAL_CLASS)
-  {
-    /*
-      There's a bug in MariaDB 5.5 that prevents using thread local
-      variables in some cases.
-      The 'select * from notexisting_table;' query produces such case.
-      So just use the static buffer in this case.
-    */
-    const struct mysql_event_general *event =
-      (const struct mysql_event_general *) ev;
-
-    if (event->event_subclass == MYSQL_AUDIT_GENERAL_ERROR ||
-        (event->event_subclass == MYSQL_AUDIT_GENERAL_STATUS && 
-         event->general_query_length == 0 &&
-         cn_error_buffer.query_id == event->query_id))
-    {
-      cn= &cn_error_buffer;
-      cn->header= 1;
-    }
-    else
-      cn= get_loc_info(thd);
-  }
-  else
-  {
-    cn= get_loc_info(thd);
-  }
-
+  cn= get_loc_info(thd);
   update_connection_info(thd, cn, event_class, ev, &after_action);
 
   if (!logging)
@@ -2275,10 +2204,7 @@ void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev)
           log_proxy(cn, event);
         break;
       case MYSQL_AUDIT_CONNECTION_DISCONNECT:
-        if (use_event_data_for_disconnect)
-          log_connection_event(event, "DISCONNECT");
-        else
-          log_connection(&ci_disconnect_buffer, event, "DISCONNECT");
+        log_connection_event(event, "DISCONNECT");
         break;
       case MYSQL_AUDIT_CONNECTION_CHANGE_USER:
         log_connection(cn, event, "CHANGEUSER");
@@ -2328,131 +2254,6 @@ struct mysql_event_general_v8
 };
 
 
-static void auditing_v8(MYSQL_THD thd, struct mysql_event_general_v8 *ev_v8)
-{
-#ifdef __linux__
-#ifdef DBUG_OFF
-  #ifdef __x86_64__
-  static const int cmd_off= 4200;
-  static const int db_off= 120;
-  static const int db_len_off= 128;
-  #else
-  static const int cmd_off= 2668;
-  static const int db_off= 60;
-  static const int db_len_off= 64;
-  #endif /*x86_64*/
-#else
-  #ifdef __x86_64__
-  static const int cmd_off= 4432;
-  static const int db_off= 120;
-  static const int db_len_off= 128;
-  #else
-  static const int cmd_off= 2808;
-  static const int db_off= 64;
-  static const int db_len_off= 68;
-  #endif /*x86_64*/
-#endif /*DBUG_OFF*/
-#endif /* __linux__ */
-
-  struct mysql_event_general event;
-
-  if (ev_v8->event_class != MYSQL_AUDIT_GENERAL_CLASS)
-    return;
-
-  event.event_subclass= ev_v8->event_subclass;
-  event.general_error_code= ev_v8->general_error_code;
-  event.general_thread_id= ev_v8->general_thread_id;
-  event.general_user= ev_v8->general_user;
-  event.general_user_length= ev_v8->general_user_length;
-  event.general_command= ev_v8->general_command;
-  event.general_command_length= ev_v8->general_command_length;
-  event.general_query= ev_v8->general_query;
-  event.general_query_length= ev_v8->general_query_length;
-  event.general_charset= ev_v8->general_charset;
-  event.general_time= ev_v8->general_time;
-  event.general_rows= ev_v8->general_rows;
-  event.database.str= 0;
-  event.database.length= 0;
-
-  if (event.general_query_length > 0)
-  {
-    event.event_subclass= MYSQL_AUDIT_GENERAL_STATUS;
-    event.general_command= "Query";
-    event.general_command_length= 5;
-#ifdef __linux__
-    event.database.str= *(char **) (((char *) thd) + db_off);
-    event.database.length= *(size_t *) (((char *) thd) + db_len_off);
-#endif /*__linux*/
-  }
-#ifdef __linux__
-  else if (*((int *) (((char *)thd) + cmd_off)) == 2)
-  {
-    event.event_subclass= MYSQL_AUDIT_GENERAL_LOG;
-    event.general_command= "Init DB";
-    event.general_command_length= 7;
-    event.general_query= *(char **) (((char *) thd) + db_off);
-    event.general_query_length= *(size_t *) (((char *) thd) + db_len_off);
-  }
-#endif /*__linux*/
-  auditing(thd, ev_v8->event_class, &event);
-}
-
-
-static void auditing_v13(MYSQL_THD thd, unsigned int *ev_v0)
-{
-  struct mysql_event_general event= *(const struct mysql_event_general *) (ev_v0+1);
-
-  if (event.general_query_length > 0)
-  {
-    event.event_subclass= MYSQL_AUDIT_GENERAL_STATUS;
-    event.general_command= "Query";
-    event.general_command_length= 5;
-  }
-  auditing(thd, ev_v0[0], &event);
-}
-
-
-int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len)
-{
-#ifdef __linux__
-  int db_off;
-  int db_len_off;
-  if (debug_server_started)
-  {
-#ifdef __x86_64__
-    db_off= 608;
-    db_len_off= 616;
-#elif __aarch64__
-    db_off= 632;
-    db_len_off= 640;
-#else
-    db_off= 0;
-    db_len_off= 0;
-#endif /*x86_64*/
-  }
-  else
-  {
-#ifdef __x86_64__
-    db_off= 536;
-    db_len_off= 544;
-#elif __aarch64__
-    db_off= 552;
-    db_len_off= 560;
-#else
-    db_off= 0;
-    db_len_off= 0;
-#endif /*x86_64*/
-  }
-
-  *name= *(char **) (((char *) thd) + db_off);
-  *len= *((size_t *) (((char*) thd) + db_len_off));
-  if (*name && (*name)[*len] != 0)
-    return 1;
-  return 0;
-#else
-  return 1;
-#endif
-}
 /*
    As it's just too difficult to #include "sql_class.h",
    let's just copy the necessary part of the system_variables
@@ -2530,53 +2331,9 @@ typedef struct loc_system_variables
 
 static int init_done= 0;
 
-static void* find_sym(const char *sym)
-{
-#ifdef _WIN32
-  return GetProcAddress(GetModuleHandle("server.dll"),sym);
-#else
-  return dlsym(RTLD_DEFAULT, sym);
-#endif
-}
-
 static int server_audit_init(void *p __attribute__((unused)))
 {
-  if (!serv_ver)
-  {
-    serv_ver= find_sym("server_version");
-  }
-
-  if (!mysql_57_started)
-  {
-    const void *my_hash_init_ptr= find_sym("_my_hash_init");
-    if (!my_hash_init_ptr)
-    {
-      maria_above_5= 1;
-      my_hash_init_ptr= find_sym("my_hash_init2");
-    }
-    if (!my_hash_init_ptr)
-      return 1;
-
-    thd_priv_host_ptr= dlsym(RTLD_DEFAULT, "thd_priv_host");
-  }
-
-  if(!(int_mysql_data_home= find_sym("mysql_data_home")))
-  {
-    if(!(int_mysql_data_home= find_sym("?mysql_data_home@@3PADA")))
-      int_mysql_data_home= &default_home;
-  }
-
-  if (!serv_ver)
-    return 1;
-
-  if (!started_mysql)
-  {
-    if (!maria_above_5 && serv_ver[4]=='3' && serv_ver[5]<'3')
-    {
-      mode= 1;
-      mode_readonly= 1;
-    }
-  }
+  thd_priv_host_ptr= dlsym(RTLD_DEFAULT, "thd_priv_host");
 
   if (gethostname(servhost, sizeof(servhost)))
     strcpy(servhost, "unknown");
@@ -2616,7 +2373,7 @@ static int server_audit_init(void *p __attribute__((unused)))
 
   /* The Query Cache shadows TABLE events if the result is taken from it */
   /* so we warn users if both Query Caсhe and TABLE events enabled.      */
-  if (!started_mysql && FILTER(EVENT_TABLE))
+  if (FILTER(EVENT_TABLE))
   {
     ulonglong *qc_size= (ulonglong *) dlsym(RTLD_DEFAULT, "query_cache_size");
     if (qc_size == NULL || *qc_size != 0)
@@ -2651,15 +2408,6 @@ static int server_audit_init(void *p __attribute__((unused)))
 }
 
 
-static int server_audit_init_mysql(void *p)
-{
-  started_mysql= 1;
-  mode= 1;
-  mode_readonly= 1;
-  return server_audit_init(p);
-}
-
-
 static int server_audit_deinit(void *p __attribute__((unused)))
 {
   if (!init_done)
@@ -2708,34 +2456,6 @@ static void sync_log(MYSQL_THD thd  __attribute__((unused)),
 }
 
 
-static struct st_mysql_audit mysql_descriptor =
-{
-  MYSQL_AUDIT_INTERFACE_VERSION,
-  NULL,
-  auditing,
-  { MYSQL_AUDIT_GENERAL_CLASSMASK | MYSQL_AUDIT_CONNECTION_CLASSMASK }
-};
-
-
-mysql_declare_plugin(server_audit)
-{
-  MYSQL_AUDIT_PLUGIN,
-  &mysql_descriptor,
-  "SERVER_AUDIT",
-  " Alexey Botchkov (MariaDB Corporation)",
-  "Audit the server activity",
-  PLUGIN_LICENSE_GPL,
-  server_audit_init_mysql,
-  server_audit_deinit,
-  PLUGIN_VERSION,
-  audit_status,
-  vars,
-  NULL,
-  0
-}
-mysql_declare_plugin_end;
-
-
 static struct st_mysql_audit maria_descriptor =
 {
   MYSQL_AUDIT_INTERFACE_VERSION,
@@ -2810,8 +2530,7 @@ static void update_file_path(MYSQL_THD thd,
   error_header();
   fprintf(stderr, "Log file name was changed to '%s'.\n", new_name);
 
-  if (!maria_55_started || !debug_server_started)
-    mysql_prlock_wrlock(&lock_operations);
+  mysql_prlock_wrlock(&lock_operations);
 
   if (logging)
     log_current_query(thd);
@@ -2842,8 +2561,7 @@ static void update_file_path(MYSQL_THD thd,
   path_buffer[sizeof(path_buffer)-1]= 0;
   file_path= path_buffer;
 exit_func:
-  if (!maria_55_started || !debug_server_started)
-    mysql_prlock_unlock(&lock_operations);
+  mysql_prlock_unlock(&lock_operations);
   ADD_ATOMIC(internal_stop_logging, -1);
 }
 
@@ -2896,8 +2614,7 @@ static void update_file_buffer_size(MYSQL_THD thd  __attribute__((unused)),
     return;
 
   ADD_ATOMIC(internal_stop_logging, 1);
-  if (!maria_55_started || !debug_server_started)
-    mysql_prlock_wrlock(&lock_operations);
+  mysql_prlock_wrlock(&lock_operations);
 
   if (logger_resize_buffer(logfile, file_buffer_size))
   {
@@ -2908,8 +2625,7 @@ static void update_file_buffer_size(MYSQL_THD thd  __attribute__((unused)),
                  MYF(ME_WARNING));
   }
 
-  if (!maria_55_started || !debug_server_started)
-    mysql_prlock_unlock(&lock_operations);
+  mysql_prlock_unlock(&lock_operations);
   ADD_ATOMIC(internal_stop_logging, -1);
 }
 
@@ -2954,8 +2670,7 @@ static void update_incl_users(MYSQL_THD thd,
 {
   char *new_users= (*(char **) save) ? *(char **) save : empty_str;
   size_t new_len= strlen(new_users) + 1;
-  if (!maria_55_started || !debug_server_started)
-    mysql_prlock_wrlock(&lock_operations);
+  mysql_prlock_wrlock(&lock_operations);
   mark_always_logged(thd);
 
   if (new_len > sizeof(incl_user_buffer))
@@ -2968,8 +2683,7 @@ static void update_incl_users(MYSQL_THD thd,
   user_coll_fill(&incl_user_coll, incl_users, &excl_user_coll, 1);
   error_header();
   fprintf(stderr, "server_audit_incl_users set to '%s'.\n", incl_users);
-  if (!maria_55_started || !debug_server_started)
-    mysql_prlock_unlock(&lock_operations);
+  mysql_prlock_unlock(&lock_operations);
 }
 
 
@@ -2979,8 +2693,7 @@ static void update_excl_users(MYSQL_THD thd  __attribute__((unused)),
 {
   char *new_users= (*(char **) save) ? *(char **) save : empty_str;
   size_t new_len= strlen(new_users) + 1;
-  if (!maria_55_started || !debug_server_started)
-    mysql_prlock_wrlock(&lock_operations);
+  mysql_prlock_wrlock(&lock_operations);
   mark_always_logged(thd);
 
   if (new_len > sizeof(excl_user_buffer))
@@ -2993,8 +2706,7 @@ static void update_excl_users(MYSQL_THD thd  __attribute__((unused)),
   user_coll_fill(&excl_user_coll, excl_users, &incl_user_coll, 0);
   error_header();
   fprintf(stderr, "server_audit_excl_users set to '%s'.\n", excl_users);
-  if (!maria_55_started || !debug_server_started)
-    mysql_prlock_unlock(&lock_operations);
+  mysql_prlock_unlock(&lock_operations);
 }
 
 
@@ -3071,8 +2783,7 @@ static void update_logging(MYSQL_THD thd,
     return;
 
   ADD_ATOMIC(internal_stop_logging, 1);
-  if (!maria_55_started || !debug_server_started)
-    mysql_prlock_wrlock(&lock_operations);
+  mysql_prlock_wrlock(&lock_operations);
   if ((logging= new_logging))
   {
     start_logging();
@@ -3088,8 +2799,7 @@ static void update_logging(MYSQL_THD thd,
     stop_logging();
   }
 
-  if (!maria_55_started || !debug_server_started)
-    mysql_prlock_unlock(&lock_operations);
+  mysql_prlock_unlock(&lock_operations);
   ADD_ATOMIC(internal_stop_logging, -1);
 }
 
@@ -3099,18 +2809,16 @@ static void update_mode(MYSQL_THD thd  __attribute__((unused)),
               void *var_ptr  __attribute__((unused)), const void *save)
 {
   unsigned int new_mode= *(unsigned int *) save;
-  if (mode_readonly || new_mode == mode)
+  if (new_mode == mode)
     return;
 
   ADD_ATOMIC(internal_stop_logging, 1);
-  if (!maria_55_started || !debug_server_started)
-    mysql_prlock_wrlock(&lock_operations);
+  mysql_prlock_wrlock(&lock_operations);
   mark_always_logged(thd);
   error_header();
   fprintf(stderr, "Logging mode was changed from %d to %d.\n", mode, new_mode);
   mode= new_mode;
-  if (!maria_55_started || !debug_server_started)
-    mysql_prlock_unlock(&lock_operations);
+  mysql_prlock_unlock(&lock_operations);
   ADD_ATOMIC(internal_stop_logging, -1);
 }
 
@@ -3136,84 +2844,18 @@ static void update_syslog_ident(MYSQL_THD thd  __attribute__((unused)),
 }
 
 
-struct st_my_thread_var *loc_thread_var(void)
+IF_WIN(static,__attribute__ ((constructor)))
+void audit_plugin_so_init(void)
 {
-  return 0;
+  memset(locinfo_ini_value, 'O', sizeof(locinfo_ini_value)-1);
+  locinfo_ini_value[sizeof(locinfo_ini_value)-1]= 0;
 }
 
-
-
 #ifdef _WIN32
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-  if (fdwReason != DLL_PROCESS_ATTACH)
-    return 1;
-
-  serv_ver= server_version;
-#else
-void __attribute__ ((constructor)) audit_plugin_so_init(void)
-{
-  serv_ver= server_version;
-#endif /*_WIN32*/
-
-  if (!serv_ver)
-    goto exit;
-
-  started_mariadb= strstr(serv_ver, "MariaDB") != 0;
-  debug_server_started= strstr(serv_ver, "debug") != 0;
-
-  if (started_mariadb)
-  {
-    if (serv_ver[0] == '1')
-      use_event_data_for_disconnect= 1;
-    else
-      maria_55_started= 1;
-  }
-  else
-  {
-    /* Started MySQL. */
-    if (serv_ver[0] == '5' && serv_ver[2] == '5')
-    {
-      int sc= serv_ver[4] - '0';
-      if (serv_ver[5] >= '0' && serv_ver[5] <= '9')
-        sc= sc * 10 + serv_ver[5] - '0';
-      if (sc <= 10)
-      {
-        mysql_descriptor.interface_version= 0x0200;
-        mysql_descriptor.event_notify= (void *) auditing_v8;
-      }
-      else if (sc < 14)
-      {
-        mysql_descriptor.interface_version= 0x0200;
-        mysql_descriptor.event_notify= (void *) auditing_v13;
-      }
-    }
-    else if (serv_ver[0] == '5' && serv_ver[2] == '6')
-    {
-      int sc= serv_ver[4] - '0';
-      if (serv_ver[5] >= '0' && serv_ver[5] <= '9')
-        sc= sc * 10 + serv_ver[5] - '0';
-      if (sc >= 24)
-        use_event_data_for_disconnect= 1;
-    }
-    else if ((serv_ver[0] == '5' && serv_ver[2] == '7') ||
-             (serv_ver[0] == '8' && serv_ver[2] == '0'))
-    {
-      mysql_57_started= 1;
-      _mysql_plugin_declarations_[0].info= mysql_v4_descriptor;
-      use_event_data_for_disconnect= 1;
-    }
-    MYSQL_SYSVAR_NAME(loc_info).flags= PLUGIN_VAR_STR | PLUGIN_VAR_THDLOCAL |
-      PLUGIN_VAR_READONLY | PLUGIN_VAR_MEMALLOC;
-  }
-
-  memset(locinfo_ini_value, 'O', sizeof(locinfo_ini_value)-1);
-  locinfo_ini_value[sizeof(locinfo_ini_value)-1]= 0;
-
-exit:
-#ifdef _WIN32
+  if (fdwReason == DLL_PROCESS_ATTACH)
+    audit_plugin_so_init();
   return 1;
-#else
-  return;
-#endif
 }
+#endif
diff --git a/plugin/server_audit/test_audit_v4.c b/plugin/server_audit/test_audit_v4.c
deleted file mode 100644
index f37d8c7c34a..00000000000
--- a/plugin/server_audit/test_audit_v4.c
+++ /dev/null
@@ -1,163 +0,0 @@
-#define PLUGIN_CONTEXT
-
-/* Can't use <my_global.h> as this includes plugin.h */
-#include <stdio.h>
-
-typedef void *MYSQL_THD;
-struct st_mysql_const_lex_string
-{
-  const char *str;
-  size_t length;
-};
-typedef struct st_mysql_const_lex_string MYSQL_LEX_CSTRING;
-enum enum_sql_command{ SQLCOM_A, SQLCOM_B };
-enum enum_server_command{ SERVCOM_A, SERVCOM_B };
-
-#include "plugin_audit_v4.h"
-
-extern void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev);
-extern int get_db_mysql57(MYSQL_THD thd, char **name, size_t *len);
-
-
-struct mysql_event_general_302
-{
-  unsigned int event_subclass;
-  int general_error_code;
-  unsigned long general_thread_id;
-  const char *general_user;
-  unsigned int general_user_length;
-  const char *general_command;
-  unsigned int general_command_length;
-  const char *general_query;
-  unsigned int general_query_length;
-  struct charset_info_st *general_charset;
-  unsigned long long general_time;
-  unsigned long long general_rows;
-  unsigned long long query_id;
-  char *database;
-  size_t database_length;
-};
-
-
-static int auditing_v4(MYSQL_THD thd, mysql_event_class_t class, const void *ev)
-{
-  int *subclass= (int *)ev;
-  struct mysql_event_general_302 ev_302;
-  int subclass_v3, subclass_orig;
-
-  if (class != MYSQL_AUDIT_GENERAL_CLASS &&
-      class != MYSQL_AUDIT_CONNECTION_CLASS)
-    return 0;
-
-  subclass_orig= *subclass;
-
-  if (class == MYSQL_AUDIT_GENERAL_CLASS)
-  {
-    struct mysql_event_general *event= (struct mysql_event_general *) ev;
-    ev_302.general_error_code= event->general_error_code;
-    ev_302.general_thread_id= event->general_thread_id;
-    ev_302.general_user= event->general_user.str;
-    ev_302.general_user_length= (unsigned int)event->general_user.length;
-    ev_302.general_command= event->general_command.str;
-    ev_302.general_command_length= (unsigned int)event->general_command.length;
-    ev_302.general_query= event->general_query.str;
-    ev_302.general_query_length= (unsigned int)event->general_query.length;
-    ev_302.general_charset= event->general_charset;
-    ev_302.general_time= event->general_time;
-    ev_302.general_rows= event->general_rows;
-    if (get_db_mysql57(thd, &ev_302.database, &ev_302.database_length))
-    {
-      ev_302.database= 0;
-      ev_302.database_length= 0;
-    }
-    ev= &ev_302;
-    switch (subclass_orig)
-    {
-      case MYSQL_AUDIT_GENERAL_LOG:
-        subclass_v3= 0;
-        ev_302.event_subclass= 0;
-        break;
-      case MYSQL_AUDIT_GENERAL_ERROR:
-        subclass_v3= 1;
-        ev_302.event_subclass= 1;
-        break;
-      case MYSQL_AUDIT_GENERAL_RESULT:
-        subclass_v3= 2;
-        ev_302.event_subclass= 2;
-        break;
-      case MYSQL_AUDIT_GENERAL_STATUS:
-      {
-        subclass_v3= 3;
-        ev_302.event_subclass= 3;
-        break;
-      }
-      default:
-        return 0;
-    }
-  }
-  else /* if (class == MYSQL_AUDIT_CONNECTION_CLASS) */
-  {
-    switch (subclass_orig)
-    {
-      case MYSQL_AUDIT_CONNECTION_CONNECT:
-        subclass_v3= 0;
-        break;
-      case MYSQL_AUDIT_CONNECTION_DISCONNECT:
-        subclass_v3= 1;
-        break;
-      default:
-        return 0;
-    }
-  }
-
-  *subclass= subclass_v3;
-
-  auditing(thd, (int) class, ev);
-
-  *subclass= subclass_orig;
-  return 0;
-}
-
-
-static struct st_mysql_audit mysql_descriptor =
-{
-  MYSQL_AUDIT_INTERFACE_VERSION,
-  NULL,
-  auditing_v4,
-  { (unsigned long) MYSQL_AUDIT_GENERAL_ALL,
-    (unsigned long) MYSQL_AUDIT_CONNECTION_ALL,
-    (unsigned long) MYSQL_AUDIT_PARSE_ALL,
-    0, /* This event class is currently not supported. */
-    0, /* This event class is currently not supported. */
-    (unsigned long) MYSQL_AUDIT_GLOBAL_VARIABLE_ALL,
-    (unsigned long) MYSQL_AUDIT_SERVER_STARTUP_ALL,
-    (unsigned long) MYSQL_AUDIT_SERVER_SHUTDOWN_ALL,
-    (unsigned long) MYSQL_AUDIT_COMMAND_ALL,
-    (unsigned long) MYSQL_AUDIT_QUERY_ALL,
-    (unsigned long) MYSQL_AUDIT_STORED_PROGRAM_ALL }
-#ifdef WHEN_MYSQL_BUG_FIXED
-  /*
-    By this moment MySQL just sends no notifications at all
-    when we request only those we actually need.
-    So we have to request everything and filter them inside the
-    handling function.                                
-  */
-  { (unsigned long) MYSQL_AUDIT_GENERAL_ALL,
-    (unsigned long) (MYSQL_AUDIT_CONNECTION_CONNECT |
-                     MYSQL_AUDIT_CONNECTION_DISCONNECT),
-    0,
-    0, /* This event class is currently not supported. */
-    0, /* This event class is currently not supported. */
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-  }
-#endif /*WHEN_MYSQL_BUG_FIXED*/
-};
-
-
-void *mysql_v4_descriptor= &mysql_descriptor;
-

From 55505fdac96766b76fe8fd331149844458578ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Wed, 26 Nov 2025 17:10:44 +0200
Subject: [PATCH 055/119] MDEV-38126: Fix -DWITH_UBSAN=ON

logger_init_mutexes(void): Define the function as taking no
arguments, to avoid function pointer type mismatch.

my_b_flush_io_cache(): runtime error: addition of unsigned offset ...
overflowed. Cast to a signed offset.
---
 mysys/file_logger.c | 2 +-
 mysys/mf_iocache.c  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mysys/file_logger.c b/mysys/file_logger.c
index 2cb6502074e..496b9087215 100644
--- a/mysys/file_logger.c
+++ b/mysys/file_logger.c
@@ -311,7 +311,7 @@ int logger_set_rotations(LOGGER_HANDLE *log, unsigned int new_rotations)
   return 0;
 }
 
-void logger_init_mutexes()
+void logger_init_mutexes(void)
 {
 #ifdef HAVE_PSI_INTERFACE
   if (unlikely(PSI_server))
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index fabd9237e1c..61dfbe80964 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -1790,7 +1790,8 @@ int my_b_flush_io_cache(IO_CACHE *info, int need_append_buffer_lock)
 
     if ((length=(size_t) (info->write_pos - info->write_buffer)))
     {
-      my_off_t eof= info->end_of_file + info->write_pos - info->append_read_pos;
+      my_off_t eof= info->end_of_file +
+        (ptrdiff_t)(info->write_pos - info->append_read_pos);
       if (append_cache)
       {
         if (tmp_file_track(info, eof) ||

From b56c29573ec75c07c5863e6da049919cc4777918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Wed, 26 Nov 2025 17:11:32 +0200
Subject: [PATCH 056/119] MDEV-38126: Convert plugin/server_audit to C++11

To be able to improve performance, let us move from C90 to C++11,
which introduced std::atomic.
---
 plugin/server_audit/CMakeLists.txt            |  2 +-
 .../{server_audit.c => server_audit.cc}       | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)
 rename plugin/server_audit/{server_audit.c => server_audit.cc} (99%)

diff --git a/plugin/server_audit/CMakeLists.txt b/plugin/server_audit/CMakeLists.txt
index a30f431b92e..30249132e53 100644
--- a/plugin/server_audit/CMakeLists.txt
+++ b/plugin/server_audit/CMakeLists.txt
@@ -13,6 +13,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
 
-SET(SOURCES server_audit.c)
+SET(SOURCES server_audit.cc)
 
 MYSQL_ADD_PLUGIN(server_audit ${SOURCES} MODULE_ONLY RECOMPILE_FOR_EMBEDDED)
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.cc
similarity index 99%
rename from plugin/server_audit/server_audit.c
rename to plugin/server_audit/server_audit.cc
index 57c9ada2d51..b007c611029 100644
--- a/plugin/server_audit/server_audit.c
+++ b/plugin/server_audit/server_audit.cc
@@ -380,7 +380,7 @@ static struct st_mysql_show_var audit_status[]=
   {"server_audit_current_log", current_log_buf, SHOW_CHAR},
   {"server_audit_writes_failed", (char *)&log_write_failures, SHOW_LONG},
   {"server_audit_last_error", last_error_buf, SHOW_CHAR},
-  {0,0,0}
+  {0,0,SHOW_UNDEF}
 };
 
 #ifdef HAVE_PSI_INTERFACE
@@ -539,10 +539,9 @@ static int coll_insert(struct user_coll *c, char *n, size_t len)
   if (c->n_users >= c->n_alloced)
   {
     c->n_alloced+= 128;
-    if (c->users == NULL)
-      c->users= malloc(c->n_alloced * sizeof(c->users[0]));
-    else
-      c->users= realloc(c->users, c->n_alloced * sizeof(c->users[0]));
+    const size_t size{c->n_alloced * sizeof *c->users};
+    c->users= static_cast<user_name*>
+      (c->users ? realloc(c->users, size) : malloc(size));
 
     if (c->users == NULL)
       return 1;
@@ -1743,7 +1742,7 @@ static int log_statement_ex(struct connection_info *cn,
   {
     const char *orig_query= query;
 
-    if ((query= skip_set_statement(query)) == SQLCOM_NOTHING)
+    if (!(query= skip_set_statement(query)))
       return 0;
 
     if (events & EVENT_QUERY_DDL)
@@ -1787,7 +1786,7 @@ do_log_query:
   if (query_len > (message_size - csize)/2)
   {
     size_t big_buffer_alloced= (query_len * 2 + csize + 4095) & ~4095L;
-    if(!(big_buffer= malloc(big_buffer_alloced)))
+    if (!(big_buffer= static_cast<char*>(malloc(big_buffer_alloced))))
       return 0;
 
     memcpy(big_buffer, message, csize);
@@ -2333,7 +2332,8 @@ static int init_done= 0;
 
 static int server_audit_init(void *p __attribute__((unused)))
 {
-  thd_priv_host_ptr= dlsym(RTLD_DEFAULT, "thd_priv_host");
+  thd_priv_host_ptr= reinterpret_cast<decltype(thd_priv_host_ptr)>
+    (dlsym(RTLD_DEFAULT, "thd_priv_host"));
 
   if (gethostname(servhost, sizeof(servhost)))
     strcpy(servhost, "unknown");
@@ -2845,14 +2845,14 @@ static void update_syslog_ident(MYSQL_THD thd  __attribute__((unused)),
 
 
 IF_WIN(static,__attribute__ ((constructor)))
-void audit_plugin_so_init(void)
+void audit_plugin_so_init()
 {
   memset(locinfo_ini_value, 'O', sizeof(locinfo_ini_value)-1);
   locinfo_ini_value[sizeof(locinfo_ini_value)-1]= 0;
 }
 
 #ifdef _WIN32
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID)
 {
   if (fdwReason == DLL_PROCESS_ATTACH)
     audit_plugin_so_init();

From bdb7868575cbf44b89f1df24cbd02f6bc8c99d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Wed, 26 Nov 2025 17:11:50 +0200
Subject: [PATCH 057/119] MDEV-38126: Remove __attribute__((unused)) from
 plugin/server_audit

Starting with ISO/IEC 14882:1998 (C++98), unused function parameters
may be identified simply by omitting their names.
---
 plugin/server_audit/server_audit.cc | 136 ++++++++++++----------------
 1 file changed, 60 insertions(+), 76 deletions(-)

diff --git a/plugin/server_audit/server_audit.cc b/plugin/server_audit/server_audit.cc
index b007c611029..4bc6b22b7be 100644
--- a/plugin/server_audit/server_audit.cc
+++ b/plugin/server_audit/server_audit.cc
@@ -99,13 +99,6 @@ static void closelog() {}
 #else
 #define PLUGIN_DEBUG_VERSION ""
 #endif /*DBUG_OFF*/
-/*
- Disable __attribute__() on non-gcc compilers.
-*/
-#if !defined(__attribute__) && !defined(__GNUC__)
-#define __attribute__(A)
-#endif
-
 #ifdef _WIN32
 #define localtime_r(a, b) localtime_s(b, a)
 #endif /*WIN32*/
@@ -404,8 +397,7 @@ static mysql_mutex_t lock_atomic;
   } while (0)
 
 
-static uchar *getkey_user(const char *entry, size_t *length,
-                          my_bool nu __attribute__((unused)) )
+static uchar *getkey_user(const char *entry, size_t *length, my_bool)
 {
   const char *e= entry;
   while (*e && *e != ' ' && *e != ',')
@@ -2330,7 +2322,7 @@ typedef struct loc_system_variables
 
 static int init_done= 0;
 
-static int server_audit_init(void *p __attribute__((unused)))
+static int server_audit_init(void*)
 {
   thd_priv_host_ptr= reinterpret_cast<decltype(thd_priv_host_ptr)>
     (dlsym(RTLD_DEFAULT, "thd_priv_host"));
@@ -2408,7 +2400,7 @@ static int server_audit_init(void *p __attribute__((unused)))
 }
 
 
-static int server_audit_deinit(void *p __attribute__((unused)))
+static int server_audit_deinit(void *)
 {
   if (!init_done)
     return 0;
@@ -2431,22 +2423,20 @@ static int server_audit_deinit(void *p __attribute__((unused)))
 }
 
 
-static void rotate_log(MYSQL_THD thd  __attribute__((unused)),
-                       struct st_mysql_sys_var *var  __attribute__((unused)),
-                       void *var_ptr  __attribute__((unused)),
-                       const void *save  __attribute__((unused)))
+static void rotate_log(MYSQL_THD, st_mysql_sys_var *, void *,
+                       const void *save)
 {
-  if (output_type == OUTPUT_FILE && logfile && *(my_bool*) save)
+  if (output_type == OUTPUT_FILE && logfile &&
+      *static_cast<const my_bool*>(save))
     (void) logger_rotate(logfile);
 }
 
 
-static void sync_log(MYSQL_THD thd  __attribute__((unused)),
-                     struct st_mysql_sys_var *var  __attribute__((unused)),
-                     void *var_ptr  __attribute__((unused)),
-                     const void *save  __attribute__((unused)))
+static void sync_log(MYSQL_THD thd, st_mysql_sys_var *, void *,
+                     const void *save)
 {
-  if (output_type == OUTPUT_FILE && logfile && *(my_bool*) save)
+  if (output_type == OUTPUT_FILE && logfile &&
+      static_cast<const my_bool*>(save))
   {
     struct connection_info *cn= get_loc_info(thd);
     (void) logger_sync(logfile);
@@ -2508,13 +2498,13 @@ static void log_current_query(MYSQL_THD thd)
 }
 
 
-static void update_file_path(MYSQL_THD thd,
-              struct st_mysql_sys_var *var  __attribute__((unused)),
-              void *var_ptr  __attribute__((unused)), const void *save)
+static void update_file_path(MYSQL_THD thd, st_mysql_sys_var *, void *,
+                             const void *save)
 {
-  char *new_name= (*(char **) save) ? *(char **) save : empty_str;
-
-  if (strlen(new_name) + 4  > FN_REFLEN)
+  char *new_name= *static_cast<char*const*>(save);
+  if (!new_name)
+    new_name= empty_str;
+  else if (strlen(new_name) + 4  > FN_REFLEN)
   {
     error_header();
     fprintf(stderr,
@@ -2566,11 +2556,10 @@ exit_func:
 }
 
 
-static void update_file_rotations(MYSQL_THD thd  __attribute__((unused)),
-              struct st_mysql_sys_var *var  __attribute__((unused)),
-              void *var_ptr  __attribute__((unused)), const void *save)
+static void update_file_rotations(MYSQL_THD, st_mysql_sys_var *,
+                                  void *, const void *save)
 {
-  rotations= *(unsigned int *) save;
+  rotations= *static_cast<const unsigned*>(save);
   error_header();
   fprintf(stderr, "Log file rotations was changed to '%d'.\n", rotations);
 
@@ -2583,11 +2572,10 @@ static void update_file_rotations(MYSQL_THD thd  __attribute__((unused)),
 }
 
 
-static void update_file_rotate_size(MYSQL_THD thd  __attribute__((unused)),
-              struct st_mysql_sys_var *var  __attribute__((unused)),
-              void *var_ptr  __attribute__((unused)), const void *save)
+static void update_file_rotate_size(MYSQL_THD, st_mysql_sys_var *, void*,
+                                    const void *save)
 {
-  file_rotate_size= *(unsigned long long *) save;
+  file_rotate_size= *static_cast<const unsigned long long *>(save);
   error_header();
   fprintf(stderr, "Log file rotate size was changed to '%lld'.\n",
           file_rotate_size);
@@ -2601,14 +2589,14 @@ static void update_file_rotate_size(MYSQL_THD thd  __attribute__((unused)),
 }
 
 
-static void update_file_buffer_size(MYSQL_THD thd  __attribute__((unused)),
-              struct st_mysql_sys_var *var  __attribute__((unused)),
-              void *var_ptr  __attribute__((unused)), const void *save)
+static void update_file_buffer_size(MYSQL_THD, st_mysql_sys_var *, void *,
+                                    const void *save)
 {
-  file_buffer_size= *(unsigned int *) save;
+  file_buffer_size= *static_cast<const unsigned*>(save);
 
   error_header();
-  fprintf(stderr, "Log file buffer size was changed to '%d'.\n", file_buffer_size);
+  fprintf(stderr, "Log file buffer size was changed to '%u'.\n",
+          file_buffer_size);
 
   if (!logging || output_type != OUTPUT_FILE)
     return;
@@ -2649,26 +2637,25 @@ static int check_users(void *save, struct st_mysql_value *value,
   return 0;
 }
 
-static int check_incl_users(MYSQL_THD thd  __attribute__((unused)),
-                            struct st_mysql_sys_var *var  __attribute__((unused)),
+static int check_incl_users(MYSQL_THD, st_mysql_sys_var *,
                             void *save, struct st_mysql_value *value)
 {
   return check_users(save, value, sizeof(incl_user_buffer), "incl");
 }
 
-static int check_excl_users(MYSQL_THD thd  __attribute__((unused)),
-                            struct st_mysql_sys_var *var  __attribute__((unused)),
+static int check_excl_users(MYSQL_THD, st_mysql_sys_var *,
                             void *save, struct st_mysql_value *value)
 {
   return check_users(save, value, sizeof(excl_user_buffer), "excl");
 }
 
 
-static void update_incl_users(MYSQL_THD thd,
-              struct st_mysql_sys_var *var  __attribute__((unused)),
-              void *var_ptr  __attribute__((unused)), const void *save)
+static void update_incl_users(MYSQL_THD thd, st_mysql_sys_var *, void *,
+                              const void *save)
 {
-  char *new_users= (*(char **) save) ? *(char **) save : empty_str;
+  char *new_users= *static_cast<char*const*>(save);
+  if (!new_users)
+    new_users= empty_str;
   size_t new_len= strlen(new_users) + 1;
   mysql_prlock_wrlock(&lock_operations);
   mark_always_logged(thd);
@@ -2687,11 +2674,12 @@ static void update_incl_users(MYSQL_THD thd,
 }
 
 
-static void update_excl_users(MYSQL_THD thd  __attribute__((unused)),
-              struct st_mysql_sys_var *var  __attribute__((unused)),
-              void *var_ptr  __attribute__((unused)), const void *save)
+static void update_excl_users(MYSQL_THD thd, st_mysql_sys_var *, void *,
+                              const void *save)
 {
-  char *new_users= (*(char **) save) ? *(char **) save : empty_str;
+  char *new_users= *static_cast<char*const*>(save);
+  if (!new_users)
+    new_users= empty_str;
   size_t new_len= strlen(new_users) + 1;
   mysql_prlock_wrlock(&lock_operations);
   mark_always_logged(thd);
@@ -2710,11 +2698,10 @@ static void update_excl_users(MYSQL_THD thd  __attribute__((unused)),
 }
 
 
-static void update_output_type(MYSQL_THD thd,
-              struct st_mysql_sys_var *var  __attribute__((unused)),
-              void *var_ptr  __attribute__((unused)), const void *save)
+static void update_output_type(MYSQL_THD thd, st_mysql_sys_var *, void *,
+                               const void *save)
 {
-  ulong new_output_type= *((ulong *) save);
+  ulong new_output_type= *static_cast<const ulong*>(save);
   if (output_type == new_output_type)
     return;
 
@@ -2738,11 +2725,10 @@ static void update_output_type(MYSQL_THD thd,
 }
 
 
-static void update_syslog_facility(MYSQL_THD thd  __attribute__((unused)),
-              struct st_mysql_sys_var *var  __attribute__((unused)),
-              void *var_ptr  __attribute__((unused)), const void *save)
+static void update_syslog_facility(MYSQL_THD thd, st_mysql_sys_var *, void *,
+                                   const void *save)
 {
-  ulong new_facility= *((ulong *) save);
+  ulong new_facility= *static_cast<const ulong*>(save);
   if (syslog_facility == new_facility)
     return;
 
@@ -2755,11 +2741,10 @@ static void update_syslog_facility(MYSQL_THD thd  __attribute__((unused)),
 }
 
 
-static void update_syslog_priority(MYSQL_THD thd  __attribute__((unused)),
-              struct st_mysql_sys_var *var  __attribute__((unused)),
-              void *var_ptr  __attribute__((unused)), const void *save)
+static void update_syslog_priority(MYSQL_THD thd, st_mysql_sys_var *, void *,
+                                   const void *save)
 {
-  ulong new_priority= *((ulong *) save);
+  ulong new_priority= *static_cast<const ulong*>(save);
   if (syslog_priority == new_priority)
     return;
 
@@ -2774,11 +2759,10 @@ static void update_syslog_priority(MYSQL_THD thd  __attribute__((unused)),
 }
 
 
-static void update_logging(MYSQL_THD thd,
-              struct st_mysql_sys_var *var  __attribute__((unused)),
-              void *var_ptr  __attribute__((unused)), const void *save)
+static void update_logging(MYSQL_THD thd, st_mysql_sys_var *, void *,
+                           const void *save)
 {
-  char new_logging= *(char *) save;
+  char new_logging= *static_cast<const char*>(save);
   if (new_logging == logging)
     return;
 
@@ -2804,11 +2788,10 @@ static void update_logging(MYSQL_THD thd,
 }
 
 
-static void update_mode(MYSQL_THD thd  __attribute__((unused)),
-              struct st_mysql_sys_var *var  __attribute__((unused)),
-              void *var_ptr  __attribute__((unused)), const void *save)
+static void update_mode(MYSQL_THD thd, st_mysql_sys_var *, void *,
+                        const void *save)
 {
-  unsigned int new_mode= *(unsigned int *) save;
+  unsigned new_mode= *static_cast<const unsigned*>(save);
   if (new_mode == mode)
     return;
 
@@ -2823,11 +2806,12 @@ static void update_mode(MYSQL_THD thd  __attribute__((unused)),
 }
 
 
-static void update_syslog_ident(MYSQL_THD thd  __attribute__((unused)),
-              struct st_mysql_sys_var *var  __attribute__((unused)),
-              void *var_ptr  __attribute__((unused)), const void *save)
+static void update_syslog_ident(MYSQL_THD thd, st_mysql_sys_var *, void *,
+                                const void *save)
 {
-  char *new_ident= (*(char **) save) ? *(char **) save : empty_str;
+  char *new_ident= *static_cast<char*const*>(save);
+  if (!new_ident)
+    new_ident= empty_str;
   strncpy(syslog_ident_buffer, new_ident, sizeof(syslog_ident_buffer)-1);
   syslog_ident_buffer[sizeof(syslog_ident_buffer)-1]= 0;
   syslog_ident= syslog_ident_buffer;

From f27af220b63e1747bfd34d8146a80049688c4c0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Wed, 26 Nov 2025 17:17:31 +0200
Subject: [PATCH 058/119] MDEV-38126: Remove lock_atomic from
 plugin/server_audit

internal_stop_logging: Declared as Atomic_counter<int>
---
 plugin/server_audit/server_audit.cc | 46 ++++++++++-------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/plugin/server_audit/server_audit.cc b/plugin/server_audit/server_audit.cc
index 4bc6b22b7be..eb2d888ca23 100644
--- a/plugin/server_audit/server_audit.cc
+++ b/plugin/server_audit/server_audit.cc
@@ -19,6 +19,7 @@
 #define PLUGIN_STR_VERSION "1.6.0"
 
 #include <my_config.h>
+#include "my_counter.h"
 #include <assert.h>
 
 #ifndef _WIN32
@@ -89,11 +90,6 @@ static void closelog() {}
 #define USERNAME_CHAR_LENGTH 128
 #endif
 
-#define flogger_mutex_init(A,B,C) mysql_mutex_init(A, B, C) 
-#define flogger_mutex_destroy(A) mysql_mutex_destroy(A)
-#define flogger_mutex_lock(A) mysql_mutex_lock(A)
-#define flogger_mutex_unlock(A) mysql_mutex_unlock(A)
-
 #ifndef DBUG_OFF
 #define PLUGIN_DEBUG_VERSION "-debug"
 #else
@@ -119,7 +115,7 @@ static my_bool rotate= TRUE;
 static my_bool sync_file= TRUE;
 static unsigned int file_buffer_size;
 static char logging;
-static volatile int internal_stop_logging= 0;
+static Atomic_counter<int> internal_stop_logging;
 static char incl_user_buffer[1024];
 static char excl_user_buffer[1024];
 static unsigned int query_log_limit= 0;
@@ -385,17 +381,9 @@ static PSI_rwlock_info rwlock_key_list[]=
 };
 #endif /*HAVE_PSI_INTERFACE*/
 static mysql_prlock_t lock_operations;
-static mysql_mutex_t lock_atomic;
 
 #define CLIENT_ERROR my_printf_error
 
-#define ADD_ATOMIC(x, a)              \
-  do {                                \
-  flogger_mutex_lock(&lock_atomic);   \
-  x+= a;                              \
-  flogger_mutex_unlock(&lock_atomic); \
-  } while (0)
-
 
 static uchar *getkey_user(const char *entry, size_t *length, my_bool)
 {
@@ -576,20 +564,20 @@ static int user_coll_fill(struct user_coll *c, char *users,
 
       if (cmp_user && take_over_cmp)
       {
-        ADD_ATOMIC(internal_stop_logging, 1);
+        internal_stop_logging++;
         CLIENT_ERROR(1, "User '%.*sB' was removed from the"
             " server_audit_excl_users.",
             MYF(ME_WARNING), (int) cmp_length, users);
-        ADD_ATOMIC(internal_stop_logging, -1);
+        internal_stop_logging--;
         blank_user(cmp_user);
         refill_cmp_coll= 1;
       }
       else if (cmp_user)
       {
-        ADD_ATOMIC(internal_stop_logging, 1);
+        internal_stop_logging++;
         CLIENT_ERROR(1, "User '%.*sB' is in the server_audit_incl_users, "
             "so wasn't added.", MYF(ME_WARNING), (int) cmp_length, users);
-        ADD_ATOMIC(internal_stop_logging, -1);
+        internal_stop_logging--;
         remove_user(users);
         continue;
       }
@@ -2338,7 +2326,6 @@ static int server_audit_init(void*)
     PSI_server->register_rwlock("server_audit", rwlock_key_list, 1);
 #endif
   mysql_prlock_init(key_LOCK_operations, &lock_operations);
-  flogger_mutex_init(key_LOCK_operations, &lock_atomic, MY_MUTEX_INIT_FAST);
 
   coll_init(&incl_user_coll);
   coll_init(&excl_user_coll);
@@ -2415,7 +2402,6 @@ static int server_audit_deinit(void *)
     closelog();
 
   mysql_prlock_destroy(&lock_operations);
-  flogger_mutex_destroy(&lock_atomic);
 
   error_header();
   fprintf(stderr, "STOPPED\n");
@@ -2516,7 +2502,7 @@ static void update_file_path(MYSQL_THD thd, st_mysql_sys_var *, void *,
     return;
   }
 
-  ADD_ATOMIC(internal_stop_logging, 1);
+  internal_stop_logging++;
   error_header();
   fprintf(stderr, "Log file name was changed to '%s'.\n", new_name);
 
@@ -2552,7 +2538,7 @@ static void update_file_path(MYSQL_THD thd, st_mysql_sys_var *, void *,
   file_path= path_buffer;
 exit_func:
   mysql_prlock_unlock(&lock_operations);
-  ADD_ATOMIC(internal_stop_logging, -1);
+  internal_stop_logging--;
 }
 
 
@@ -2601,7 +2587,7 @@ static void update_file_buffer_size(MYSQL_THD, st_mysql_sys_var *, void *,
   if (!logging || output_type != OUTPUT_FILE)
     return;
 
-  ADD_ATOMIC(internal_stop_logging, 1);
+  internal_stop_logging++;
   mysql_prlock_wrlock(&lock_operations);
 
   if (logger_resize_buffer(logfile, file_buffer_size))
@@ -2614,7 +2600,7 @@ static void update_file_buffer_size(MYSQL_THD, st_mysql_sys_var *, void *,
   }
 
   mysql_prlock_unlock(&lock_operations);
-  ADD_ATOMIC(internal_stop_logging, -1);
+  internal_stop_logging--;
 }
 
 
@@ -2705,7 +2691,7 @@ static void update_output_type(MYSQL_THD thd, st_mysql_sys_var *, void *,
   if (output_type == new_output_type)
     return;
 
-  ADD_ATOMIC(internal_stop_logging, 1);
+  internal_stop_logging++;
   mysql_prlock_wrlock(&lock_operations);
   if (logging)
   {
@@ -2721,7 +2707,7 @@ static void update_output_type(MYSQL_THD thd, st_mysql_sys_var *, void *,
   if (logging)
     start_logging();
   mysql_prlock_unlock(&lock_operations);
-  ADD_ATOMIC(internal_stop_logging, -1);
+  internal_stop_logging--;
 }
 
 
@@ -2766,7 +2752,7 @@ static void update_logging(MYSQL_THD thd, st_mysql_sys_var *, void *,
   if (new_logging == logging)
     return;
 
-  ADD_ATOMIC(internal_stop_logging, 1);
+  internal_stop_logging++;
   mysql_prlock_wrlock(&lock_operations);
   if ((logging= new_logging))
   {
@@ -2784,7 +2770,7 @@ static void update_logging(MYSQL_THD thd, st_mysql_sys_var *, void *,
   }
 
   mysql_prlock_unlock(&lock_operations);
-  ADD_ATOMIC(internal_stop_logging, -1);
+  internal_stop_logging--;
 }
 
 
@@ -2795,14 +2781,14 @@ static void update_mode(MYSQL_THD thd, st_mysql_sys_var *, void *,
   if (new_mode == mode)
     return;
 
-  ADD_ATOMIC(internal_stop_logging, 1);
+  internal_stop_logging++;
   mysql_prlock_wrlock(&lock_operations);
   mark_always_logged(thd);
   error_header();
   fprintf(stderr, "Logging mode was changed from %d to %d.\n", mode, new_mode);
   mode= new_mode;
   mysql_prlock_unlock(&lock_operations);
-  ADD_ATOMIC(internal_stop_logging, -1);
+  internal_stop_logging--;
 }
 
 

From 9f3914170d7bc5788bf0ade6c3ae1dfdb3eaf2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Wed, 26 Nov 2025 17:17:43 +0200
Subject: [PATCH 059/119] MDEV-38126: Use InnoDB srw_lock_low for
 plugin/server_audit

Replace the contention prone mysql_prlock_t with a simpler
rw-lock wrapper from InnoDB, and fix several potential
race conditions by making consistent use of lock_operations.

This will also omit any PERFORMANCE_SCHEMA instrumentation.
---
 plugin/server_audit/server_audit.cc | 400 ++++++++++++++++++----------
 1 file changed, 261 insertions(+), 139 deletions(-)

diff --git a/plugin/server_audit/server_audit.cc b/plugin/server_audit/server_audit.cc
index eb2d888ca23..b1cc1c08ce2 100644
--- a/plugin/server_audit/server_audit.cc
+++ b/plugin/server_audit/server_audit.cc
@@ -122,8 +122,8 @@ static unsigned int query_log_limit= 0;
 
 static char servhost[HOSTNAME_LENGTH+1];
 static uint servhost_len;
-static char *syslog_ident;
-static char syslog_ident_buffer[128]= "mysql-server_auditing";
+static char syslog_ident[128]= "mysql-server_auditing";
+static char *syslog_ident_ptr= syslog_ident;
 
 struct connection_info
 {
@@ -259,9 +259,9 @@ static MYSQL_SYSVAR_BOOL(logging, logging,
        update_logging, 0);
 static MYSQL_SYSVAR_UINT(mode, mode,
        PLUGIN_VAR_OPCMDARG, "Auditing mode", NULL, update_mode, 0, 0, 1, 1);
-static MYSQL_SYSVAR_STR(syslog_ident, syslog_ident, PLUGIN_VAR_RQCMDARG,
+static MYSQL_SYSVAR_STR(syslog_ident, syslog_ident_ptr, PLUGIN_VAR_RQCMDARG,
        "The SYSLOG identifier - the beginning of each SYSLOG record",
-       NULL, update_syslog_ident, syslog_ident_buffer);
+       NULL, update_syslog_ident, syslog_ident);
 static MYSQL_SYSVAR_STR(syslog_info, syslog_info,
        PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_MEMALLOC,
        "The <info> string to be added to the SYSLOG record", NULL, NULL, "");
@@ -359,7 +359,7 @@ static struct st_mysql_sys_var* vars[] = {
 
 /* Status variables for SHOW STATUS */
 static int is_active= 0;
-static long log_write_failures= 0;
+static Atomic_counter<long> log_write_failures;
 static char current_log_buf[FN_REFLEN]= "";
 static char last_error_buf[512]= "";
 
@@ -372,15 +372,9 @@ static struct st_mysql_show_var audit_status[]=
   {0,0,SHOW_UNDEF}
 };
 
-#ifdef HAVE_PSI_INTERFACE
-static PSI_rwlock_key key_LOCK_operations;
-static PSI_rwlock_info rwlock_key_list[]=
-{
-  { &key_LOCK_operations, "SERVER_AUDIT_plugin::lock_operations",
-    PSI_FLAG_GLOBAL}
-};
-#endif /*HAVE_PSI_INTERFACE*/
-static mysql_prlock_t lock_operations;
+#include "../../storage/innobase/include/srw_lock.h"
+
+static srw_lock_low lock_operations;
 
 #define CLIENT_ERROR my_printf_error
 
@@ -1199,18 +1193,16 @@ static void change_connection(struct connection_info *cn,
           event->tls_version, event->tls_version_length);
 }
 
-/*
+/**
   Write to the log
-
-  @param take_lock  If set, take a read lock (or write lock on rotate).
-                    If not set, the caller has a already taken a write lock
 */
 
-static int write_log(const char *message, size_t len, int take_lock)
+static int write_log(const char *message, size_t len)
 {
+#if defined _WIN32 || !defined SUX_LOCK_GENERIC
+  DBUG_ASSERT(lock_operations.is_locked_or_waiting());
+#endif
   int result= 0;
-  if (take_lock)
-    mysql_prlock_rdlock(&lock_operations);
 
   if (output_type == OUTPUT_FILE)
   {
@@ -1229,11 +1221,36 @@ static int write_log(const char *message, size_t len, int take_lock)
            syslog_priority_codes[syslog_priority],
            "%s %.*s", syslog_info, (int) len, message);
   }
-  if (take_lock)
-    mysql_prlock_unlock(&lock_operations);
+
   return result;
 }
 
+/**
+  Write to the log, acquiring the lock.
+*/
+
+static int write_log_and_lock(const char *message, size_t len)
+{
+  lock_operations.rd_lock();
+  int result= write_log(message, len);
+  lock_operations.rd_unlock();
+  return result;
+}
+
+
+/**
+  Write to the log
+
+  @param lock  whether the caller did not acquire lock_operations
+*/
+static int write_log_maybe_lock(const char *message, size_t len, bool lock)
+{
+  if (unlikely(!lock))
+    return write_log(message, len);
+  else
+    return write_log_and_lock(message, len);
+}
+
 
 static size_t log_header(char *message, size_t message_len,
                       time_t *ts,
@@ -1320,7 +1337,7 @@ static int log_proxy(const struct connection_info *cn,
                      cn->proxy_host_length, cn->proxy_host,
                      event->status);
   message[csize]= '\n';
-  return write_log(message, csize + 1, 1);
+  return write_log_and_lock(message, csize + 1);
 }
 
 
@@ -1347,7 +1364,7 @@ static int log_connection(const struct connection_info *cn,
     ",%.*s,%.*s,%d", cn->db_length, cn->db, (int) obj_len, tls_obj,
     event->status);
   message[csize]= '\n';
-  return write_log(message, csize + 1, 1);
+  return write_log_and_lock(message, csize + 1);
 }
 
 
@@ -1372,7 +1389,7 @@ static int log_connection_event(const struct mysql_event_connection *event,
     ",%.*s,%.*s,%d", (int) event->database.length,event->database.str,
     (int) obj_len, tls_obj, event->status);
   message[csize]= '\n';
-  return write_log(message, csize + 1, 1);
+  return write_log_and_lock(message, csize + 1);
 }
 
 
@@ -1541,15 +1558,14 @@ no_password:
 
 
 static int do_log_user(const char *name, int len,
-                       const char *proxy, int proxy_len, int take_lock)
+                       const char *proxy, int proxy_len)
 {
   int result;
 
   if (!name)
     return 0;
 
-  if (take_lock)
-    mysql_prlock_rdlock(&lock_operations);
+  lock_operations.rd_lock();
 
   if (incl_user_coll.n_users)
   {
@@ -1564,8 +1580,7 @@ static int do_log_user(const char *name, int len,
   else
     result= 1;
 
-  if (take_lock)
-    mysql_prlock_unlock(&lock_operations);
+  lock_operations.rd_unlock();
   return result;
 }
 
@@ -1816,7 +1831,7 @@ do_log_query:
   csize+= my_snprintf(message+csize, message_size - 1 - csize,
                       "\',%d", error_code);
   message[csize]= '\n';
-  result= write_log(message, csize + 1, take_lock);
+  result= write_log_maybe_lock(message, csize + 1, take_lock);
 
   if (cn->sync_statement && output_type == OUTPUT_FILE && logfile)
   {
@@ -1869,7 +1884,7 @@ static int log_table(const struct connection_info *cn,
                      (int) event->database.length, event->database.str,
                      (int) event->table.length, event->table.str);
   message[csize]= '\n';
-  return write_log(message, csize + 1, 1);
+  return write_log_and_lock(message, csize + 1);
 }
 
 
@@ -1895,7 +1910,7 @@ static int log_rename(const struct connection_info *cn,
                       (int) event->new_database.length, event->new_database.str,
                       (int) event->new_table.length, event->new_table.str);
   message[csize]= '\n';
-  return write_log(message, csize + 1, 1);
+  return write_log_and_lock(message, csize + 1);
 }
 
 
@@ -2123,8 +2138,7 @@ void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev)
 
   if (event_class == MYSQL_AUDIT_GENERAL_CLASS && FILTER(EVENT_QUERY) &&
       cn && (cn->log_always || do_log_user(cn->user, cn->user_length,
-                                           cn->proxy, cn->proxy_length,
-                                           1)))
+                                           cn->proxy, cn->proxy_length)))
   {
     const struct mysql_event_general *event =
       (const struct mysql_event_general *) ev;
@@ -2146,7 +2160,7 @@ void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev)
     const struct mysql_event_table *event =
       (const struct mysql_event_table *) ev;
     if (do_log_user(event->user, (int) SAFE_STRLEN(event->user),
-                    cn->proxy, cn->proxy_length, 1))
+                    cn->proxy, cn->proxy_length))
     {
       switch (event->event_subclass)
       {
@@ -2321,11 +2335,7 @@ static int server_audit_init(void*)
   servhost_len= (uint)strlen(servhost);
 
   logger_init_mutexes();
-#ifdef HAVE_PSI_INTERFACE
-  if (PSI_server)
-    PSI_server->register_rwlock("server_audit", rwlock_key_list, 1);
-#endif
-  mysql_prlock_init(key_LOCK_operations, &lock_operations);
+  lock_operations.init();
 
   coll_init(&incl_user_coll);
   coll_init(&excl_user_coll);
@@ -2395,16 +2405,8 @@ static int server_audit_deinit(void *)
   init_done= 0;
   coll_free(&incl_user_coll);
   coll_free(&excl_user_coll);
-
-  if (output_type == OUTPUT_FILE && logfile)
-    logger_close(logfile);
-  else if (output_type == OUTPUT_SYSLOG)
-    closelog();
-
-  mysql_prlock_destroy(&lock_operations);
-
-  error_header();
-  fprintf(stderr, "STOPPED\n");
+  stop_logging();
+  lock_operations.destroy();
   return 0;
 }
 
@@ -2502,12 +2504,11 @@ static void update_file_path(MYSQL_THD thd, st_mysql_sys_var *, void *,
     return;
   }
 
+  lock_operations.wr_lock();
   internal_stop_logging++;
   error_header();
   fprintf(stderr, "Log file name was changed to '%s'.\n", new_name);
 
-  mysql_prlock_wrlock(&lock_operations);
-
   if (logging)
     log_current_query(thd);
 
@@ -2537,60 +2538,53 @@ static void update_file_path(MYSQL_THD thd, st_mysql_sys_var *, void *,
   path_buffer[sizeof(path_buffer)-1]= 0;
   file_path= path_buffer;
 exit_func:
-  mysql_prlock_unlock(&lock_operations);
   internal_stop_logging--;
+  lock_operations.wr_unlock();
 }
 
 
 static void update_file_rotations(MYSQL_THD, st_mysql_sys_var *,
                                   void *, const void *save)
 {
+  lock_operations.wr_lock();
   rotations= *static_cast<const unsigned*>(save);
   error_header();
   fprintf(stderr, "Log file rotations was changed to '%d'.\n", rotations);
 
-  if (!logging || output_type != OUTPUT_FILE)
-    return;
+  if (logging && output_type == OUTPUT_FILE)
+    logger_set_rotations(logfile, rotations);
 
-  mysql_prlock_wrlock(&lock_operations);
-  logger_set_rotations(logfile, rotations);
-  mysql_prlock_unlock(&lock_operations);
+  lock_operations.wr_unlock();
 }
 
 
 static void update_file_rotate_size(MYSQL_THD, st_mysql_sys_var *, void*,
                                     const void *save)
 {
+  lock_operations.wr_lock();
   file_rotate_size= *static_cast<const unsigned long long *>(save);
   error_header();
   fprintf(stderr, "Log file rotate size was changed to '%lld'.\n",
           file_rotate_size);
 
-  if (!logging || output_type != OUTPUT_FILE)
-    return;
-
-  mysql_prlock_wrlock(&lock_operations);
-  logger_set_filesize_limit(logfile, file_rotate_size);
-  mysql_prlock_unlock(&lock_operations);
+  if (logging && output_type == OUTPUT_FILE)
+    logger_set_filesize_limit(logfile, file_rotate_size);
+  lock_operations.wr_unlock();
 }
 
 
 static void update_file_buffer_size(MYSQL_THD, st_mysql_sys_var *, void *,
                                     const void *save)
 {
+  lock_operations.wr_lock();
   file_buffer_size= *static_cast<const unsigned*>(save);
 
   error_header();
   fprintf(stderr, "Log file buffer size was changed to '%u'.\n",
           file_buffer_size);
 
-  if (!logging || output_type != OUTPUT_FILE)
-    return;
-
-  internal_stop_logging++;
-  mysql_prlock_wrlock(&lock_operations);
-
-  if (logger_resize_buffer(logfile, file_buffer_size))
+  if (logging && output_type == OUTPUT_FILE &&
+      logger_resize_buffer(logfile, file_buffer_size))
   {
     stop_logging();
     error_header();
@@ -2599,8 +2593,7 @@ static void update_file_buffer_size(MYSQL_THD, st_mysql_sys_var *, void *,
                  MYF(ME_WARNING));
   }
 
-  mysql_prlock_unlock(&lock_operations);
-  internal_stop_logging--;
+  lock_operations.wr_unlock();
 }
 
 
@@ -2643,12 +2636,12 @@ static void update_incl_users(MYSQL_THD thd, st_mysql_sys_var *, void *,
   if (!new_users)
     new_users= empty_str;
   size_t new_len= strlen(new_users) + 1;
-  mysql_prlock_wrlock(&lock_operations);
   mark_always_logged(thd);
 
   if (new_len > sizeof(incl_user_buffer))
     new_len= sizeof(incl_user_buffer);
 
+  lock_operations.wr_lock();
   memcpy(incl_user_buffer, new_users, new_len - 1);
   incl_user_buffer[new_len - 1]= 0;
 
@@ -2656,7 +2649,7 @@ static void update_incl_users(MYSQL_THD thd, st_mysql_sys_var *, void *,
   user_coll_fill(&incl_user_coll, incl_users, &excl_user_coll, 1);
   error_header();
   fprintf(stderr, "server_audit_incl_users set to '%s'.\n", incl_users);
-  mysql_prlock_unlock(&lock_operations);
+  lock_operations.wr_unlock();
 }
 
 
@@ -2667,12 +2660,12 @@ static void update_excl_users(MYSQL_THD thd, st_mysql_sys_var *, void *,
   if (!new_users)
     new_users= empty_str;
   size_t new_len= strlen(new_users) + 1;
-  mysql_prlock_wrlock(&lock_operations);
   mark_always_logged(thd);
 
   if (new_len > sizeof(excl_user_buffer))
     new_len= sizeof(excl_user_buffer);
 
+  lock_operations.wr_lock();
   memcpy(excl_user_buffer, new_users, new_len - 1);
   excl_user_buffer[new_len - 1]= 0;
 
@@ -2680,7 +2673,7 @@ static void update_excl_users(MYSQL_THD thd, st_mysql_sys_var *, void *,
   user_coll_fill(&excl_user_coll, excl_users, &incl_user_coll, 0);
   error_header();
   fprintf(stderr, "server_audit_excl_users set to '%s'.\n", excl_users);
-  mysql_prlock_unlock(&lock_operations);
+  lock_operations.wr_unlock();
 }
 
 
@@ -2691,8 +2684,7 @@ static void update_output_type(MYSQL_THD thd, st_mysql_sys_var *, void *,
   if (output_type == new_output_type)
     return;
 
-  internal_stop_logging++;
-  mysql_prlock_wrlock(&lock_operations);
+  lock_operations.wr_lock();
   if (logging)
   {
     log_current_query(thd);
@@ -2706,8 +2698,7 @@ static void update_output_type(MYSQL_THD thd, st_mysql_sys_var *, void *,
 
   if (logging)
     start_logging();
-  mysql_prlock_unlock(&lock_operations);
-  internal_stop_logging--;
+  lock_operations.wr_unlock();
 }
 
 
@@ -2715,15 +2706,18 @@ static void update_syslog_facility(MYSQL_THD thd, st_mysql_sys_var *, void *,
                                    const void *save)
 {
   ulong new_facility= *static_cast<const ulong*>(save);
-  if (syslog_facility == new_facility)
-    return;
-
-  mark_always_logged(thd);
-  error_header();
-  fprintf(stderr, "SysLog facility was changed from '%s' to '%s'.\n",
-          syslog_facility_names[syslog_facility],
-          syslog_facility_names[new_facility]);
-  syslog_facility= new_facility;
+  lock_operations.wr_lock();
+  ulong old_facility= syslog_facility;
+  if (old_facility != new_facility)
+  {
+    syslog_facility= new_facility;
+    mark_always_logged(thd);
+    error_header();
+    fprintf(stderr, "SysLog facility was changed from '%s' to '%s'.\n",
+            syslog_facility_names[old_facility],
+            syslog_facility_names[new_facility]);
+  }
+  lock_operations.wr_unlock();
 }
 
 
@@ -2731,17 +2725,18 @@ static void update_syslog_priority(MYSQL_THD thd, st_mysql_sys_var *, void *,
                                    const void *save)
 {
   ulong new_priority= *static_cast<const ulong*>(save);
-  if (syslog_priority == new_priority)
-    return;
-
-  mysql_prlock_wrlock(&lock_operations);
-  mark_always_logged(thd);
-  mysql_prlock_unlock(&lock_operations);
-  error_header();
-  fprintf(stderr, "SysLog priority was changed from '%s' to '%s'.\n",
-          syslog_priority_names[syslog_priority],
-          syslog_priority_names[new_priority]);
-  syslog_priority= new_priority;
+  lock_operations.wr_lock();
+  ulong old_priority= syslog_priority;
+  if (old_priority != new_priority)
+  {
+    syslog_priority= new_priority;
+    mark_always_logged(thd);
+    error_header();
+    fprintf(stderr, "SysLog priority was changed from '%s' to '%s'.\n",
+            syslog_priority_names[old_priority],
+            syslog_priority_names[new_priority]);
+  }
+  lock_operations.wr_unlock();
 }
 
 
@@ -2749,28 +2744,25 @@ static void update_logging(MYSQL_THD thd, st_mysql_sys_var *, void *,
                            const void *save)
 {
   char new_logging= *static_cast<const char*>(save);
-  if (new_logging == logging)
-    return;
-
-  internal_stop_logging++;
-  mysql_prlock_wrlock(&lock_operations);
-  if ((logging= new_logging))
+  lock_operations.wr_lock();
+  if (new_logging != logging)
   {
-    start_logging();
-    if (!logging)
+    logging= new_logging;
+    if (new_logging)
     {
-      CLIENT_ERROR(1, "Logging was disabled.", MYF(ME_WARNING));
+      start_logging();
+      if (!logging)
+        CLIENT_ERROR(1, "Logging was disabled.", MYF(ME_WARNING));
+      else
+        mark_always_logged(thd);
+    }
+    else
+    {
+      log_current_query(thd);
+      stop_logging();
     }
-    mark_always_logged(thd);
   }
-  else
-  {
-    log_current_query(thd);
-    stop_logging();
-  }
-
-  mysql_prlock_unlock(&lock_operations);
-  internal_stop_logging--;
+  lock_operations.wr_unlock();
 }
 
 
@@ -2778,17 +2770,17 @@ static void update_mode(MYSQL_THD thd, st_mysql_sys_var *, void *,
                         const void *save)
 {
   unsigned new_mode= *static_cast<const unsigned*>(save);
-  if (new_mode == mode)
-    return;
-
-  internal_stop_logging++;
-  mysql_prlock_wrlock(&lock_operations);
-  mark_always_logged(thd);
-  error_header();
-  fprintf(stderr, "Logging mode was changed from %d to %d.\n", mode, new_mode);
-  mode= new_mode;
-  mysql_prlock_unlock(&lock_operations);
-  internal_stop_logging--;
+  lock_operations.wr_lock();
+  unsigned old_mode= mode;
+  if (new_mode != old_mode)
+  {
+    mode= new_mode;
+    mark_always_logged(thd);
+    error_header();
+    fprintf(stderr, "Logging mode was changed from %u to %u.\n",
+            old_mode, new_mode);
+  }
+  lock_operations.wr_unlock();
 }
 
 
@@ -2796,21 +2788,23 @@ static void update_syslog_ident(MYSQL_THD thd, st_mysql_sys_var *, void *,
                                 const void *save)
 {
   char *new_ident= *static_cast<char*const*>(save);
+  lock_operations.wr_lock();
   if (!new_ident)
-    new_ident= empty_str;
-  strncpy(syslog_ident_buffer, new_ident, sizeof(syslog_ident_buffer)-1);
-  syslog_ident_buffer[sizeof(syslog_ident_buffer)-1]= 0;
-  syslog_ident= syslog_ident_buffer;
+    *syslog_ident= '\0';
+  else
+  {
+    strncpy(syslog_ident, new_ident, sizeof(syslog_ident)-1);
+    syslog_ident[sizeof(syslog_ident)-1]= 0;
+  }
   error_header();
-  fprintf(stderr, "SYSYLOG ident was changed to '%s'\n", syslog_ident);
-  mysql_prlock_wrlock(&lock_operations);
+  fprintf(stderr, "SYSLOG ident was changed to '%s'\n", syslog_ident);
   mark_always_logged(thd);
   if (logging && output_type == OUTPUT_SYSLOG)
   {
     stop_logging();
     start_logging();
   }
-  mysql_prlock_unlock(&lock_operations);
+  lock_operations.wr_unlock();
 }
 
 
@@ -2828,4 +2822,132 @@ BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID)
     audit_plugin_so_init();
   return 1;
 }
+#elif !defined SUX_LOCK_GENERIC
+# ifdef __linux__
+#  include <linux/futex.h>
+#  include <sys/syscall.h>
+#  define SRW_FUTEX(a,op,n) \
+   syscall(SYS_futex, a, FUTEX_ ## op ## _PRIVATE, n, nullptr, nullptr, 0)
+# elif defined __OpenBSD__
+#  include <sys/time.h>
+#  include <sys/futex.h>
+#  define SRW_FUTEX(a,op,n) \
+   futex((volatile uint32_t*) a, FUTEX_ ## op, n, nullptr, nullptr)
+# elif defined __FreeBSD__
+#  include <sys/types.h>
+#  include <sys/umtx.h>
+#  define FUTEX_WAKE UMTX_OP_WAKE_PRIVATE
+#  define FUTEX_WAIT UMTX_OP_WAIT_UINT_PRIVATE
+#  define SRW_FUTEX(a,op,n) _umtx_op(a, FUTEX_ ## op, n, nullptr, nullptr)
+# elif defined __DragonFly__
+#  include <unistd.h>
+#  define FUTEX_WAKE(a,n) umtx_wakeup(a,n)
+#  define FUTEX_WAIT(a,n) umtx_sleep(a,n,0)
+#  define SRW_FUTEX(a,op,n) FUTEX_ ## op((volatile int*) a, int(n))
+# else
+#  error "no futex support nor #define SUX_LOCK_GENERIC"
+# endif
+
+# ifdef __GNUC__
+#  pragma GCC visibility push(hidden) /* Avoid a symbol clash with InnoDB */
+# endif
+
+template<> inline void srw_mutex_impl<false>::wait(uint32_t lk) noexcept
+{ SRW_FUTEX(&lock, WAIT, lk); }
+template<> inline void srw_mutex_impl<false>::wake() noexcept
+{ SRW_FUTEX(&lock, WAKE, 1); }
+template<> inline void srw_mutex_impl<false>::wake_all() noexcept
+{ SRW_FUTEX(&lock, WAKE, INT_MAX); }
+template<> inline void ssux_lock_impl<false>::wait(uint32_t lk) noexcept
+{ SRW_FUTEX(&readers, WAIT, lk); }
+template<> inline void ssux_lock_impl<false>::wake() noexcept
+{ SRW_FUTEX(&readers, WAKE, 1); }
+
+template<>
+void srw_mutex_impl<false>::wait_and_lock() noexcept
+{
+  uint32_t lk= WAITER + lock.fetch_add(WAITER, std::memory_order_relaxed);
+  for (;;)
+  {
+    DBUG_ASSERT(~HOLDER & lk);
+    if (lk & HOLDER)
+    {
+      wait(lk);
+#if defined __i386__||defined __x86_64__
+reload:
+#endif
+      lk= lock.load(std::memory_order_relaxed);
+    }
+    else
+    {
+#if defined __i386__||defined __x86_64__
+      if (lock.fetch_or(HOLDER, std::memory_order_relaxed) & HOLDER)
+        goto reload;
+#else
+      if ((lk= lock.fetch_or(HOLDER, std::memory_order_relaxed)) & HOLDER)
+        continue;
+      DBUG_ASSERT(lk);
+#endif
+      std::atomic_thread_fence(std::memory_order_acquire);
+      return;
+    }
+  }
+}
+
+template<>
+void ssux_lock_impl<false>::wr_wait(uint32_t lk) noexcept
+{
+  DBUG_ASSERT(writer.is_locked());
+  DBUG_ASSERT(lk);
+  DBUG_ASSERT(lk < WRITER);
+
+  lk|= WRITER;
+
+  do
+  {
+    DBUG_ASSERT(lk > WRITER);
+    wait(lk);
+    lk= readers.load(std::memory_order_acquire);
+  }
+  while (lk != WRITER);
+}
+
+template<bool spinloop>
+void ssux_lock_impl<spinloop>::rd_lock_nospin() noexcept
+{
+  /* Subscribe to writer.wake() or write.wake_all() calls of
+  concurrently executing rd_wait() or writer.wr_unlock(). */
+  uint32_t wl= writer.WAITER +
+    writer.lock.fetch_add(writer.WAITER, std::memory_order_acquire);
+
+  for (;;)
+  {
+    if (writer.HOLDER & wl)
+      writer.wait(wl);
+    uint32_t lk= rd_lock_try_low();
+    if (!lk)
+      break;
+    if (UNIV_UNLIKELY(lk == WRITER)) /* A wr_lock() just succeeded. */
+      /* Immediately wake up (also) wr_lock(). We may also unnecessarily
+      wake up other concurrent threads that are executing rd_wait().
+      If we invoked writer.wake() here to wake up just one thread,
+      we could wake up a rd_wait(), which then would invoke writer.wake(),
+      waking up possibly another rd_wait(), and we could end up doing
+      lots of non-productive context switching until the wr_lock()
+      is finally woken up. */
+      writer.wake_all();
+    wl= writer.lock.load(std::memory_order_acquire);
+    ut_ad(wl);
+  }
+
+  /* Unsubscribe writer.wake() and writer.wake_all(). */
+  wl= writer.lock.fetch_sub(writer.WAITER, std::memory_order_release);
+  ut_ad(wl);
+
+  /* Wake any other threads that may be blocked in writer.wait().
+  All other waiters than this rd_wait() would end up acquiring writer.lock
+  and waking up other threads on unlock(). */
+  if (wl > writer.WAITER)
+    writer.wake_all();
+}
 #endif

From 5b05829739fe4e4794dd01e6ff827984e7cc32c6 Mon Sep 17 00:00:00 2001
From: Thirunarayanan Balathandayuthapani <thiru@mariadb.com>
Date: Mon, 24 Nov 2025 15:29:43 +0530
Subject: [PATCH 060/119] MDEV-38041: MariaBackup fails during rollback of
 inplace FTS alter table

Problem:
========
When an inplace ALTER operation is rolled back, InnoDB drops
intermediate tables and their associated FTS internal tables.
However, MariaBackup's DDL tracking can incorrectly report
this as a backup failure.

The issue occurs because backup_set_alter_copy_lock() downgrades the
MDL_BACKUP_DDL lock before the inplace phase of ALTER,
allowing FTS internal tables to be dropped during the
later phases of backup when DDL tracking is still active.

Solution:
========
backup_file_op_fail(): Ignore delete operations on FTS internal
tables when not using --no-lock option, preventing false
positive backup failures.
---
 extra/mariabackup/backup_copy.cc              |  1 +
 extra/mariabackup/xtrabackup.cc               | 22 +++++++----
 .../suite/mariabackup/alter_copy_race.result  | 18 +++++++++
 .../suite/mariabackup/alter_copy_race.test    | 39 +++++++++++++++++++
 4 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
index d4a90760f65..38b96183357 100644
--- a/extra/mariabackup/backup_copy.cc
+++ b/extra/mariabackup/backup_copy.cc
@@ -1462,6 +1462,7 @@ bool backup_start(ds_ctxt *ds_data, ds_ctxt *ds_meta,
 
 	corrupted_pages.backup_fix_ddl(ds_data, ds_meta);
 
+	DBUG_MARIABACKUP_EVENT("after_backup_fix_ddl", {});
 	// There is no need to stop slave thread before coping non-Innodb data when
 	// --no-lock option is used because --no-lock option requires that no DDL or
 	// DML to non-transaction tables can occur.
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index f41d9f0313f..163d82fa807 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -1034,15 +1034,14 @@ static void backup_file_op_fail(uint32_t space_id, int type,
 {
         const char *error= "";
 	bool fail = false;
+	const std::string spacename{filename_to_spacename(name, len)};
 	switch(type) {
 	case FILE_CREATE:
 		msg("DDL tracking : create %" PRIu32 " \"%.*s\"",
 			space_id, int(len), name);
-		fail = !check_if_skip_table(
-				filename_to_spacename(name, len).c_str());
+		fail = !check_if_skip_table(spacename.c_str());
 		if (fail && !opt_no_lock &&
-		    check_if_fts_table(
-			filename_to_spacename(name, len).c_str())) {
+		    check_if_fts_table(spacename.c_str())) {
 			/* Ignore the FTS internal table because InnoDB does
 			create intermediate table and their associative FTS
 			internal table when table is being rebuilt during
@@ -1061,18 +1060,25 @@ static void backup_file_op_fail(uint32_t space_id, int type,
 	case FILE_RENAME:
 		msg("DDL tracking : rename %" PRIu32 " \"%.*s\",\"%.*s\"",
 			space_id, int(len), name, int(new_len), new_name);
-		fail = !check_if_skip_table(
-				filename_to_spacename(name, len).c_str())
+		fail = !check_if_skip_table(spacename.c_str())
 		       || !check_if_skip_table(
 				filename_to_spacename(new_name, new_len).c_str());
                 error= "rename";
 		break;
 	case FILE_DELETE:
-		fail = !check_if_skip_table(
-				filename_to_spacename(name, len).c_str());
+		fail = !check_if_skip_table(spacename.c_str());
 		msg("DDL tracking : delete %" PRIu32 " \"%.*s\"",
 			space_id, int(len), name);
                 error= "delete";
+		if (fail && !opt_no_lock &&
+		    check_if_fts_table(spacename.c_str())) {
+			/* Ignore the FTS internal table because InnoDB may
+			drop intermediate table and their associative FTS
+			internal table as a part of inplace rollback operation.
+			backup_set_alter_copy_lock() downgrades the
+			MDL_BACKUP_DDL before inplace phase of alter */
+			fail = false;
+		}
 		break;
 	default:
 		ut_ad(0);
diff --git a/mysql-test/suite/mariabackup/alter_copy_race.result b/mysql-test/suite/mariabackup/alter_copy_race.result
index 82202249f81..174ca4aa57c 100644
--- a/mysql-test/suite/mariabackup/alter_copy_race.result
+++ b/mysql-test/suite/mariabackup/alter_copy_race.result
@@ -22,3 +22,21 @@ SELECT * FROM t1;
 i
 1
 DROP TABLE t1;
+#
+#  MDEV-38041 MariaBackup fails during rollback of
+#		inplace FTS alter table
+#
+CREATE TABLE t1(f1 int, f2 char(100), fulltext(f2)) ENGINE=InnoDB;
+INSERT into t1 values(1, "MariaDB"), (1, "MySQL");
+connect  con2, localhost, root,,;
+set lock_wait_timeout=1;
+SET debug_sync='copy_data_between_tables_before_reset_backup_lock  SIGNAL go WAIT_FOR after_backup_stage_block_commit';
+SET debug_sync='alter_table_after_temp_table_drop SIGNAL temp_table_dropped';
+SET debug_sync='now WAIT_FOR after_backup_stage_start';ALTER TABLE test.t1 ADD PRIMARY KEY(f1), algorithm=COPY;|
+connection default;
+connection con2;
+ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
+SET debug_sync='RESET';
+disconnect con2;
+connection default;
+DROP TABLE t1;
diff --git a/mysql-test/suite/mariabackup/alter_copy_race.test b/mysql-test/suite/mariabackup/alter_copy_race.test
index 553643bf667..23fdf470e37 100644
--- a/mysql-test/suite/mariabackup/alter_copy_race.test
+++ b/mysql-test/suite/mariabackup/alter_copy_race.test
@@ -49,3 +49,42 @@ exec $XTRABACKUP  --prepare --target-dir=$targetdir;
 SELECT * FROM t1;
 DROP TABLE t1;
 rmdir $targetdir;
+
+--echo #
+--echo #  MDEV-38041 MariaBackup fails during rollback of
+--echo #		inplace FTS alter table
+--echo #
+
+let $targetdir=$MYSQLTEST_VARDIR/tmp/backup;
+
+CREATE TABLE t1(f1 int, f2 char(100), fulltext(f2)) ENGINE=InnoDB;
+INSERT into t1 values(1, "MariaDB"), (1, "MySQL");
+
+connect  con2, localhost, root,,;
+set lock_wait_timeout=1;
+SET debug_sync='copy_data_between_tables_before_reset_backup_lock  SIGNAL go WAIT_FOR after_backup_stage_block_commit';
+SET debug_sync='alter_table_after_temp_table_drop SIGNAL temp_table_dropped';
+DELIMITER |;
+send  SET debug_sync='now WAIT_FOR after_backup_stage_start';ALTER TABLE test.t1 ADD PRIMARY KEY(f1), algorithm=COPY;|
+DELIMITER ;|
+connection default;
+
+# setup mariabackup events
+let backup_fix_ddl=;
+let after_backup_stage_start=SET debug_sync='now SIGNAL after_backup_stage_start WAIT_FOR go';
+let after_backup_stage_block_commit=SET debug_sync='now SIGNAL after_backup_stage_block_commit';
+let after_backup_fix_ddl=SET debug_sync='now WAIT_FOR temp_table_dropped';
+let $backup_log=$MYSQLTEST_VARDIR/tmp/backup.log;
+--disable_result_log
+exec  $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf  --backup  --target-dir=$targetdir --dbug=+d,mariabackup_events > $backup_log 2>&1;
+--enable_result_log
+
+connection con2;
+--error ER_DUP_ENTRY
+reap;
+SET debug_sync='RESET';
+disconnect con2;
+
+connection default;
+DROP TABLE t1;
+rmdir $targetdir;

From dcf59cc2480dbb1920874fa32bd967e8527f4315 Mon Sep 17 00:00:00 2001
From: Raghunandan Bhat <raghunandan.bhat96@gmail.com>
Date: Mon, 13 Oct 2025 17:13:35 +0530
Subject: [PATCH 061/119] MDEV-37484: `Sql_cmd_dml::execute_inner`,
 `Sql_cmd_update::execute_inner` do not call Select handler for the engine
 involved

Problem:
  After the re-design of `UPDATE` and `DELETE` in MDEV-28883, the call
  to find select handler is missing. This prevents the server from
  handring over multi-update/multi-delete queries to storage engines
  capable of executng such queries on their own (e.g., ColumnStore).

  MDEV-32382 introduced a check in `find_select_handler_inner` function,
  that blocked pushdown of queries involving CTEs, without checking if
  the storage engine is capable of handling such queries.

Fix:
  Add a call to find the select handler for the engine involved in the
  multi-update/multi-delete query, allowing the storage engines to
  execute such queries.

  Fix the `find_select_handler_inner` function by allowing the storage
  engine's create_select functions to decide the pushdown of queries
  involving CTEs.
---
 .../federatedx_create_handlers.result         | 224 ++++++++++++++++++
 .../federated/federatedx_create_handlers.test | 126 +++++++++-
 sql/sql_delete.cc                             |   7 +
 sql/sql_select.cc                             |  13 +-
 storage/federatedx/federatedx_pushdown.cc     |   3 +
 .../spider/bugfix/r/mdev_37484.result         | 118 +++++++++
 .../spider/bugfix/t/mdev_37484.test           | 110 +++++++++
 7 files changed, 592 insertions(+), 9 deletions(-)
 create mode 100644 storage/spider/mysql-test/spider/bugfix/r/mdev_37484.result
 create mode 100644 storage/spider/mysql-test/spider/bugfix/t/mdev_37484.test

diff --git a/mysql-test/suite/federated/federatedx_create_handlers.result b/mysql-test/suite/federated/federatedx_create_handlers.result
index d2e919cf840..1c3838a08be 100644
--- a/mysql-test/suite/federated/federatedx_create_handlers.result
+++ b/mysql-test/suite/federated/federatedx_create_handlers.result
@@ -1350,6 +1350,229 @@ federated.t12, federated.t13, federated.t14;
 connection slave;
 DROP TABLES federated.t1, federated.t2, federated.t11, federated.t12,
 federated.t13, federated.t14;
+#
+# MDEV-37484: `Sql_cmd_dml::execute_inner`, `Sql_cmd_update::execute_inner` do not call Select handler for the engine involved
+#
+connection default;
+set global federated_pushdown=1;
+connection slave;
+create table federated.product_tag (product_id bigint);
+CREATE TABLE federated.product (
+`product_id` bigint(20) DEFAULT NULL,
+`price` bigint(20) DEFAULT NULL,
+`short_description` varchar(7998) DEFAULT NULL,
+`brand` varchar(254) DEFAULT NULL,
+`modified_dtm` datetime DEFAULT NULL,
+`created_dtm` datetime DEFAULT NULL,
+`modified_by` int(11) DEFAULT NULL
+) CHARSET=latin1;
+connection master;
+create table federated.product_tag (product_id bigint)
+ENGINE="FEDERATED"
+CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/product_tag';
+CREATE TABLE federated.product (
+`product_id` bigint(20) DEFAULT NULL,
+`price` bigint(20) DEFAULT NULL,
+`short_description` varchar(7998) DEFAULT NULL,
+`brand` varchar(254) DEFAULT NULL,
+`modified_dtm` datetime DEFAULT NULL,
+`created_dtm` datetime DEFAULT NULL,
+`modified_by` int(11) DEFAULT NULL
+)
+ENGINE="FEDERATED" DEFAULT CHARSET=latin1
+CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/product';
+insert into federated.product_tag values (1),(2),(3),(4);
+insert into federated.product values (1,22,'fes','rets','2011-12-12 12:12:12','2011-12-13 1:1:10',343);
+insert into federated.product values (3,22,'fes','rets','2011-12-12 12:12:12','2011-12-13 1:1:10',343);
+select * from federated.product order by product_id;
+product_id	price	short_description	brand	modified_dtm	created_dtm	modified_by
+1	22	fes	rets	2011-12-12 12:12:12	2011-12-13 01:01:10	343
+3	22	fes	rets	2011-12-12 12:12:12	2011-12-13 01:01:10	343
+explain format=json update
+federated.product p join
+(select product_id from federated.product_tag limit 1000) t using (product_id)
+set brand=p.product_id, price=555, modified_dtm='2011-12-15 15:15:30',
+short_description=concat(short_description,modified_by);
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": 1000.010933,
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "p",
+          "access_type": "ALL",
+          "loops": 1,
+          "rows": 2,
+          "cost": 1000.010388,
+          "filtered": 100,
+          "attached_condition": "p.product_id is not null"
+        }
+      },
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ref",
+          "possible_keys": ["key0"],
+          "key": "key0",
+          "key_length": "9",
+          "used_key_parts": ["product_id"],
+          "ref": ["federated.p.product_id"],
+          "loops": 2,
+          "rows": 1,
+          "cost": 0.000545388,
+          "filtered": 100,
+          "materialized": {
+            "query_block": {
+              "select_id": 2,
+              "table": {
+                "message": "Pushed derived"
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+update
+federated.product p join
+(select product_id from federated.product_tag limit 1000) t using (product_id)
+set brand=p.product_id, price=555, modified_dtm='2011-12-15 15:15:30',
+short_description=concat(short_description,modified_by);
+select * from federated.product order by product_id;
+product_id	price	short_description	brand	modified_dtm	created_dtm	modified_by
+1	555	fes343	1	2011-12-15 15:15:30	2011-12-13 01:01:10	343
+3	555	fes343	3	2011-12-15 15:15:30	2011-12-13 01:01:10	343
+drop table federated.product_tag;
+drop table federated.product;
+connection slave;
+drop table federated.product_tag;
+drop table federated.product;
+# Setup
+create or replace table federated.t1 (id int);
+create or replace table federated.t2 (id int, op varchar(10), op_count int DEFAULT 0) CHARSET=latin1;
+connection master;
+create or replace table federated.t1 (id int)
+ENGINE="FEDERATED"
+CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';
+create or replace table federated.t2 (id int, op varchar(10), op_count int DEFAULT 0)
+ENGINE="FEDERATED" DEFAULT CHARSET=latin1
+CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t2';
+insert into federated.t1 values (1),(2),(3),(4);
+insert into federated.t2 (id, op) values (1, 'inserted'), (2, 'inserted'), (3, 'inserted'), (4, 'inserted');
+select * from federated.t2 order by id;
+id	op	op_count
+1	inserted	0
+2	inserted	0
+3	inserted	0
+4	inserted	0
+# Update tests
+explain format=json update federated.t2 inner join federated.t1 on t2.id = t1.id
+set t2.op = 'updated', t2.op_count = t2.op_count + 1
+where t2.id in (1, 2);
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": 2000.022975,
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "t2",
+          "access_type": "ALL",
+          "loops": 1,
+          "rows": 4,
+          "cost": 1000.010655,
+          "filtered": 100,
+          "attached_condition": "t2.`id` in (1,2)"
+        }
+      },
+      {
+        "table": {
+          "table_name": "t1",
+          "access_type": "ALL",
+          "loops": 4,
+          "rows": 4,
+          "cost": 1000.012319,
+          "filtered": 100,
+          "attached_condition": "t1.`id` = t2.`id`"
+        }
+      }
+    ]
+  }
+}
+update federated.t2 inner join federated.t1 on t2.id = t1.id
+set t2.op = 'updated', t2.op_count = t2.op_count + 1
+where t2.id in (1, 2);
+select * from federated.t2 order by id;
+id	op	op_count
+1	updated	1
+2	updated	1
+3	inserted	0
+4	inserted	0
+# Prepared update stmt
+PREPARE stmt_update FROM
+'update federated.t2 inner join federated.t1 on t2.id = t1.id set t2.op_count = t2.op_count + 1, t2.op="updated" where t2.id in (1, 2)';
+EXECUTE stmt_update;
+DEALLOCATE PREPARE stmt_update;
+select * from federated.t2 order by id;
+id	op	op_count
+1	updated	2
+2	updated	2
+3	inserted	0
+4	inserted	0
+# Delete tests
+explain format=json
+delete federated.t2 from federated.t2 inner join federated.t1 on t2.id = t1.id and t2.op = 'updated';
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "cost": 2000.023025,
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "t2",
+          "access_type": "ALL",
+          "loops": 1,
+          "rows": 4,
+          "cost": 1000.010705,
+          "filtered": 100,
+          "attached_condition": "t2.op = 'updated'"
+        }
+      },
+      {
+        "table": {
+          "table_name": "t1",
+          "access_type": "ALL",
+          "loops": 4,
+          "rows": 4,
+          "cost": 1000.012319,
+          "filtered": 100,
+          "attached_condition": "t1.`id` = t2.`id`"
+        }
+      }
+    ]
+  }
+}
+delete federated.t2 from federated.t2 inner join federated.t1 on t2.id = t1.id and t2.op = 'updated';
+select * from federated.t2 order by id;
+id	op	op_count
+3	inserted	0
+4	inserted	0
+# Prepared delete stmt
+PREPARE stmt_delete FROM
+'delete federated.t2 from federated.t2 inner join federated.t1 on t2.id = t1.id where t2.id = 3';
+EXECUTE stmt_delete;
+DEALLOCATE PREPARE stmt_delete;
+select * from federated.t2 order by id;
+id	op	op_count
+4	inserted	0
+drop table federated.t1, federated.t2;
+connection slave;
+drop table federated.t1, federated.t2;
 connection default;
 set global federated_pushdown=0;
 connection master;
@@ -1358,3 +1581,4 @@ DROP DATABASE IF EXISTS federated;
 connection slave;
 DROP TABLE IF EXISTS federated.t1;
 DROP DATABASE IF EXISTS federated;
+# End of 11.4 tests
diff --git a/mysql-test/suite/federated/federatedx_create_handlers.test b/mysql-test/suite/federated/federatedx_create_handlers.test
index 5c60c27014e..3c18c3704a7 100644
--- a/mysql-test/suite/federated/federatedx_create_handlers.test
+++ b/mysql-test/suite/federated/federatedx_create_handlers.test
@@ -895,9 +895,133 @@ connection slave;
 DROP TABLES federated.t1, federated.t2, federated.t11, federated.t12,
   federated.t13, federated.t14;
 
+--echo #
+--echo # MDEV-37484: `Sql_cmd_dml::execute_inner`, `Sql_cmd_update::execute_inner` do not call Select handler for the engine involved
+--echo #
+
 connection default;
+set global federated_pushdown=1;
 
+connection slave;
+create table federated.product_tag (product_id bigint);
+CREATE TABLE federated.product (
+ `product_id` bigint(20) DEFAULT NULL,
+ `price` bigint(20) DEFAULT NULL,
+ `short_description` varchar(7998) DEFAULT NULL,
+ `brand` varchar(254) DEFAULT NULL,
+ `modified_dtm` datetime DEFAULT NULL,
+ `created_dtm` datetime DEFAULT NULL,
+ `modified_by` int(11) DEFAULT NULL
+) CHARSET=latin1;
+
+connection master;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval
+create table federated.product_tag (product_id bigint)
+ENGINE="FEDERATED"
+CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/product_tag';
+
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval
+CREATE TABLE federated.product (
+ `product_id` bigint(20) DEFAULT NULL,
+ `price` bigint(20) DEFAULT NULL,
+ `short_description` varchar(7998) DEFAULT NULL,
+ `brand` varchar(254) DEFAULT NULL,
+ `modified_dtm` datetime DEFAULT NULL,
+ `created_dtm` datetime DEFAULT NULL,
+ `modified_by` int(11) DEFAULT NULL
+)
+ENGINE="FEDERATED" DEFAULT CHARSET=latin1
+CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/product';
+
+insert into federated.product_tag values (1),(2),(3),(4);
+insert into federated.product values (1,22,'fes','rets','2011-12-12 12:12:12','2011-12-13 1:1:10',343);
+insert into federated.product values (3,22,'fes','rets','2011-12-12 12:12:12','2011-12-13 1:1:10',343);
+select * from federated.product order by product_id;
+
+let $query=
+update
+ federated.product p join
+ (select product_id from federated.product_tag limit 1000) t using (product_id)
+ set brand=p.product_id, price=555, modified_dtm='2011-12-15 15:15:30',
+ short_description=concat(short_description,modified_by);
+
+eval explain format=json $query;
+eval $query;
+
+select * from federated.product order by product_id;
+
+drop table federated.product_tag;
+drop table federated.product;
+
+connection slave;
+drop table federated.product_tag;
+drop table federated.product;
+
+--echo # Setup
+create or replace table federated.t1 (id int);
+create or replace table federated.t2 (id int, op varchar(10), op_count int DEFAULT 0) CHARSET=latin1;
+
+connection master;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval
+create or replace table federated.t1 (id int)
+ENGINE="FEDERATED"
+CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';
+
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+eval
+create or replace table federated.t2 (id int, op varchar(10), op_count int DEFAULT 0)
+ENGINE="FEDERATED" DEFAULT CHARSET=latin1
+CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t2';
+
+insert into federated.t1 values (1),(2),(3),(4);
+insert into federated.t2 (id, op) values (1, 'inserted'), (2, 'inserted'), (3, 'inserted'), (4, 'inserted');
+select * from federated.t2 order by id;
+
+--echo # Update tests
+let $query=
+    update federated.t2 inner join federated.t1 on t2.id = t1.id
+        set t2.op = 'updated', t2.op_count = t2.op_count + 1
+        where t2.id in (1, 2);
+
+eval explain format=json $query;
+eval $query;
+
+select * from federated.t2 order by id;
+
+--echo # Prepared update stmt
+PREPARE stmt_update FROM
+'update federated.t2 inner join federated.t1 on t2.id = t1.id set t2.op_count = t2.op_count + 1, t2.op="updated" where t2.id in (1, 2)';
+EXECUTE stmt_update;
+DEALLOCATE PREPARE stmt_update;
+
+select * from federated.t2 order by id;
+
+--echo # Delete tests
+explain format=json
+    delete federated.t2 from federated.t2 inner join federated.t1 on t2.id = t1.id and t2.op = 'updated';
+
+delete federated.t2 from federated.t2 inner join federated.t1 on t2.id = t1.id and t2.op = 'updated';
+select * from federated.t2 order by id;
+
+--echo # Prepared delete stmt
+PREPARE stmt_delete FROM
+'delete federated.t2 from federated.t2 inner join federated.t1 on t2.id = t1.id where t2.id = 3';
+EXECUTE stmt_delete;
+DEALLOCATE PREPARE stmt_delete;
+
+select * from federated.t2 order by id;
+
+drop table federated.t1, federated.t2;
+
+connection slave;
+drop table federated.t1, federated.t2;
+
+# cleanup
+connection default;
 set global federated_pushdown=0;
-
 source include/federated_cleanup.inc;
 
+--echo # End of 11.4 tests
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index e7c163d335e..c6d6916e0a0 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -1622,6 +1622,13 @@ bool Sql_cmd_delete::precheck(THD *thd)
   {
     if (multi_delete_precheck(thd, lex->query_tables))
       return true;
+
+    SELECT_LEX *select_lex= lex->first_select_lex();
+    /* condition will be TRUE on SP re-excuting */
+    if (select_lex->item_list.elements != 0)
+      select_lex->item_list.empty();
+    if (add_item_to_list(thd, new (thd->mem_root) Item_null(thd)))
+      return true;
   }
 
 #ifdef WITH_WSREP
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 6c480401e7f..c97241d2b75 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -5218,15 +5218,9 @@ select_handler *find_select_handler_inner(THD *thd,
                                     SELECT_LEX *select_lex,
                                     SELECT_LEX_UNIT *select_lex_unit)
 {
-  if (select_lex->master_unit()->outer_select() ||
-      (select_lex_unit && select_lex->master_unit()->with_clause))
-  {
-    /*
-      Pushdown is not supported neither for non-top-level SELECTs nor for parts
-      of SELECT_LEX_UNITs that have CTEs (SELECT_LEX_UNIT::with_clause)
-    */
+  // Pushdown is not supported for non-top-level SELECTs
+  if (select_lex->master_unit()->outer_select())
     return 0;
-  }
 
   TABLE_LIST *tbl= nullptr;
   // For SQLCOM_INSERT_SELECT the server takes TABLE_LIST
@@ -34603,6 +34597,9 @@ bool Sql_cmd_dml::execute_inner(THD *thd)
   SELECT_LEX *select_lex= unit->first_select();
   JOIN *join= select_lex->join;
 
+  // look for select_handler provided by engines
+  select_lex->pushdown_select= find_single_select_handler(thd, select_lex);
+
   if (join->optimize())
     goto err;
 
diff --git a/storage/federatedx/federatedx_pushdown.cc b/storage/federatedx/federatedx_pushdown.cc
index 0b3c45d2b2c..fd445bebb25 100644
--- a/storage/federatedx/federatedx_pushdown.cc
+++ b/storage/federatedx/federatedx_pushdown.cc
@@ -239,6 +239,9 @@ create_federatedx_select_handler(THD *thd, SELECT_LEX *sel_lex,
   if (!use_pushdown || !is_supported_by_select_handler(thd->lex->sql_command))
     return nullptr;
 
+  if (lex_unit && sel_lex->master_unit()->with_clause)
+    return nullptr;
+
   auto tbl= get_fed_table_for_pushdown(sel_lex);
   if (!tbl)
     return nullptr;
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_37484.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_37484.result
new file mode 100644
index 00000000000..65f0f83c1de
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_37484.result
@@ -0,0 +1,118 @@
+#
+# MDEV-37484: `Sql_cmd_dml::execute_inner`, `Sql_cmd_update::execute_inner` do not call Select handler for the engine involved
+#
+for master_1
+for child2
+for child3
+set spider_same_server_link=1;
+CREATE SERVER s FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test', user 'root');
+create table product_tag(product_id bigint);
+create table product (
+`product_id` bigint(20) DEFAULT NULL,
+`price` bigint(20) DEFAULT NULL,
+`short_description` varchar(7998) DEFAULT NULL,
+`brand` varchar(254) DEFAULT NULL,
+`modified_dtm` datetime DEFAULT NULL,
+`created_dtm` datetime DEFAULT NULL,
+`modified_by` int(11) DEFAULT NULL
+);
+insert into product_tag values (1),(2),(3),(4);
+insert into product values (1,22,'fes','rets','2011-12-12 12:12:12','2011-12-13 1:1:10',343);
+insert into product values (3,22,'fes','rets','2011-12-12 12:12:12','2011-12-13 1:1:10',343);
+create table product_tag_spider (product_id bigint) ENGINE=SPIDER REMOTE_SERVER=s REMOTE_TABLE=product_tag;
+create table product_spider (
+`product_id` bigint(20) DEFAULT NULL,
+`price` bigint(20) DEFAULT NULL,
+`short_description` varchar(7998) DEFAULT NULL,
+`brand` varchar(254) DEFAULT NULL,
+`modified_dtm` datetime DEFAULT NULL,
+`created_dtm` datetime DEFAULT NULL,
+`modified_by` int(11) DEFAULT NULL
+) ENGINE=SPIDER REMOTE_SERVER=s REMOTE_TABLE=product;
+select * from product_spider order by product_id;
+product_id	price	short_description	brand	modified_dtm	created_dtm	modified_by
+1	22	fes	rets	2011-12-12 12:12:12	2011-12-13 01:01:10	343
+3	22	fes	rets	2011-12-12 12:12:12	2011-12-13 01:01:10	343
+explain update
+product_spider p join
+(select product_id from product_tag_spider limit 1000) t using (product_id)
+set brand=p.product_id, price=555, modified_dtm='2011-12-15 15:15:30',
+short_description=concat(short_description,modified_by);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	p	ALL	NULL	NULL	NULL	NULL	2	Using where with pushed condition
+1	PRIMARY	<derived2>	ref	key0	key0	9	test.p.product_id	1	
+2	DERIVED	product_tag_spider	ALL	NULL	NULL	NULL	NULL	4	
+update
+product_spider p join
+(select product_id from product_tag_spider limit 1000) t using (product_id)
+set brand=p.product_id, price=555, modified_dtm='2011-12-15 15:15:30',
+short_description=concat(short_description,modified_by);
+select * from product_spider order by product_id;
+product_id	price	short_description	brand	modified_dtm	created_dtm	modified_by
+1	555	fes343	1	2011-12-15 15:15:30	2011-12-13 01:01:10	343
+3	555	fes343	3	2011-12-15 15:15:30	2011-12-13 01:01:10	343
+drop table product, product_tag, product_spider, product_tag_spider;
+create table t1 (id int);
+create table t2 (id int, op varchar(10), op_count int DEFAULT 0);
+insert into t1 values (1),(2),(3),(4);
+insert into t2 (id, op) values (1, 'inserted'), (2, 'inserted'), (3, 'inserted'), (4, 'inserted');
+CREATE TABLE t1_SPIDER (id int) ENGINE=SPIDER REMOTE_SERVER=s REMOTE_TABLE=t1;
+CREATE TABLE t2_SPIDER (id int, op varchar(10), op_count int DEFAULT 0) ENGINE=SPIDER REMOTE_SERVER=s REMOTE_TABLE=t2;
+select * from t2_SPIDER order by id;
+id	op	op_count
+1	inserted	0
+2	inserted	0
+3	inserted	0
+4	inserted	0
+# Update tests
+explain update t2_SPIDER inner join t1_SPIDER on t2_SPIDER.id = t1_SPIDER.id
+set t2_SPIDER.op = 'updated', t2_SPIDER.op_count = t2_SPIDER.op_count + 1
+where t2_SPIDER.id in (1, 2);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2_SPIDER	ALL	NULL	NULL	NULL	NULL	4	Using where with pushed condition
+1	SIMPLE	t1_SPIDER	ALL	NULL	NULL	NULL	NULL	4	Using where
+update t2_SPIDER inner join t1_SPIDER on t2_SPIDER.id = t1_SPIDER.id
+set t2_SPIDER.op = 'updated', t2_SPIDER.op_count = t2_SPIDER.op_count + 1
+where t2_SPIDER.id in (1, 2);
+select * from t2_SPIDER order by id;
+id	op	op_count
+1	updated	1
+2	updated	1
+3	inserted	0
+4	inserted	0
+PREPARE stmt_update FROM
+'update t2_SPIDER inner join t1_SPIDER on t2_SPIDER.id = t1_SPIDER.id set t2_SPIDER.op_count = t2_SPIDER.op_count + 1, t2_SPIDER.op="updated" where t2_SPIDER.id in (1, 2)';
+EXECUTE stmt_update;
+DEALLOCATE PREPARE stmt_update;
+select * from t2_SPIDER order by id;
+id	op	op_count
+1	updated	2
+2	updated	2
+3	inserted	0
+4	inserted	0
+# Delete tests
+explain
+delete t2_SPIDER from t2_SPIDER inner join t1_SPIDER on t2_SPIDER.id = t1_SPIDER.id and t2_SPIDER.op = 'updated';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2_SPIDER	ALL	NULL	NULL	NULL	NULL	4	Using where with pushed condition
+1	SIMPLE	t1_SPIDER	ALL	NULL	NULL	NULL	NULL	4	Using where
+delete t2_SPIDER from t2_SPIDER inner join t1_SPIDER on t2_SPIDER.id = t1_SPIDER.id and t2_SPIDER.op = 'updated';
+select * from t2_SPIDER order by id;
+id	op	op_count
+3	inserted	0
+4	inserted	0
+PREPARE stmt_delete FROM
+'delete t2_SPIDER from t2_SPIDER inner join t1_SPIDER on t2_SPIDER.id = t1_SPIDER.id where t2_SPIDER.id = 3';
+EXECUTE stmt_delete;
+DEALLOCATE PREPARE stmt_delete;
+select * from t2_SPIDER order by id;
+id	op	op_count
+4	inserted	0
+drop table t1, t2, t1_SPIDER, t2_SPIDER;
+drop server s;
+for master_1
+for child2
+for child3
+#
+# end of test MDEV-37484
+#
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_37484.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_37484.test
new file mode 100644
index 00000000000..24ad142557b
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_37484.test
@@ -0,0 +1,110 @@
+--echo #
+--echo # MDEV-37484: `Sql_cmd_dml::execute_inner`, `Sql_cmd_update::execute_inner` do not call Select handler for the engine involved
+--echo #
+
+--disable_query_log
+--disable_result_log
+--source ../../t/test_init.inc
+--enable_result_log
+--enable_query_log
+set spider_same_server_link=1;
+
+evalp CREATE SERVER s FOREIGN DATA WRAPPER MYSQL OPTIONS (SOCKET "$MASTER_1_MYSOCK", DATABASE 'test', user 'root');
+
+create table product_tag(product_id bigint);
+create table product (
+ `product_id` bigint(20) DEFAULT NULL,
+ `price` bigint(20) DEFAULT NULL,
+ `short_description` varchar(7998) DEFAULT NULL,
+ `brand` varchar(254) DEFAULT NULL,
+ `modified_dtm` datetime DEFAULT NULL,
+ `created_dtm` datetime DEFAULT NULL,
+ `modified_by` int(11) DEFAULT NULL
+);
+
+insert into product_tag values (1),(2),(3),(4);
+insert into product values (1,22,'fes','rets','2011-12-12 12:12:12','2011-12-13 1:1:10',343);
+insert into product values (3,22,'fes','rets','2011-12-12 12:12:12','2011-12-13 1:1:10',343);
+
+create table product_tag_spider (product_id bigint) ENGINE=SPIDER REMOTE_SERVER=s REMOTE_TABLE=product_tag;
+create table product_spider (
+ `product_id` bigint(20) DEFAULT NULL,
+ `price` bigint(20) DEFAULT NULL,
+ `short_description` varchar(7998) DEFAULT NULL,
+ `brand` varchar(254) DEFAULT NULL,
+ `modified_dtm` datetime DEFAULT NULL,
+ `created_dtm` datetime DEFAULT NULL,
+ `modified_by` int(11) DEFAULT NULL
+) ENGINE=SPIDER REMOTE_SERVER=s REMOTE_TABLE=product;
+
+select * from product_spider order by product_id;
+
+let $query=
+update
+    product_spider p join
+    (select product_id from product_tag_spider limit 1000) t using (product_id)
+    set brand=p.product_id, price=555, modified_dtm='2011-12-15 15:15:30',
+    short_description=concat(short_description,modified_by);
+
+eval explain $query;
+eval $query;
+
+select * from product_spider order by product_id;
+
+drop table product, product_tag, product_spider, product_tag_spider;
+
+create table t1 (id int);
+create table t2 (id int, op varchar(10), op_count int DEFAULT 0);
+
+insert into t1 values (1),(2),(3),(4);
+insert into t2 (id, op) values (1, 'inserted'), (2, 'inserted'), (3, 'inserted'), (4, 'inserted');
+
+CREATE TABLE t1_SPIDER (id int) ENGINE=SPIDER REMOTE_SERVER=s REMOTE_TABLE=t1;
+CREATE TABLE t2_SPIDER (id int, op varchar(10), op_count int DEFAULT 0) ENGINE=SPIDER REMOTE_SERVER=s REMOTE_TABLE=t2;
+
+select * from t2_SPIDER order by id;
+
+--echo # Update tests
+let $query=
+    update t2_SPIDER inner join t1_SPIDER on t2_SPIDER.id = t1_SPIDER.id
+        set t2_SPIDER.op = 'updated', t2_SPIDER.op_count = t2_SPIDER.op_count + 1
+        where t2_SPIDER.id in (1, 2);
+
+eval explain $query;
+eval $query;
+
+select * from t2_SPIDER order by id;
+
+PREPARE stmt_update FROM
+'update t2_SPIDER inner join t1_SPIDER on t2_SPIDER.id = t1_SPIDER.id set t2_SPIDER.op_count = t2_SPIDER.op_count + 1, t2_SPIDER.op="updated" where t2_SPIDER.id in (1, 2)';
+EXECUTE stmt_update;
+DEALLOCATE PREPARE stmt_update;
+
+select * from t2_SPIDER order by id;
+
+--echo # Delete tests
+explain
+    delete t2_SPIDER from t2_SPIDER inner join t1_SPIDER on t2_SPIDER.id = t1_SPIDER.id and t2_SPIDER.op = 'updated';
+
+delete t2_SPIDER from t2_SPIDER inner join t1_SPIDER on t2_SPIDER.id = t1_SPIDER.id and t2_SPIDER.op = 'updated';
+select * from t2_SPIDER order by id;
+
+PREPARE stmt_delete FROM
+'delete t2_SPIDER from t2_SPIDER inner join t1_SPIDER on t2_SPIDER.id = t1_SPIDER.id where t2_SPIDER.id = 3';
+EXECUTE stmt_delete;
+DEALLOCATE PREPARE stmt_delete;
+
+select * from t2_SPIDER order by id;
+
+drop table t1, t2, t1_SPIDER, t2_SPIDER;
+drop server s;
+
+--disable_query_log
+--disable_result_log
+--source ../../t/test_deinit.inc
+--enable_result_log
+--enable_query_log
+
+--echo #
+--echo # end of test MDEV-37484
+--echo #

From 15283527a5dfb1ceb56ce858530b0b3c137399ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Wed, 26 Nov 2025 11:54:16 +0200
Subject: [PATCH 062/119] Galera library 26.4.25 contains gcs protocol change
 5-->6

---
 mysql-test/suite/wsrep/r/wsrep_protocol_versions.result | 2 +-
 mysql-test/suite/wsrep/t/wsrep_protocol_versions.test   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/suite/wsrep/r/wsrep_protocol_versions.result b/mysql-test/suite/wsrep/r/wsrep_protocol_versions.result
index 35139f5b9cf..0d2759aaa89 100644
--- a/mysql-test/suite/wsrep/r/wsrep_protocol_versions.result
+++ b/mysql-test/suite/wsrep/r/wsrep_protocol_versions.result
@@ -2,6 +2,6 @@
 show status like 'wsrep_protocol%';
 Variable_name	Value
 wsrep_protocol_application	4
-wsrep_protocol_gcs	5
+wsrep_protocol_gcs	6
 wsrep_protocol_replicator	11
 wsrep_protocol_version	11
diff --git a/mysql-test/suite/wsrep/t/wsrep_protocol_versions.test b/mysql-test/suite/wsrep/t/wsrep_protocol_versions.test
index f8979050686..9ac59eee071 100644
--- a/mysql-test/suite/wsrep/t/wsrep_protocol_versions.test
+++ b/mysql-test/suite/wsrep/t/wsrep_protocol_versions.test
@@ -2,7 +2,7 @@
 --source include/force_restart.inc
 --source include/have_innodb.inc
 
---let $galera_version=26.4.21
+--let $galera_version=26.4.25
 source include/check_galera_version.inc;
 
 --sorted_result

From 1893fb4d2bbae86300b3ebfbbc08c1774c1abe59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Wed, 26 Nov 2025 14:00:00 +0200
Subject: [PATCH 063/119] MDEV-38201 : Assertion `level !=
 Sql_condition::WARN_LEVEL_ERROR' failed in void push_warning(THD*,
 Sql_state_errno_level::enum_warning_level, uint, const char*)

Problem was that wrong level of Sql_condition was used on
push_warning_printf and error handling of REFRESH_HOSTS
(and similar) was broken.

Fixed warning printing in wsrep_TOI_begin after enter_toi_local
is called. Fixed also error handling after REFRESH_HOSTS (and others)
if TOI begin failed.
---
 mysql-test/suite/galera/r/MDEV-38201.result   | 35 +++++++++++++
 .../suite/galera/r/galera_split_brain.result  |  6 +--
 mysql-test/suite/galera/t/MDEV-38201.test     | 49 +++++++++++++++++++
 .../suite/galera/t/galera_split_brain.test    |  8 +--
 sql/sql_parse.cc                              |  7 ++-
 sql/wsrep_mysqld.cc                           | 41 +++++-----------
 6 files changed, 109 insertions(+), 37 deletions(-)
 create mode 100644 mysql-test/suite/galera/r/MDEV-38201.result
 create mode 100644 mysql-test/suite/galera/t/MDEV-38201.test

diff --git a/mysql-test/suite/galera/r/MDEV-38201.result b/mysql-test/suite/galera/r/MDEV-38201.result
new file mode 100644
index 00000000000..5d389c6a516
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-38201.result
@@ -0,0 +1,35 @@
+connection node_2;
+connection node_1;
+connection node_1;
+connection node_2;
+connection node_1;
+SET GLOBAL wsrep_provider_options ='pc.ignore_sb=true;pc.weight=2';
+connection node_2;
+CREATE TABLE t1 (f1 INT) ENGINE=InnoDB;
+SET GLOBAL wsrep_IGNORE_apply_errors=1;
+SET SESSION wsrep_dirty_reads=1;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+FLUSH HOSTS;
+CREATE TABLE t1 (f1 INT) ENGINE=InnoDB;
+ERROR 42S01: Table 't1' already exists
+FLUSH HOSTS;
+ERROR HY000: Galera replication not supported
+SHOW WARNINGS;
+Level	Code	Message
+Error	4165	Galera replication not supported
+Warning	4165	Galera cluster is not ready to execute replication
+connection node_1;
+# Wait until inconsistent node_2 leaves from cluster
+connection node_2;
+# Restart node_2
+call mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on");
+connection node_1;
+# Wait until node_2 is back in the cluster
+SET GLOBAL wsrep_provider_options ='pc.ignore_sb=false;pc.weight=1';
+DROP TABLE t1;
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera/r/galera_split_brain.result b/mysql-test/suite/galera/r/galera_split_brain.result
index b3b052b82ba..ac2210be396 100644
--- a/mysql-test/suite/galera/r/galera_split_brain.result
+++ b/mysql-test/suite/galera/r/galera_split_brain.result
@@ -2,10 +2,7 @@ connection node_2;
 connection node_1;
 connection node_1;
 connection node_2;
-connection node_2;
-call mtr.add_suppression("WSREP: TO isolation failed for: ");
 connection node_1;
-call mtr.add_suppression("CREATE TABLE isolation failure");
 connection node_2;
 Killing server ...
 connection node_1;
@@ -14,5 +11,8 @@ CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 connection node_2;
 connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2;
+connection node_1;
+call mtr.add_suppression("WSREP: TO isolation error timeout_error for : test.t1");
+call mtr.add_suppression("WSREP: CREATE TABLE isolation failure");
 disconnect node_2;
 disconnect node_1;
diff --git a/mysql-test/suite/galera/t/MDEV-38201.test b/mysql-test/suite/galera/t/MDEV-38201.test
new file mode 100644
index 00000000000..793e8b85e63
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-38201.test
@@ -0,0 +1,49 @@
+--source include/galera_cluster.inc
+
+--source include/force_restart.inc
+
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
+--connection node_1
+# Set higher weight for node_1 to keep it in primary
+# while node_2 is inconsistent
+
+SET GLOBAL wsrep_provider_options ='pc.ignore_sb=true;pc.weight=2';
+
+--connection node_2
+CREATE TABLE t1 (f1 INT) ENGINE=InnoDB;
+SET GLOBAL wsrep_IGNORE_apply_errors=1;
+SET SESSION wsrep_dirty_reads=1;
+SHOW CREATE TABLE t1;
+FLUSH HOSTS;
+--error ER_TABLE_EXISTS_ERROR
+CREATE TABLE t1 (f1 INT) ENGINE=InnoDB;
+# This will cause inconsistency
+--error ER_GALERA_REPLICATION_NOT_SUPPORTED
+FLUSH HOSTS;
+SHOW WARNINGS;
+
+--connection node_1
+--echo # Wait until inconsistent node_2 leaves from cluster
+--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+--source include/wait_condition.inc
+
+--connection node_2
+--echo # Restart node_2
+--source include/restart_mysqld.inc
+
+call mtr.add_suppression("WSREP: Inconsistency detected: Inconsistent by consensus on");
+
+--connection node_1
+--echo # Wait until node_2 is back in the cluster
+--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+--source include/wait_condition.inc
+
+SET GLOBAL wsrep_provider_options ='pc.ignore_sb=false;pc.weight=1';
+
+DROP TABLE t1;
+--source include/auto_increment_offset_restore.inc
+--source include/galera_end.inc
diff --git a/mysql-test/suite/galera/t/galera_split_brain.test b/mysql-test/suite/galera/t/galera_split_brain.test
index bb6a4c8e648..d4247cd4884 100644
--- a/mysql-test/suite/galera/t/galera_split_brain.test
+++ b/mysql-test/suite/galera/t/galera_split_brain.test
@@ -13,12 +13,8 @@
 --let $node_2=node_2
 --source include/auto_increment_offset_save.inc
 
---connection node_2
-call mtr.add_suppression("WSREP: TO isolation failed for: ");
-
 --connection node_1
 --let $wsrep_cluster_address_orig = `SELECT @@wsrep_cluster_address`
-call mtr.add_suppression("CREATE TABLE isolation failure");
 
 --connection node_2
 --source include/kill_galera.inc
@@ -43,4 +39,8 @@ CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 --let $node_2=node_2a
 --source include/auto_increment_offset_restore.inc
 
+--connection node_1
+call mtr.add_suppression("WSREP: TO isolation error timeout_error for : test.t1");
+call mtr.add_suppression("WSREP: CREATE TABLE isolation failure");
+
 --source include/galera_end.inc
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 1f34b30e110..065232c2cea 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5644,7 +5644,12 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
     REFRESH_STATUS                          |
     REFRESH_USER_RESOURCES))
     {
-      WSREP_TO_ISOLATION_BEGIN_WRTCHK(WSREP_MYSQL_DB, NULL, NULL);
+      if (WSREP(thd) && !thd->lex->no_write_to_binlog &&
+          wsrep_to_isolation_begin(thd, WSREP_MYSQL_DB, NULL, NULL))
+      {
+	res= 1;
+	goto error;
+      }
     }
 #endif /* WITH_WSREP*/
 
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index cc91fe0e293..a5840875ff7 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -2848,9 +2848,10 @@ static int wsrep_TOI_begin(THD *thd, const char *db, const char *table,
     if (!wsrep_ready)
     {
       my_error(ER_GALERA_REPLICATION_NOT_SUPPORTED, MYF(0));
-      push_warning_printf(thd, Sql_state_errno_level::WARN_LEVEL_WARN,
+      push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
                           ER_GALERA_REPLICATION_NOT_SUPPORTED,
                           "Galera cluster is not ready to execute replication");
+      return -1;
     }
     return 1;
   }
@@ -2900,51 +2901,33 @@ static int wsrep_TOI_begin(THD *thd, const char *db, const char *table,
   if (ret)
   {
     DBUG_ASSERT(cs.current_error());
-    WSREP_DEBUG("to_execute_start() failed for %llu: %s, seqno: %lld",
-                thd->thread_id, wsrep_thd_query(thd),
-                (long long)wsrep_thd_trx_seqno(thd));
+    WSREP_WARN("TO isolation error %s for : %s.%s, sql: %s. ",
+               wsrep::to_c_string(cs.current_error()),
+               (db ? db : "(null)"),
+               (table ? table : " "),
+               wsrep_thd_query(thd));
 
     /* jump to error handler in mysql_execute_command() */
     switch (cs.current_error())
     {
     case wsrep::e_size_exceeded_error:
-      WSREP_WARN("TO isolation failed for: %d, schema: %s, sql: %s. "
-                 "Maximum size exceeded.",
-                 ret,
-                 (thd->db.str ? thd->db.str : "(null)"),
-                 wsrep_thd_query(thd));
       my_error(ER_UNKNOWN_ERROR, MYF(0), "Maximum writeset size exceeded");
       break;
     case wsrep::e_deadlock_error:
-      WSREP_WARN("TO isolation failed for: %d, schema: %s, sql: %s. "
-                 "Deadlock error.",
-                 ret,
-                 (thd->db.str ? thd->db.str : "(null)"),
-                 wsrep_thd_query(thd));
       my_error(ER_LOCK_DEADLOCK, MYF(0));
       break;
     case wsrep::e_timeout_error:
-      WSREP_WARN("TO isolation failed for: %d, schema: %s, sql: %s. "
-                 "Operation timed out.",
-                 ret,
-                 (thd->db.str ? thd->db.str : "(null)"),
-                 wsrep_thd_query(thd));
       my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0));
       break;
     default:
-      WSREP_WARN("TO isolation failed for: %d, schema: %s, sql: %s. "
-                 "Check your wsrep connection state and retry the query.",
-                 ret,
-                 (thd->db.str ? thd->db.str : "(null)"),
-                 wsrep_thd_query(thd));
-
       if (!thd->is_error())
       {
-        push_warning_printf(thd, Sql_state_errno_level::WARN_LEVEL_ERROR,
-                            ER_LOCK_DEADLOCK,
-                            "WSREP replication failed. Check "
-                            "your wsrep connection state and retry the query.");
         my_error(ER_LOCK_DEADLOCK, MYF(0));
+        push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+                            ER_LOCK_DEADLOCK,
+                            "WSREP replication failed with error %s. "
+                            "Check your wsrep connection state and retry the query.",
+                            wsrep::to_c_string(cs.current_error()));
       }
     }
     rc= -1;

From 2fd25d77f031f48f501344b5d77aeea62b42da88 Mon Sep 17 00:00:00 2001
From: Andrei Elkin <andrei.elkin@pp.inet.fi>
Date: Mon, 15 Sep 2025 18:34:51 +0300
Subject: [PATCH 064/119] MDEV-37541 Race of rolling back and committing
 transaction to binlog

Two transactions could binlog their completions in opposite to how it
is done in Engine. That is is rare situations ROLLBACK in Engine of
the dependency parent transaction could be scheduled by the
transaction before its binlogging. That give a follower dependency
child one get binlogged ahead of the parent.

For fixing this bug its necessary to ensure the binlogging phase is
always first one in the internal one-phase rollback protocol.

The commit makes sure the binlog handlerton always rollbacks as first
handlerton in no-2pc cases.

An added test demonstrates how the child could otherwise reach binlog
before its parent.
---
 .../suite/binlog/r/binlog_mdev37541.result    | 41 +++++++++++++++
 .../suite/binlog/t/binlog_mdev37541.test      | 50 +++++++++++++++++++
 sql/handler.cc                                | 11 +++-
 sql/log.cc                                    |  1 +
 4 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 mysql-test/suite/binlog/r/binlog_mdev37541.result
 create mode 100644 mysql-test/suite/binlog/t/binlog_mdev37541.test

diff --git a/mysql-test/suite/binlog/r/binlog_mdev37541.result b/mysql-test/suite/binlog/r/binlog_mdev37541.result
new file mode 100644
index 00000000000..0c9f162a8f4
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_mdev37541.result
@@ -0,0 +1,41 @@
+create table t1 (a int primary key, b text) engine=innodb;
+connect trx1_rollback,localhost,root,,;
+CREATE TABLE t_x (a int) engine=MEMORY;
+SET binlog_format=row;
+CREATE TEMPORARY TABLE tt_tmp ( id INT ) ENGINE = Memory;
+BEGIN;
+insert into t_x values (1);
+drop temporary table tt_tmp;
+insert into t1 values (99, "gotta log first");
+SET DEBUG_SYNC= 'reset';
+SET DEBUG_SYNC= "before_group_commit_queue SIGNAL trx1_at_log WAIT_FOR trx1_go";
+ROLLBACK;
+connect trx2_commit,localhost,root,,;
+insert into t1 values (99, "second best in binlog");
+connection default;
+SET DEBUG_SYNC= "now WAIT_FOR trx1_at_log";
+SET DEBUG_SYNC= "now SIGNAL trx1_go";
+connection trx2_commit;
+select * from t1;
+a	b
+99	second best in binlog
+# Prove the logging order is Trx1, Trx2
+include/show_binlog_events.inc
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	insert into t_x values (1)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t_x)
+master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Annotate_rows	#	#	insert into t1 values (99, "gotta log first")
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	ROLLBACK
+master-bin.000001	#	Gtid	#	#	BEGIN GTID #-#-#
+master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (99, "second best in binlog")
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+drop table t_x, t1;
+disconnect trx1_rollback;
+disconnect trx2_commit;
+# end of the tests
diff --git a/mysql-test/suite/binlog/t/binlog_mdev37541.test b/mysql-test/suite/binlog/t/binlog_mdev37541.test
new file mode 100644
index 00000000000..de94f5a5ebd
--- /dev/null
+++ b/mysql-test/suite/binlog/t/binlog_mdev37541.test
@@ -0,0 +1,50 @@
+--source include/have_debug_sync.inc
+--source include/have_innodb.inc
+--source include/have_binlog_format_mixed.inc
+
+create table t1 (a int primary key, b text) engine=innodb;
+
+connect(trx1_rollback,localhost,root,,);
+CREATE TABLE t_x (a int) engine=MEMORY;
+
+--let $master_file= query_get_value(SHOW MASTER STATUS, File, 1)
+--let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1)
+SET binlog_format=row;
+CREATE TEMPORARY TABLE tt_tmp ( id INT ) ENGINE = Memory;
+BEGIN;
+  insert into t_x values (1);
+  drop temporary table tt_tmp;
+  insert into t1 values (99, "gotta log first");
+
+SET DEBUG_SYNC= 'reset';
+SET DEBUG_SYNC= "before_group_commit_queue SIGNAL trx1_at_log WAIT_FOR trx1_go";
+
+--send ROLLBACK
+
+connect(trx2_commit,localhost,root,,);
+--send insert into t1 values (99, "second best in binlog")
+
+connection default;
+
+# Make sure ROLLBACK is in the binlogging phase ..
+SET DEBUG_SYNC= "now WAIT_FOR trx1_at_log";
+# .. and the contender trx2 in the locking phase ..
+let $wait_condition=
+  select count(*) = 1 from information_schema.innodb_trx
+  where trx_state = "LOCK WAIT" and trx_query like "%insert into t1 values%";
+source include/wait_condition.inc;
+# .. when both provided unfreeze the trx:s ..
+SET DEBUG_SYNC= "now SIGNAL trx1_go";
+
+connection trx2_commit;
+reap;
+select * from t1;
+
+# .. to observe proper binlogging.
+--echo # Prove the logging order is Trx1, Trx2
+--source include/show_binlog_events.inc
+
+drop table t_x, t1;
+disconnect trx1_rollback;
+disconnect trx2_commit;
+--echo # end of the tests
diff --git a/sql/handler.cc b/sql/handler.cc
index 6219569b429..67ccb31e4f9 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -2308,11 +2308,18 @@ int ha_rollback_trans(THD *thd, bool all)
     if (is_real_trans)                          /* not a statement commit */
       thd->stmt_map.close_transient_cursors();
 
+    int err;
+    if (has_binlog_hton(ha_info) &&
+        (err= binlog_hton->rollback(binlog_hton, thd, all)))
+    {
+      my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
+      error= 1;
+    }
     for (; ha_info; ha_info= ha_info_next)
     {
-      int err;
       handlerton *ht= ha_info->ht();
-      if ((err= ht->rollback(ht, thd, all)))
+
+      if (ht != binlog_hton && (err= ht->rollback(ht, thd, all)))
       {
         // cannot happen
         my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err);
diff --git a/sql/log.cc b/sql/log.cc
index c41889cb108..962557ad769 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -8235,6 +8235,7 @@ end:
 bool
 MYSQL_BIN_LOG::write_transaction_to_binlog_events(group_commit_entry *entry)
 {
+  DEBUG_SYNC(entry->thd, "before_group_commit_queue");
   int is_leader= queue_for_group_commit(entry);
 #ifdef WITH_WSREP
   /* commit order was released in queue_for_group_commit() call,

From ac1b7d0a7fd0ebd26e654d2baaefb0c517a19634 Mon Sep 17 00:00:00 2001
From: Alessandro Vetere <iminelink@gmail.com>
Date: Wed, 26 Nov 2025 14:13:45 +0000
Subject: [PATCH 065/119] fixup MDEV-19123 Change default charset from latin1
 to utf8mb4

Adjust the 128 indexes build test result.

Reviewed by: Alexander Barkov
---
 mysql-test/main/create_w_max_indexes_128.result | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql-test/main/create_w_max_indexes_128.result b/mysql-test/main/create_w_max_indexes_128.result
index 112df1b7c41..e54c27b8270 100644
--- a/mysql-test/main/create_w_max_indexes_128.result
+++ b/mysql-test/main/create_w_max_indexes_128.result
@@ -470,7 +470,7 @@ t1	CREATE TABLE `t1` (
   KEY `a126_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a127_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a128_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
 flush tables;
 show create table t1;
 Table	Create Table
@@ -619,7 +619,7 @@ t1	CREATE TABLE `t1` (
   KEY `a126_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a127_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a128_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
 drop table t1;
 create table t1 (c1 int, c2 int, c3 int, c4 int, c5 int, c6 int, c7 int, 
 c8 int, c9 int, c10 int, c11 int, c12 int, c13 int, c14 int, c15 int, c16 int);
@@ -1092,7 +1092,7 @@ t1	CREATE TABLE `t1` (
   KEY `a126_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a127_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a128_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
 flush tables;
 show create table t1;
 Table	Create Table
@@ -1241,7 +1241,7 @@ t1	CREATE TABLE `t1` (
   KEY `a126_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a127_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`),
   KEY `a128_long_123456789_123456789_123456789_123456789_123456789_1234` (`c1`,`c2`,`c3`,`c4`,`c5`,`c6`,`c7`,`c8`,`c9`,`c10`,`c11`,`c12`,`c13`,`c14`,`c15`,`c16`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
 alter table t1 add key 
 a129_long_123456789_123456789_123456789_123456789_123456789_1234 (
 c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16);

From 85a801cb241b321dba83a9a2b9ec6cf79537a299 Mon Sep 17 00:00:00 2001
From: Mohammad Tafzeel Shams <tafzeel.shams@mariadb.com>
Date: Thu, 27 Nov 2025 09:58:22 +0530
Subject: [PATCH 066/119] MDEV-24558: Assertion !index->is_spatial() failed

Issue:
Adding a SPATIAL INDEX triggers a debug assertion failure when the
mysql.innodb_table_stats schema is missing.

Fix:
dict_stats_update_transient_for_index() now exits early with empty
statistics for any index that is not a regular B-tree.
---
 .../innodb_gis/r/create_spatial_index.result  | 17 ++++++----------
 .../innodb_gis/t/create_spatial_index.test    | 20 ++++++++-----------
 storage/innobase/dict/dict0stats.cc           |  1 +
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/mysql-test/suite/innodb_gis/r/create_spatial_index.result b/mysql-test/suite/innodb_gis/r/create_spatial_index.result
index d3c69294c10..d9194713685 100644
--- a/mysql-test/suite/innodb_gis/r/create_spatial_index.result
+++ b/mysql-test/suite/innodb_gis/r/create_spatial_index.result
@@ -1281,18 +1281,13 @@ geometrycollection(point(1,-1)),b
 );
 1
 drop table t1;
-CREATE TABLE t1(c1 POINT NOT NULL);
-DROP TABLE mysql.innodb_table_stats;
+#
+# MDEV-24558 : Assertion !index->is_spatial() failed
+#
+CREATE TABLE t1(c1 POINT NOT NULL) ENGINE=InnoDB;
+RENAME TABLE mysql.innodb_table_stats TO mysql.innodb_table_stats_;
 CALL mtr.add_suppression("InnoDB: Table `mysql`.`innodb_table_stats` not found.");
 CALL mtr.add_suppression("InnoDB: Fetch of persistent statistics requested for table `test`.`t1` but the required system tables mysql.innodb_table_stats and mysql.innodb_index_stats are not present or have unexpected structure. Using transient stats instead.");
 CREATE SPATIAL INDEX idx2 ON t1(c1);
 DROP TABLE t1;
-CREATE TABLE mysql.innodb_table_stats (
-database_name varchar(64) COLLATE utf8_bin NOT NULL,
-table_name varchar(199) COLLATE utf8_bin NOT NULL,
-last_update timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-n_rows bigint(20) unsigned NOT NULL,
-clustered_index_size bigint(20) unsigned NOT NULL,
-sum_of_other_index_sizes bigint(20) unsigned NOT NULL,
-PRIMARY KEY (`database_name`,`table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0;
+RENAME TABLE mysql.innodb_table_stats_ TO mysql.innodb_table_stats;
diff --git a/mysql-test/suite/innodb_gis/t/create_spatial_index.test b/mysql-test/suite/innodb_gis/t/create_spatial_index.test
index 5278292b56c..9adb04ce405 100644
--- a/mysql-test/suite/innodb_gis/t/create_spatial_index.test
+++ b/mysql-test/suite/innodb_gis/t/create_spatial_index.test
@@ -10,6 +10,7 @@
 # Test spatial index with table have no primary key column
 # Test spatial index with table have no auto_increment
 # Test spatial index with check constraint
+# Test spatial index with missing mysql.innodb_table_stats
 # **********************************************************
 --source include/have_innodb.inc
 --source include/have_innodb_16k.inc
@@ -1164,20 +1165,15 @@ select 1 from t1 where st_intersects(
 );
 drop table t1;
 
-# Reproduce case for updating statistic after droping stats info table.
-CREATE TABLE t1(c1 POINT NOT NULL);
-DROP TABLE mysql.innodb_table_stats;
+# Test spatial index with missing mysql.innodb_table_stats
+--echo #
+--echo # MDEV-24558 : Assertion !index->is_spatial() failed
+--echo #
+CREATE TABLE t1(c1 POINT NOT NULL) ENGINE=InnoDB;
+RENAME TABLE mysql.innodb_table_stats TO mysql.innodb_table_stats_;
 CALL mtr.add_suppression("InnoDB: Table `mysql`.`innodb_table_stats` not found.");
 CALL mtr.add_suppression("InnoDB: Fetch of persistent statistics requested for table `test`.`t1` but the required system tables mysql.innodb_table_stats and mysql.innodb_index_stats are not present or have unexpected structure. Using transient stats instead.");
 CREATE SPATIAL INDEX idx2 ON t1(c1);
 
 DROP TABLE t1;
-CREATE TABLE mysql.innodb_table_stats (
-  database_name varchar(64) COLLATE utf8_bin NOT NULL,
-  table_name varchar(199) COLLATE utf8_bin NOT NULL,
-  last_update timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  n_rows bigint(20) unsigned NOT NULL,
-  clustered_index_size bigint(20) unsigned NOT NULL,
-  sum_of_other_index_sizes bigint(20) unsigned NOT NULL,
-  PRIMARY KEY (`database_name`,`table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin STATS_PERSISTENT=0;
+RENAME TABLE mysql.innodb_table_stats_ TO mysql.innodb_table_stats;
diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc
index 49a604ef9f5..b98a975f7ad 100644
--- a/storage/innobase/dict/dict0stats.cc
+++ b/storage/innobase/dict/dict0stats.cc
@@ -1152,6 +1152,7 @@ dummy_empty:
 		goto dummy_empty;
 #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
 	} else if (dict_index_is_online_ddl(index) || !index->is_committed()
+		   || !index->is_btree()
 		   || !index->table->space) {
 		goto dummy_empty;
 	} else {

From 11dc83e06fe59e18c93d50d3d5de4c48347e6ca7 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Mon, 1 Dec 2025 10:40:25 +0200
Subject: [PATCH 067/119] Remove 'auto' from sql_class.cc

This is to make the code more readable.
---
 sql/sql_class.cc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 62d1cb068c3..e9de780adbc 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -90,7 +90,7 @@ char empty_c_string[1]= {0};    /* used for not defined db */
 extern "C" const uchar *get_var_key(const void *entry_, size_t *length,
                                     my_bool)
 {
-  auto entry= static_cast<const user_var_entry *>(entry_);
+  const user_var_entry *entry= static_cast<const user_var_entry *>(entry_);
   *length= entry->name.length;
   return reinterpret_cast<const uchar *>(entry->name.str);
 }
@@ -109,7 +109,7 @@ extern "C" void free_user_var(void *entry_)
 extern "C" const uchar *get_sequence_last_key(const void *entry_,
                                               size_t *length, my_bool)
 {
-  auto *entry= static_cast<const SEQUENCE_LAST_VALUE *>(entry_);
+  const SEQUENCE_LAST_VALUE *entry= static_cast<const SEQUENCE_LAST_VALUE *>(entry_);
   *length= entry->length;
   return entry->key;
 }
@@ -3889,7 +3889,7 @@ bool select_max_min_finder_subselect::cmp_time()
 {
   Item *maxmin= ((Item_singlerow_subselect *)item)->element_index(0);
   THD *thd= current_thd;
-  auto val1= cache->val_time_packed(thd), val2= maxmin->val_time_packed(thd);
+  longlong val1= cache->val_time_packed(thd), val2= maxmin->val_time_packed(thd);
 
   /* Ignore NULLs for ANY and keep them for ALL subqueries */
   if (cache->null_value)
@@ -4163,7 +4163,7 @@ C_MODE_START
 static const uchar *get_statement_id_as_hash_key(const void *record,
                                                  size_t *key_length, my_bool)
 {
-  auto statement= static_cast<const Statement *>(record);
+  const Statement *statement= static_cast<const Statement *>(record);
   *key_length= sizeof(statement->id);
   return reinterpret_cast<const uchar *>(&(statement)->id);
 }
@@ -4176,7 +4176,7 @@ static void delete_statement_as_hash_key(void *key)
 static const uchar *get_stmt_name_hash_key(const void *entry_, size_t *length,
                                            my_bool)
 {
-  auto entry= static_cast<const Statement *>(entry_);
+  const Statement *entry= static_cast<const Statement *>(entry_);
   *length= entry->name.length;
   return reinterpret_cast<const uchar *>(entry->name.str);
 }
@@ -5111,10 +5111,10 @@ void destroy_thd(MYSQL_THD thd)
 extern "C" pthread_key(struct st_my_thread_var *, THR_KEY_mysys);
 MYSQL_THD create_background_thd()
 {
-  auto save_thd = current_thd;
+  THD *save_thd= current_thd;
   set_current_thd(nullptr);
 
-  auto save_mysysvar= pthread_getspecific(THR_KEY_mysys);
+  void *save_mysysvar= pthread_getspecific(THR_KEY_mysys);
 
   /*
     Allocate new mysys_var specifically new THD,
@@ -5122,8 +5122,8 @@ MYSQL_THD create_background_thd()
   */
   pthread_setspecific(THR_KEY_mysys, 0);
   my_thread_init();
-  auto thd_mysysvar= pthread_getspecific(THR_KEY_mysys);
-  auto thd= new THD(0);
+  void *thd_mysysvar= pthread_getspecific(THR_KEY_mysys);
+  THD *thd= new THD(0);
   pthread_setspecific(THR_KEY_mysys, save_mysysvar);
   thd->set_psi(nullptr);
   set_current_thd(save_thd);
@@ -5160,7 +5160,7 @@ void *thd_attach_thd(MYSQL_THD thd)
   DBUG_ASSERT(!current_thd);
   DBUG_ASSERT(thd && thd->mysys_var);
 
-  auto save_mysysvar= pthread_getspecific(THR_KEY_mysys);
+  void *save_mysysvar= pthread_getspecific(THR_KEY_mysys);
   pthread_setspecific(THR_KEY_mysys, thd->mysys_var);
   thd->store_globals();
   return save_mysysvar;
@@ -5185,8 +5185,8 @@ void thd_detach_thd(void *mysysvar)
 void destroy_background_thd(MYSQL_THD thd)
 {
   DBUG_ASSERT(!current_thd);
-  auto thd_mysys_var= thd->mysys_var;
-  auto save_mysys_var= thd_attach_thd(thd);
+  struct st_my_thread_var *thd_mysys_var= thd->mysys_var;
+  void *save_mysys_var= thd_attach_thd(thd);
   DBUG_ASSERT(thd_mysys_var != save_mysys_var);
   /*
     Workaround the adverse effect decrementing thread_count on THD()
@@ -5205,7 +5205,7 @@ void destroy_background_thd(MYSQL_THD thd)
      would kill it, if we're not careful.
   */
 #ifdef HAVE_PSI_THREAD_INTERFACE
-  auto save_psi_thread= PSI_CALL_get_thread();
+  PSI_thread *save_psi_thread= PSI_CALL_get_thread();
 #endif
   PSI_CALL_set_thread(0);
   pthread_setspecific(THR_KEY_mysys, thd_mysys_var);
@@ -6364,7 +6364,7 @@ start_new_trans::start_new_trans(THD *thd)
   mdl_savepoint= thd->mdl_context.mdl_savepoint();
   memcpy(old_ha_data, thd->ha_data, sizeof(old_ha_data));
   thd->reset_n_backup_open_tables_state(&open_tables_state_backup);
-  for (auto &data : thd->ha_data)
+  for (Ha_data &data : thd->ha_data)
     data.reset();
   old_transaction= thd->transaction;
   thd->transaction= &new_transaction;

From eedee458857aaf2889461fdac398883a11c2f380 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Mon, 1 Dec 2025 11:19:17 +0200
Subject: [PATCH 068/119] MDEV-23132 Assertion `trn->locked_tables == 0 &&
 trn->used_instances == 0' failed in trnman_end_trn

The reason for the crash was that two tables where updating Aria's
TRN->used_instances at the same time.  This could happen when a
thread started a sub transaction with Aria tables, like reading a
stored procedure from the proc table, at the same time another table
was clearing the table list after committing a transaction involving
Aria tables.  The timing window for this to happen is very small,
which is why we did not notice this issue for 5 years.

The fix was to change reset_thd_trn() to clear the table links directly,
instead of calling _ma_reset_trn_for_table() which removed the table
from the linked list, which included updating TRN->used_instances.

This bug could happen when maria_commit or maria_rollback() where
called but not in ha_maria::implicit_commit() which had already
a fix for this problem.

Other things:
- Removed duplicate call to thd_set_ha_data(thd, maria_hton, trn)
  in ha_maria::implicit_commit() and maria_commit() when TRN is null.
---
 storage/maria/ha_maria.cc | 25 ++++++++++++++++++++-----
 storage/maria/ma_trnman.h | 12 ++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
index 28e5fd970db..5035b714cae 100644
--- a/storage/maria/ha_maria.cc
+++ b/storage/maria/ha_maria.cc
@@ -3028,17 +3028,23 @@ int ha_maria::start_stmt(THD *thd, thr_lock_type lock_type)
   Reset THD_TRN and all file->trn related to the transaction
   This is needed as some calls, like extra() or external_lock() may access
   it before next transaction is started
+  Note that trn for the table is already freed and may be reused by another
+  thread.
 */
 
 static void reset_thd_trn(THD *thd, MARIA_HA *first_table)
 {
+  MARIA_HA *next;
+  TRN *trn __attribute__((unused)) = first_table ? first_table->trn : 0;
   DBUG_ENTER("reset_thd_trn");
   thd_set_ha_data(thd, maria_hton, 0);
-  MARIA_HA *next;
   for (MARIA_HA *table= first_table; table ; table= next)
   {
+    DBUG_ASSERT(table->trn == trn);
     next= table->trn_next;
-    _ma_reset_trn_for_table(table);
+    table->trn_prev= 0;
+    table->trn_next= 0;
+    table->trn= 0;
 
     /*
       If table has changed by this statement, invalidate it from the query
@@ -3121,13 +3127,15 @@ int ha_maria::implicit_commit(THD *thd, bool new_trn)
     statement assuming they have a trn (see ha_maria::start_stmt()).
   */
   trn= trnman_new_trn(& thd->transaction->wt);
-  thd_set_ha_data(thd, maria_hton, trn);
   if (unlikely(trn == NULL))
   {
-    reset_thd_trn(thd, used_tables);
+    reset_thd_trn(thd, used_tables);            // Calls thd_set_ha_data()
     error= HA_ERR_OUT_OF_MEM;
     goto end;
   }
+  else
+    thd_set_ha_data(thd, maria_hton, trn);
+
   /*
     Move all locked tables to the new transaction
     We must do it here as otherwise file->thd and file->state may be
@@ -3142,6 +3150,14 @@ int ha_maria::implicit_commit(THD *thd, bool new_trn)
     trn_next= handler->trn_next;
     DBUG_ASSERT(handler->s->base.born_transactional);
 
+    /*
+      We reset the link to the old trn to avoid the asserts
+      in _ma_set_trn_for_table()
+    */
+    handler->trn_next= 0;
+    handler->trn_prev= 0;
+    handler->trn= 0;
+
     /* If handler uses versioning */
     if (handler->s->lock_key_trees)
     {
@@ -3569,7 +3585,6 @@ static int maria_commit(handlerton *hton __attribute__ ((unused)),
   if (ma_commit(trn))
     res= HA_ERR_COMMIT_ERROR;
   reset_thd_trn(thd, used_instances);
-  thd_set_ha_data(thd, maria_hton, 0);
   DBUG_RETURN(res);
 }
 
diff --git a/storage/maria/ma_trnman.h b/storage/maria/ma_trnman.h
index c863eac5bdc..4a73dcda680 100644
--- a/storage/maria/ma_trnman.h
+++ b/storage/maria/ma_trnman.h
@@ -31,6 +31,10 @@ static inline void _ma_set_trn_for_table(MARIA_HA *tbl, TRN *newtrn)
 
   /* check that we are not calling this twice in a row */
   DBUG_ASSERT(newtrn->used_instances != (void*) tbl);
+  DBUG_ASSERT(newtrn != &dummy_transaction_object);
+  DBUG_ASSERT(tbl->trn == 0);
+  DBUG_ASSERT(tbl->trn_next == 0);
+  DBUG_ASSERT(tbl->trn_prev == 0);
 
   tbl->trn= newtrn;
   /* Link into used list */
@@ -63,17 +67,25 @@ static inline void _ma_set_tmp_trn_for_table(MARIA_HA *tbl, TRN *newtrn)
 
 static inline void _ma_reset_trn_for_table(MARIA_HA *tbl)
 {
+  TRN *trn __attribute__((unused))= tbl->trn;
   DBUG_PRINT("info",("table: %p  trn: %p -> NULL", tbl, tbl->trn));
 
   /* The following is only false if tbl->trn == &dummy_transaction_object */
   if (tbl->trn_prev)
   {
     if (tbl->trn_next)
+    {
+      DBUG_ASSERT(tbl->trn_next->trn == trn);
       tbl->trn_next->trn_prev= tbl->trn_prev;
+    }
     *tbl->trn_prev= tbl->trn_next;
     tbl->trn_prev= 0;
     tbl->trn_next= 0;
   }
+  else
+  {
+    DBUG_ASSERT(tbl->trn_next == 0);
+  }
   tbl->trn= 0;
 }
 

From 080d92a6217a757300b629360cacf625f3c7ea60 Mon Sep 17 00:00:00 2001
From: Pekka Lampio <pekka.lampio@galeracluster.com>
Date: Thu, 27 Nov 2025 16:38:11 +0200
Subject: [PATCH 069/119] MDEV-31517 Wrong variable name in the configuration
 leads Galera to            think SST/IST failed, at next restart will request
 a full SST

This patch fixes an unwanted behavior of a Galera cluster node when
Server startup fails because of an error in configuration file: after
the failure full SST is requested at the next Server startup even
though full SST is not needed (MDEV-31517).

If Server startup fails because of a configuration error, this patch
ensures that Galera state of the failing node remains unchanged. This
avoids full SST at the next Server restart.

This fix consists of three patches for the following components:

1) Server,
2) WSREP library,
3) Galera.
---
 .../suite/galera/r/galera_mdev_31517.result   |  24 ++++
 .../suite/galera/t/galera_mdev_31517.test     | 132 ++++++++++++++++++
 sql/mysqld.cc                                 |   8 +-
 wsrep-lib                                     |   2 +-
 4 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100644 mysql-test/suite/galera/r/galera_mdev_31517.result
 create mode 100644 mysql-test/suite/galera/t/galera_mdev_31517.test

diff --git a/mysql-test/suite/galera/r/galera_mdev_31517.result b/mysql-test/suite/galera/r/galera_mdev_31517.result
new file mode 100644
index 00000000000..efb3f985622
--- /dev/null
+++ b/mysql-test/suite/galera/r/galera_mdev_31517.result
@@ -0,0 +1,24 @@
+connection node_2;
+connection node_1;
+connection node_2;
+CALL mtr.add_suppression("unknown variable 'non_existing_variable=ON'");
+CALL mtr.add_suppression("Aborting");
+CALL mtr.add_suppression("sst_received failed: State wait was interrupted");
+CALL mtr.add_suppression("State transfer interrupted, shutting down gracefully");
+connection node_1;
+CREATE TABLE t(i INT NOT NULL PRIMARY KEY) ENGINE INNODB;
+INSERT INTO t VALUES(1);
+connection node_2;
+connection node_1;
+connection node_2;
+connection node_1;
+connection node_2;
+connection node_1;
+connection node_2;
+Starting server ...
+Starting server ...
+SET GLOBAL wsrep_mode = DEFAULT;
+connection node_1;
+DROP TABLE t;
+disconnect node_2;
+disconnect node_1;
diff --git a/mysql-test/suite/galera/t/galera_mdev_31517.test b/mysql-test/suite/galera/t/galera_mdev_31517.test
new file mode 100644
index 00000000000..39ceb2db5a1
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_mdev_31517.test
@@ -0,0 +1,132 @@
+#
+# Test for MDEV-31517: Wrong variable name in the configuration leads
+# Galera to think SST/IST failed, at next restart will request a full
+# SST.
+#
+# To reproduce:
+#
+#     1. Start Galera cluster
+#     2. Stop a Node
+#     3. Start the node
+#     4. Stop a Node
+#     5. Add non_existing_variable=ON in the config
+#     6. Start the node, this will fail
+#     7  Remove non_existing_variable=ON from the config file
+#     8  Restart the server
+#     9. Observe a full SST happening
+#
+# This test checks that an IST takes place at Step 9 instead of a full SST.
+
+# Step 1: Start Galera cluster
+--source include/galera_cluster.inc
+--source include/have_mariabackup.inc
+--echo # Make sure that the test is operating on the right version of galera library.
+--let $galera_version=26.4.25
+source ../wsrep/include/check_galera_version.inc;
+
+# Suppress expected errors and warnings:
+--connection node_2
+CALL mtr.add_suppression("unknown variable 'non_existing_variable=ON'");
+CALL mtr.add_suppression("Aborting");
+CALL mtr.add_suppression("sst_received failed: State wait was interrupted");
+CALL mtr.add_suppression("State transfer interrupted, shutting down gracefully");
+
+# Count the number of "SST completed" messages in the log file before
+# and after testing. To do this we need to save original log file
+# before testing:
+#
+--let TEST_LOG=$MYSQLTEST_VARDIR/log/mysqld.2.err
+--perl
+   use strict;
+   my $test_log=$ENV{'TEST_LOG'} or die "TEST_LOG not set";
+   my $test_log_copy=$test_log . '.copy';
+   if (-e $test_log_copy) {
+      unlink $test_log_copy;
+   }
+EOF
+--copy_file $TEST_LOG $TEST_LOG.copy
+
+--connection node_1
+CREATE TABLE t(i INT NOT NULL PRIMARY KEY) ENGINE INNODB;
+INSERT INTO t VALUES(1);
+
+# Step 2: Stop node 2
+--connection node_2
+--source include/shutdown_mysqld.inc
+
+--connection node_1
+--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+
+# Step 3: Start node 2
+--connection node_2
+--source include/start_mysqld.inc
+
+--connection node_1
+--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+
+# Step 4: Stop node 2
+--connection node_2
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+--source include/shutdown_mysqld.inc
+
+--connection node_1
+--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+
+# Step 5: Add non_existing_variable=ON in the config
+--exec cp  $MYSQLTEST_VARDIR/my.cnf $MYSQLTEST_VARDIR/my.cnf-orig
+--exec echo '[mysqld.2]' >> $MYSQLTEST_VARDIR/my.cnf
+--exec echo 'non_existing_variable=ON' >> $MYSQLTEST_VARDIR/my.cnf
+
+# Step 6: start the stopped node, this will fail
+--connection node_2
+--exec cp -p $MYSQLD_DATADIR/grastate.dat $MYSQLD_DATADIR/grastate.dat_before
+--echo Starting server ...
+--error 1
+--exec $MYSQLD --defaults-group-suffix=.2 --defaults-file=$MYSQLTEST_VARDIR/my.cnf | grep 'non_existing_variable'
+--exec cp -p $MYSQLD_DATADIR/grastate.dat $MYSQLD_DATADIR/grastate.dat_after
+
+# Step 7: remove the wrong variable in the config file
+--exec cp  $MYSQLTEST_VARDIR/my.cnf-orig $MYSQLTEST_VARDIR/my.cnf
+
+# Step 8: Start the node
+--echo Starting server ...
+let $restart_noprint=2;
+--source include/start_mysqld.inc
+
+--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+--source include/wait_condition.inc
+
+--let $wait_condition = SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_ready';
+--source include/wait_condition.inc
+
+# cleanup
+SET GLOBAL wsrep_mode = DEFAULT;
+
+--connection node_1
+DROP TABLE t;
+
+# Count the number of "SST completed" messages in the log file during
+# test phase - to print the error message if the number of such
+# messages in log file increased at the end of the test:
+#
+--perl
+   use strict;
+   my $test_log=$ENV{'TEST_LOG'} or die "TEST_LOG not set";
+   my $test_log_copy=$test_log . '.copy';
+   open(FILE, $test_log_copy) or die("Unable to open $test_log_copy: $!\n");
+   my $initial=grep(/SST completed/gi,<FILE>);
+   close(FILE);
+   open(FILE, $test_log) or die("Unable to open $test_log: $!\n");
+   my $final=grep(/SST completed/gi,<FILE>);
+   close(FILE);
+   if ($final != $initial) {
+      my $diff=$final-$initial;
+      print("Full WSREP SST performed $diff times.\n");
+   }
+EOF
+--remove_file $TEST_LOG.copy
+
+--source include/galera_end.inc
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index f7e0100d6bf..0d8008d2df5 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5361,8 +5361,14 @@ static int init_server_components()
 #endif
 
     if ((ho_error= handle_options(&remaining_argc, &remaining_argv, removed_opts,
-                                  mysqld_get_one_option)))
+                                  mysqld_get_one_option))) {
+#ifdef WITH_WSREP
+      Wsrep_server_state::instance().disable_node_reset();
+#endif
+
       unireg_abort(ho_error);
+    }
+
     /* Add back the program name handle_options removes */
     remaining_argc++;
     remaining_argv--;
diff --git a/wsrep-lib b/wsrep-lib
index 14ce8cab76e..7010f0ab584 160000
--- a/wsrep-lib
+++ b/wsrep-lib
@@ -1 +1 @@
-Subproject commit 14ce8cab76e9388f7266b91b163a62c654b1d329
+Subproject commit 7010f0ab584ab9cdebb285272a0fb0ff0a5a791d

From 4cff562f3f89d4df03e09233d835d0451bc37cc4 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <sergey@mariadb.com>
Date: Fri, 21 Nov 2025 13:17:19 +0200
Subject: [PATCH 070/119] MDEV-38164: Fix the estimates reported by
 TABLE::key_storage_length()

They were based on the maximum possible key tuple length, which can be
much larger than the real data size.

The return value is used by handler::keyread_time(), which is used
to estimate the cost of range access.
This could cause range access not to be picked, even if it uses
the clustered PK and reads about 8% of the table.

The fix is to add KEY::stat_storage_length (next to KEY::rec_per_key) and
have the storage engine fill it in handler::info(HA_STATUS_CONST).

Currently, only InnoDB fills this based on its internal statistics:
index->stat_index_size and ib_table->stat_n_rows.

Also changed:
- In handler::calculate_costs(), use ha_keyread_clustered_time() when
  computing clustered PK read cost, not ha_keyread_time().

The fix is OFF by default and enabled by setting FIX_INDEX_LOOKUP_COST flag
in @@new_mode.
---
 mysql-test/main/mysqld--help.result           |  2 +-
 mysql-test/main/optimizer_costs_innodb.result | 42 ++++++++++++++++++
 mysql-test/main/optimizer_costs_innodb.test   | 44 +++++++++++++++++++
 mysql-test/suite/sys_vars/r/new_mode.result   |  2 +-
 .../sys_vars/r/sysvars_server_embedded.result |  2 +-
 .../r/sysvars_server_notembedded.result       |  2 +-
 sql/multi_range_read.cc                       | 22 +++++++---
 sql/sql_class.h                               |  3 +-
 sql/sql_select.cc                             |  3 ++
 sql/structs.h                                 |  6 +++
 sql/sys_vars.cc                               |  5 ++-
 sql/table.cc                                  | 15 +++++++
 sql/table.h                                   | 15 ++++++-
 storage/innobase/handler/ha_innodb.cc         | 22 ++++++++++
 14 files changed, 170 insertions(+), 15 deletions(-)
 create mode 100644 mysql-test/main/optimizer_costs_innodb.result
 create mode 100644 mysql-test/main/optimizer_costs_innodb.test

diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index f9ed13e1e17..7d8e9c08e28 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -744,7 +744,7 @@ The following specify which files/extra groups are read (specified before remain
  connection before aborting the write
  --new-mode=name     Used to introduce new behavior to existing MariaDB
  versions. Any combination of: 
- FIX_INDEX_STATS_FOR_ALL_NULLS
+ FIX_INDEX_STATS_FOR_ALL_NULLS, FIX_INDEX_LOOKUP_COST
  Use 'ALL' to set all combinations.
  --note-verbosity=name 
  Verbosity level for note-warnings given to the user. See
diff --git a/mysql-test/main/optimizer_costs_innodb.result b/mysql-test/main/optimizer_costs_innodb.result
new file mode 100644
index 00000000000..0e79f9996b1
--- /dev/null
+++ b/mysql-test/main/optimizer_costs_innodb.result
@@ -0,0 +1,42 @@
+#
+# MDEV-38164: Poor cost calculations for index access cause bad query plans for big VARCHARs in 11.x
+#
+create table t1 (
+pk1 int not null,
+pk2 int not null,
+filler1 varchar(500),
+filler2 varchar(500),
+filler3 varchar(500),
+filler4 varchar(500),
+filler5 varchar(500),
+filler6 varchar(500),
+filler7 varchar(500),
+filler8 varchar(500),
+filler9 varchar(500),
+fillerA varchar(500),
+fillerB varchar(500),
+fillerC varchar(500),
+fillerD varchar(500),
+fillerE varchar(500),
+fillerF varchar(500),
+primary key(pk1, pk2)
+) collate utf8mb4_general_ci engine=innodb;
+insert into t1 (pk1, pk2) select
+mod(seq, 8), seq
+from
+seq_1_to_10000;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	OK
+# Before the fix: this will use full table scan:
+explain select * from t1 where pk1=1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	#	10000	Using where
+set @save_new_mode=@@new_mode;
+set new_mode=concat(@@new_mode,'FIX_INDEX_LOOKUP_COST');
+explain select * from t1 where pk1=1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ref	PRIMARY	PRIMARY	4	#	1250	
+set new_mode=@save_new_mode;
+drop table t1;
diff --git a/mysql-test/main/optimizer_costs_innodb.test b/mysql-test/main/optimizer_costs_innodb.test
new file mode 100644
index 00000000000..330f1157f65
--- /dev/null
+++ b/mysql-test/main/optimizer_costs_innodb.test
@@ -0,0 +1,44 @@
+--source include/have_innodb.inc
+--source include/have_sequence.inc
+
+--echo #
+--echo # MDEV-38164: Poor cost calculations for index access cause bad query plans for big VARCHARs in 11.x
+--echo #
+create table t1 (
+  pk1 int not null,
+  pk2 int not null,
+  filler1 varchar(500),
+  filler2 varchar(500),
+  filler3 varchar(500),
+  filler4 varchar(500),
+  filler5 varchar(500),
+  filler6 varchar(500),
+  filler7 varchar(500),
+  filler8 varchar(500),
+  filler9 varchar(500),
+  fillerA varchar(500),
+  fillerB varchar(500),
+  fillerC varchar(500),
+  fillerD varchar(500),
+  fillerE varchar(500),
+  fillerF varchar(500),
+  primary key(pk1, pk2)
+) collate utf8mb4_general_ci engine=innodb;
+
+insert into t1 (pk1, pk2) select
+  mod(seq, 8), seq
+from
+  seq_1_to_10000;
+analyze table t1;
+
+--echo # Before the fix: this will use full table scan:
+--replace_column 8 #
+explain select * from t1 where pk1=1;
+
+set @save_new_mode=@@new_mode;
+set new_mode=concat(@@new_mode,'FIX_INDEX_LOOKUP_COST');
+--replace_column 8 #
+explain select * from t1 where pk1=1;
+
+set new_mode=@save_new_mode;
+drop table t1;
diff --git a/mysql-test/suite/sys_vars/r/new_mode.result b/mysql-test/suite/sys_vars/r/new_mode.result
index d078537a1e1..eeec6544e53 100644
--- a/mysql-test/suite/sys_vars/r/new_mode.result
+++ b/mysql-test/suite/sys_vars/r/new_mode.result
@@ -25,7 +25,7 @@ ERROR 42000: Variable 'new_mode' can't be set to the value of 'TEST_WARNING3'
 SET @@session.new_mode = "ALL";
 select @@session.new_mode;
 @@session.new_mode
-FIX_INDEX_STATS_FOR_ALL_NULLS
+FIX_INDEX_STATS_FOR_ALL_NULLS,FIX_INDEX_LOOKUP_COST
 SET @@global.new_mode = NULL;
 ERROR 42000: Variable 'new_mode' can't be set to the value of 'NULL'
 SET @@global.new_mode = '';
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
index 34c01434f40..cf27b7294b4 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -2319,7 +2319,7 @@ VARIABLE_COMMENT	Used to introduce new behavior to existing MariaDB versions
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	FIX_INDEX_STATS_FOR_ALL_NULLS
+ENUM_VALUE_LIST	FIX_INDEX_STATS_FOR_ALL_NULLS,FIX_INDEX_LOOKUP_COST
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	NOTE_VERBOSITY
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index c898835003e..3a3ea304d71 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -2529,7 +2529,7 @@ VARIABLE_COMMENT	Used to introduce new behavior to existing MariaDB versions
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
-ENUM_VALUE_LIST	FIX_INDEX_STATS_FOR_ALL_NULLS
+ENUM_VALUE_LIST	FIX_INDEX_STATS_FOR_ALL_NULLS,FIX_INDEX_LOOKUP_COST
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	NOTE_VERBOSITY
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc
index 71143965162..d0f85e572a1 100644
--- a/sql/multi_range_read.cc
+++ b/sql/multi_range_read.cc
@@ -75,9 +75,19 @@ void handler::calculate_costs(Cost_estimate *cost, uint keyno,
   {
     /* Clustered index */
     io_blocks= unassigned_single_point_ranges;
-    cost->index_cost= ha_keyread_time(keyno, n_ranges,
-                                      total_rows + multi_row_ranges,
-                                      io_blocks);
+    if (TEST_NEW_MODE_FLAG(table->in_use, NEW_MODE_FIX_INDEX_LOOKUP_COST))
+    {
+      cost->index_cost=
+        ha_keyread_clustered_time(keyno, n_ranges,
+                                  total_rows + multi_row_ranges,
+                                  io_blocks);
+    }
+    else
+    {
+      cost->index_cost= ha_keyread_time(keyno, n_ranges,
+                                        total_rows + multi_row_ranges,
+                                        io_blocks);
+    }
     cost->copy_cost=  rows2double(total_rows) * ROW_COPY_COST;
   }
   /* Adjust io cost to data size */
@@ -178,11 +188,9 @@ handler::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq,
   */
   ulonglong unassigned_single_point_ranges= 0;
 
-  uint len= table->key_info[keyno].key_length + table->file->ref_length;
-  if (table->file->is_clustering_key(keyno))
-    len= table->s->stored_rec_length;
+  size_t len= table->key_storage_length(keyno);
   /* Assume block is 75 % full */
-  uint avg_block_records= ((uint) (stats.block_size*3/4))/len + 1;
+  size_t avg_block_records= ((uint) (stats.block_size*3/4))/len + 1;
   uint limit= thd->variables.eq_range_index_dive_limit;
   bool use_statistics_for_eq_range= eq_ranges_exceeds_limit(seq,
                                                             seq_init_param,
diff --git a/sql/sql_class.h b/sql/sql_class.h
index a255f952885..066064d2ef5 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -220,7 +220,8 @@ void old_mode_deprecated_warnings(THD *thd, ulonglong v);
 */
 
 #define NEW_MODE_FIX_INDEX_STATS_FOR_ALL_NULLS                      (1ULL << 0)
-#define NEW_MODE_MAX                                                         1
+#define NEW_MODE_FIX_INDEX_LOOKUP_COST                              (1ULL << 1)
+#define NEW_MODE_MAX                                                2
 
 /* Definitions above that have transitioned from new behaviour to default */
 
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index c97241d2b75..8e693ea1734 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -13486,6 +13486,7 @@ static bool create_hj_key_for_table(JOIN *join, JOIN_TAB *join_tab,
   keyinfo->flags= HA_GENERATED_KEY;
   keyinfo->is_statistics_from_stat_tables= FALSE;
   keyinfo->all_nulls_key_parts= 0;
+  keyinfo->stat_storage_length= 0;
   keyinfo->name.str= "$hj";
   keyinfo->name.length= 3;
   keyinfo->rec_per_key= (ulong*) thd->calloc(sizeof(ulong)*key_parts);
@@ -22482,6 +22483,7 @@ bool Create_tmp_table::finalize(THD *thd,
     keyinfo->algorithm= HA_KEY_ALG_UNDEF;
     keyinfo->is_statistics_from_stat_tables= FALSE;
     keyinfo->all_nulls_key_parts= 0;
+    keyinfo->stat_storage_length= 0;
     keyinfo->name= group_key;
     keyinfo->comment.str= 0;
     ORDER *cur_group= m_group;
@@ -22604,6 +22606,7 @@ bool Create_tmp_table::finalize(THD *thd,
     keyinfo->algorithm= HA_KEY_ALG_UNDEF;
     keyinfo->is_statistics_from_stat_tables= FALSE;
     keyinfo->all_nulls_key_parts= 0;
+    keyinfo->stat_storage_length= 0;
     keyinfo->read_stats= NULL;
     keyinfo->collected_stats= NULL;
 
diff --git a/sql/structs.h b/sql/structs.h
index d81666e256e..cad3763b89b 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -154,6 +154,12 @@ typedef struct st_key {
   */
   ulong *rec_per_key;
 
+  /*
+    Average space index tuple takes on disk, according to the engine's
+    statistics. 0 if statistics is not available.
+  */
+  size_t stat_storage_length;
+
   /*
     This structure is used for statistical data on the index
     that has been read from the statistical table index_stat
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 3d565b01000..96621793567 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -4056,6 +4056,7 @@ static Sys_var_set Sys_old_behavior(
 static const char *new_mode_all_names[]=
 {
   "FIX_INDEX_STATS_FOR_ALL_NULLS",
+  "FIX_INDEX_LOOKUP_COST",
   "TEST_WARNING1",                       // Default from here, See NEW_MODE_MAX
   "TEST_WARNING2",
   0
@@ -4063,8 +4064,8 @@ static const char *new_mode_all_names[]=
 
 static int new_mode_hidden_names[] =
 {
-  1,  // TEST_WARNING1
-  2,  // TEST_WARNING2
+  2,  // TEST_WARNING1
+  3,  // TEST_WARNING2
   -1  // End of list
 };
 
diff --git a/sql/table.cc b/sql/table.cc
index ff311a87572..3c0a6108bcd 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -8643,6 +8643,7 @@ bool TABLE::add_tmp_key(uint key, uint key_parts,
   keyinfo->read_stats= NULL;
   keyinfo->collected_stats= NULL;
   keyinfo->all_nulls_key_parts= 0;
+  keyinfo->stat_storage_length= 0;
 
   for (i= 0; i < key_parts; i++)
   {
@@ -10932,3 +10933,17 @@ void TABLE::mark_table_for_reopen()
   DBUG_ASSERT(thd);
   thd->locked_tables_list.mark_table_for_reopen(this);
 }
+
+/*
+  @brief
+    Estimate how much space is required to store one index tuple
+*/
+size_t TABLE::key_storage_length(uint index)
+{
+  /* Use storage engine's statistics if it is available */
+  if (TEST_NEW_MODE_FLAG(in_use, NEW_MODE_FIX_INDEX_LOOKUP_COST) &&
+      key_info[index].stat_storage_length)
+    return key_info[index].stat_storage_length;
+
+  return key_storage_length_from_ddl(index);
+}
diff --git a/sql/table.h b/sql/table.h
index 84749b5a1f8..81278b1dcce 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -1756,7 +1756,20 @@ public:
   uint actual_n_key_parts(KEY *keyinfo);
   ulong actual_key_flags(KEY *keyinfo);
   int update_virtual_field(Field *vf, bool ignore_warnings);
-  inline size_t key_storage_length(uint index)
+
+  size_t key_storage_length(uint index);
+  /*
+    @brief
+      Estimate how index tuple takes in storage, based solely on table's DDL
+
+    @detail
+      This is a conservative number that assumes the value is stored in
+      KeyTupleFormat (or table->record format for clustered PK), without
+      endspace compression, etc.
+      On the other hand, it doesn't account that the storage engine may need
+      to store transactionIds, etc.
+  */
+  inline size_t key_storage_length_from_ddl(uint index)
   {
     if (is_clustering_key(index))
       return s->stored_rec_length;
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 5a875595479..6f11349d878 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -15003,6 +15003,28 @@ stats_fetch:
 			}
 
 			KEY*	key = &table->key_info[i];
+			/*
+			  Provide statistics about how many bytes an index record takes on disk,
+			  on average.
+			*/
+			if (ib_table->stat_n_rows && !(key->flags & (HA_FULLTEXT | HA_SPATIAL))) {
+				/*
+				  Start with total space used by the index divided by number of rows
+				*/
+				key->stat_storage_length = (size_t) ((index->stat_index_size * srv_page_size) /
+					ib_table->stat_n_rows);
+
+				/*
+					The above can be too large
+					A) in case of tables with very few rows
+					B) in case of indexes with partially full pages.
+					So, clip the above estimate by a conservative estimate we've used
+					before:
+				*/
+				size_t conservative_estimate = table->key_storage_length_from_ddl(i);
+				if (key->stat_storage_length > conservative_estimate)
+					key->stat_storage_length = conservative_estimate;
+			}
 
 			for (j = 0; j < key->ext_key_parts; j++) {
 

From 8647354f6b36e019c1d768e682f26f0754aa8fef Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <sergey@mariadb.com>
Date: Fri, 21 Nov 2025 13:17:19 +0200
Subject: [PATCH 071/119] MDEV-38164: Fix the estimates reported by
 TABLE::key_storage_length()

(Cherry-pick into 12.2: the fix is enabled by default,
 control via @@new_mode=FIX_INDEX_LOOKUP_COST is removed)

They were based on the maximum possible length key length, which
can be much larger than the actual data.

The return value is used by handler::keyread_time(), which is used
to estimate the cost of range access.
This could cause range access not to be picked, even if it uses
the clustered PK and reads about 8% of the table.

The fix is to add KEY::stat_storage_length (next to KEY::rec_per_key) and
have the storage engine fill it in handler::info(HA_STATUS_CONST).

Currently, only InnoDB fills this based on its internal statistics:
index->stat_index_size and ib_table->stat_n_rows.

Also changed:
- In handler::calculate_costs(), use ha_keyread_clustered_time() when
  computing clustered PK read cost, not ha_keyread_time().
---
 mysql-test/main/index_intersect_innodb.result |  2 +-
 mysql-test/main/innodb_ext_key,off.rdiff      |  8 ++--
 .../main/opt_trace_index_merge_innodb.result  |  5 +--
 mysql-test/main/optimizer_costs_innodb.result | 36 ++++++++++++++++++
 mysql-test/main/optimizer_costs_innodb.test   | 38 +++++++++++++++++++
 .../main/order_by_optimizer_innodb.result     |  4 +-
 .../main/order_by_optimizer_innodb.test       |  2 +
 .../selectivity_innodb_notembedded.result     |  4 +-
 sql/multi_range_read.cc                       | 13 +++----
 sql/sql_class.h                               |  2 +-
 sql/sql_select.cc                             |  3 ++
 sql/structs.h                                 |  6 +++
 sql/sys_vars.cc                               |  6 ++-
 sql/table.cc                                  | 14 +++++++
 sql/table.h                                   | 15 +++++++-
 storage/innobase/handler/ha_innodb.cc         | 24 ++++++++++++
 16 files changed, 160 insertions(+), 22 deletions(-)
 create mode 100644 mysql-test/main/optimizer_costs_innodb.result
 create mode 100644 mysql-test/main/optimizer_costs_innodb.test

diff --git a/mysql-test/main/index_intersect_innodb.result b/mysql-test/main/index_intersect_innodb.result
index 9ce05a97b90..3b7a0dfbccd 100644
--- a/mysql-test/main/index_intersect_innodb.result
+++ b/mysql-test/main/index_intersect_innodb.result
@@ -485,7 +485,7 @@ SELECT * FROM City
 WHERE ID BETWEEN 3701 AND 4000 AND Population > 1000000
 AND Country BETWEEN 'S' AND 'Z';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	City	index_merge	PRIMARY,Population,Country	PRIMARY,Population	4,4	NULL	#	Using sort_intersect(PRIMARY,Population); Using where
+1	SIMPLE	City	range	PRIMARY,Population,Country	PRIMARY	4	NULL	#	Using where
 EXPLAIN
 SELECT * FROM City 
 WHERE ID BETWEEN 3001 AND 4000 AND Population > 600000
diff --git a/mysql-test/main/innodb_ext_key,off.rdiff b/mysql-test/main/innodb_ext_key,off.rdiff
index 8b24cc9a663..4db9110f049 100644
--- a/mysql-test/main/innodb_ext_key,off.rdiff
+++ b/mysql-test/main/innodb_ext_key,off.rdiff
@@ -5,7 +5,7 @@
  select count(*) from lineitem where l_orderkey=130 and l_shipdate='1992-07-01';
  id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 -1	SIMPLE	lineitem	ref	PRIMARY,i_l_shipdate,i_l_orderkey,i_l_orderkey_quantity	i_l_shipdate	8	const,const	1	Using index
-+1	SIMPLE	lineitem	ref	PRIMARY,i_l_shipdate,i_l_orderkey,i_l_orderkey_quantity	i_l_shipdate	4	const	6	Using where; Using index
++1	SIMPLE	lineitem	ref	PRIMARY,i_l_shipdate,i_l_orderkey,i_l_orderkey_quantity	PRIMARY	4	const	5	Using where
  flush status;
  select count(*) from lineitem where l_orderkey=130 and l_shipdate='1992-07-01';
  count(*)
@@ -14,7 +14,7 @@
  Handler_read_key	1
  Handler_read_last	0
 -Handler_read_next	1
-+Handler_read_next	6
++Handler_read_next	5
  Handler_read_prev	0
  Handler_read_retry	0
  Handler_read_rnd	0
@@ -95,7 +95,7 @@
  where l_shipdate='1992-07-01' and l_orderkey=130;
  id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 -1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
-+1	SIMPLE	lineitem	ref	PRIMARY,i_l_shipdate,i_l_orderkey,i_l_orderkey_quantity	i_l_shipdate	4	const	6	Using where; Using index
++1	SIMPLE	lineitem	ref	PRIMARY,i_l_shipdate,i_l_orderkey,i_l_orderkey_quantity	PRIMARY	4	const	5	Using where
  flush status;
  select max(l_linenumber) from lineitem 
  where l_shipdate='1992-07-01' and l_orderkey=130;
@@ -104,7 +104,7 @@
  Handler_read_key	1
  Handler_read_last	0
 -Handler_read_next	0
-+Handler_read_next	6
++Handler_read_next	5
  Handler_read_prev	0
  Handler_read_retry	0
  Handler_read_rnd	0
diff --git a/mysql-test/main/opt_trace_index_merge_innodb.result b/mysql-test/main/opt_trace_index_merge_innodb.result
index c213adca700..61d38f44709 100644
--- a/mysql-test/main/opt_trace_index_merge_innodb.result
+++ b/mysql-test/main/opt_trace_index_merge_innodb.result
@@ -108,9 +108,8 @@ explain select * from t1 where pk1 != 0  and key1 = 1	{
                         "using_mrr": false,
                         "index_only": false,
                         "rows": 1000,
-                        "cost": 0.19598856,
-                        "chosen": false,
-                        "cause": "cost"
+                        "cost": 0.16706826,
+                        "chosen": true
                       },
                       {
                         "index": "key1",
diff --git a/mysql-test/main/optimizer_costs_innodb.result b/mysql-test/main/optimizer_costs_innodb.result
new file mode 100644
index 00000000000..4ae10b58ee7
--- /dev/null
+++ b/mysql-test/main/optimizer_costs_innodb.result
@@ -0,0 +1,36 @@
+#
+# MDEV-38164: Poor cost calculations for index access cause bad query plans for big VARCHARs in 11.x
+#
+create table t1 (
+pk1 int not null,
+pk2 int not null,
+filler1 varchar(500),
+filler2 varchar(500),
+filler3 varchar(500),
+filler4 varchar(500),
+filler5 varchar(500),
+filler6 varchar(500),
+filler7 varchar(500),
+filler8 varchar(500),
+filler9 varchar(500),
+fillerA varchar(500),
+fillerB varchar(500),
+fillerC varchar(500),
+fillerD varchar(500),
+fillerE varchar(500),
+fillerF varchar(500),
+primary key(pk1, pk2)
+) collate utf8mb4_general_ci engine=innodb;
+insert into t1 (pk1, pk2) select
+mod(seq, 8), seq
+from
+seq_1_to_10000;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	OK
+# This should use ref access, not full scan:
+explain select * from t1 where pk1=1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ref	PRIMARY	PRIMARY	4	#	1250	
+drop table t1;
diff --git a/mysql-test/main/optimizer_costs_innodb.test b/mysql-test/main/optimizer_costs_innodb.test
new file mode 100644
index 00000000000..18e1e186986
--- /dev/null
+++ b/mysql-test/main/optimizer_costs_innodb.test
@@ -0,0 +1,38 @@
+--source include/have_innodb.inc
+--source include/have_sequence.inc
+
+--echo #
+--echo # MDEV-38164: Poor cost calculations for index access cause bad query plans for big VARCHARs in 11.x
+--echo #
+create table t1 (
+  pk1 int not null,
+  pk2 int not null,
+  filler1 varchar(500),
+  filler2 varchar(500),
+  filler3 varchar(500),
+  filler4 varchar(500),
+  filler5 varchar(500),
+  filler6 varchar(500),
+  filler7 varchar(500),
+  filler8 varchar(500),
+  filler9 varchar(500),
+  fillerA varchar(500),
+  fillerB varchar(500),
+  fillerC varchar(500),
+  fillerD varchar(500),
+  fillerE varchar(500),
+  fillerF varchar(500),
+  primary key(pk1, pk2)
+) collate utf8mb4_general_ci engine=innodb;
+
+insert into t1 (pk1, pk2) select
+  mod(seq, 8), seq
+from
+  seq_1_to_10000;
+analyze table t1;
+
+--echo # This should use ref access, not full scan:
+--replace_column 8 #
+explain select * from t1 where pk1=1;
+
+drop table t1;
diff --git a/mysql-test/main/order_by_optimizer_innodb.result b/mysql-test/main/order_by_optimizer_innodb.result
index 5ceee39602e..7a036ec9c5f 100644
--- a/mysql-test/main/order_by_optimizer_innodb.result
+++ b/mysql-test/main/order_by_optimizer_innodb.result
@@ -44,9 +44,11 @@ EXPLAIN SELECT * FROM t2 USE INDEX(ux_pk1_fd5) WHERE pk1=9 AND fd5 < 500 ORDER B
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	range	ux_pk1_fd5	ux_pk1_fd5	13	NULL	138	Using index condition
 # This also must use range, not ref. key_len must be 13
+#   Note: this uses "Using where" instead of "Using index condition"
+#         due to effect described in MDEV-38231
 EXPLAIN SELECT * FROM t2                       WHERE pk1=9 AND fd5 < 500 ORDER BY fd5 DESC LIMIT 10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	range	PRIMARY,ux_pk1_fd5	ux_pk1_fd5	13	NULL	138	Using index condition
+1	SIMPLE	t2	range	PRIMARY,ux_pk1_fd5	ux_pk1_fd5	13	NULL	138	Using where
 drop table t2;
 #
 # MDEV-6814: Server crashes in calculate_key_len on query with ORDER BY
diff --git a/mysql-test/main/order_by_optimizer_innodb.test b/mysql-test/main/order_by_optimizer_innodb.test
index 67f4b11be4f..a37d9cf92b9 100644
--- a/mysql-test/main/order_by_optimizer_innodb.test
+++ b/mysql-test/main/order_by_optimizer_innodb.test
@@ -34,6 +34,8 @@ select pk1, count(*) from t2 group by pk1;
 --echo # The following should use range(ux_pk1_fd5), two key parts (key_len=5+8=13)
 EXPLAIN SELECT * FROM t2 USE INDEX(ux_pk1_fd5) WHERE pk1=9 AND fd5 < 500 ORDER BY fd5 DESC LIMIT 10;
 --echo # This also must use range, not ref. key_len must be 13
+--echo #   Note: this uses "Using where" instead of "Using index condition"
+--echo #         due to effect described in MDEV-38231
 EXPLAIN SELECT * FROM t2                       WHERE pk1=9 AND fd5 < 500 ORDER BY fd5 DESC LIMIT 10;
 
 drop table t2;
diff --git a/mysql-test/main/selectivity_innodb_notembedded.result b/mysql-test/main/selectivity_innodb_notembedded.result
index 8aec8dd471f..65a72bfc469 100644
--- a/mysql-test/main/selectivity_innodb_notembedded.result
+++ b/mysql-test/main/selectivity_innodb_notembedded.result
@@ -289,7 +289,7 @@ JS
                 "rows": 5,
                 "rows_after_filter": 5,
                 "rows_out": 2.490196078,
-                "cost": 0.00948507,
+                "cost": 0.00935932,
                 "chosen": true
             }
         ],
@@ -299,7 +299,7 @@ JS
             "index": "PRIMARY",
             "rows_read": 5,
             "rows_out": 2.490196078,
-            "cost": 0.00948507,
+            "cost": 0.00935932,
             "uses_join_buffering": false
         }
     }
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc
index 9e429f6a57e..556a80b1079 100644
--- a/sql/multi_range_read.cc
+++ b/sql/multi_range_read.cc
@@ -76,9 +76,10 @@ void handler::calculate_costs(Cost_estimate *cost, uint keyno,
   {
     /* Clustered index */
     io_blocks= unassigned_single_point_ranges;
-    cost->index_cost= ha_keyread_time(keyno, n_ranges,
-                                      total_rows + multi_row_ranges,
-                                      io_blocks);
+    cost->index_cost=
+      ha_keyread_clustered_time(keyno, n_ranges,
+                                total_rows + multi_row_ranges,
+                                io_blocks);
     cost->copy_cost=  rows2double(total_rows) * ROW_COPY_COST;
   }
   /* Adjust io cost to data size */
@@ -179,11 +180,9 @@ handler::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq,
   */
   ulonglong unassigned_single_point_ranges= 0;
 
-  uint len= table->key_info[keyno].key_length + table->file->ref_length;
-  if (table->file->is_clustering_key(keyno))
-    len= table->s->stored_rec_length;
+  size_t len= table->key_storage_length(keyno);
   /* Assume block is 75 % full */
-  uint avg_block_records= ((uint) (stats.block_size*3/4))/len + 1;
+  size_t avg_block_records= ((uint) (stats.block_size*3/4))/len + 1;
   uint limit= thd->variables.eq_range_index_dive_limit;
   bool use_statistics_for_eq_range= eq_ranges_exceeds_limit(seq,
                                                             seq_init_param,
diff --git a/sql/sql_class.h b/sql/sql_class.h
index cc56151cde3..6d278b79e35 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -227,7 +227,7 @@ void old_mode_deprecated_warnings(ulonglong v);
   See sys_vars.cc /new_mode_all_names
 */
 
-#define NEW_MODE_MAX                                                         0
+#define NEW_MODE_MAX                                                0
 
 /* Definitions above that have transitioned from new behaviour to default */
 
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index e34776bfedd..719a8b10cb0 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -13630,6 +13630,7 @@ static bool create_hj_key_for_table(JOIN *join, JOIN_TAB *join_tab,
   keyinfo->flags= HA_GENERATED_KEY;
   keyinfo->is_statistics_from_stat_tables= FALSE;
   keyinfo->all_nulls_key_parts= 0;
+  keyinfo->stat_storage_length= 0;
   keyinfo->name.str= "$hj";
   keyinfo->name.length= 3;
   keyinfo->rec_per_key= thd->calloc<ulong>(key_parts);
@@ -22699,6 +22700,7 @@ bool Create_tmp_table::finalize(THD *thd,
     keyinfo->algorithm= HA_KEY_ALG_UNDEF;
     keyinfo->is_statistics_from_stat_tables= FALSE;
     keyinfo->all_nulls_key_parts= 0;
+    keyinfo->stat_storage_length= 0;
     keyinfo->name= group_key;
     keyinfo->comment.str= 0;
     ORDER *cur_group= m_group;
@@ -22821,6 +22823,7 @@ bool Create_tmp_table::finalize(THD *thd,
     keyinfo->algorithm= HA_KEY_ALG_UNDEF;
     keyinfo->is_statistics_from_stat_tables= FALSE;
     keyinfo->all_nulls_key_parts= 0;
+    keyinfo->stat_storage_length= 0;
     keyinfo->read_stats= NULL;
     keyinfo->collected_stats= NULL;
 
diff --git a/sql/structs.h b/sql/structs.h
index 8bd22ecae49..80e93f84b54 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -156,6 +156,12 @@ typedef struct st_key {
   */
   ulong *rec_per_key;
 
+  /*
+    Average space index tuple takes on disk, according to the engine's
+    statistics. 0 if statistics is not available.
+  */
+  size_t stat_storage_length;
+
   /*
     This structure is used for statistical data on the index
     that has been read from the statistical table index_stat
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 9e00123e1d2..30bb555135a 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -4176,6 +4176,7 @@ static const char *new_mode_all_names[]=
 {
   "FIX_DISK_TMPTABLE_COSTS",        // Default from here, See NEW_MODE_MAX
   "FIX_INDEX_STATS_FOR_ALL_NULLS",
+  "FIX_INDEX_LOOKUP_COST",
   "TEST_WARNING1",
   "TEST_WARNING2",
   0
@@ -4185,8 +4186,9 @@ static int new_mode_hidden_names[] =
 {
   0,  // FIX_DISK_TMPTABLE_COSTS
   1,  // FIX_INDEX_STATS_FOR_ALL_NULLS
-  2,  // TEST_WARNING1
-  3,  // TEST_WARNING2
+  2,  // FIX_INDEX_LOOKUP_COST
+  3,  // TEST_WARNING1
+  4,  // TEST_WARNING2
   -1
 };
 
diff --git a/sql/table.cc b/sql/table.cc
index cd5b15421dd..94ab9399530 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -8732,6 +8732,7 @@ bool TABLE::add_tmp_key(uint key, uint key_parts,
   keyinfo->collected_stats= NULL;
   keyinfo->table= this;
   keyinfo->all_nulls_key_parts= 0;
+  keyinfo->stat_storage_length= 0;
 
   for (i= 0; i < key_parts; i++)
   {
@@ -11114,3 +11115,16 @@ void TABLE::mark_table_for_reopen()
   DBUG_ASSERT(thd);
   thd->locked_tables_list.mark_table_for_reopen(this);
 }
+
+/*
+  @brief
+    Estimate how much space is required to store one index tuple
+*/
+size_t TABLE::key_storage_length(uint index)
+{
+  /* Use storage engine's statistics if it is available */
+  if (key_info[index].stat_storage_length)
+    return key_info[index].stat_storage_length;
+
+  return key_storage_length_from_ddl(index);
+}
diff --git a/sql/table.h b/sql/table.h
index e20669ac6f4..369f4264f0b 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -1819,7 +1819,20 @@ public:
   uint actual_n_key_parts(KEY *keyinfo);
   ulong actual_key_flags(KEY *keyinfo);
   int update_virtual_field(Field *vf, bool ignore_warnings);
-  inline size_t key_storage_length(uint index)
+
+  size_t key_storage_length(uint index);
+  /*
+    @brief
+      Estimate how index tuple takes in storage, based solely on table's DDL
+
+    @detail
+      This is a conservative number that assumes the value is stored in
+      KeyTupleFormat (or table->record format for clustered PK), without
+      endspace compression, etc.
+      On the other hand, it doesn't account that the storage engine may need
+      to store transactionIds, etc.
+  */
+  inline size_t key_storage_length_from_ddl(uint index)
   {
     if (is_clustering_key(index))
       return s->stored_rec_length;
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index eacde4912b8..5e4e64de02d 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -15013,6 +15013,30 @@ stats_fetch:
 			}
 
 			KEY*	key = &table->key_info[i];
+			/*
+			  Provide statistics about how many bytes an index record takes on disk,
+			  on average.
+			*/
+			if (ib_table->stat_n_rows &&
+				key->algorithm != HA_KEY_ALG_FULLTEXT &&
+				key->algorithm != HA_KEY_ALG_RTREE) {
+				/*
+				  Start with total space used by the index divided by number of rows
+				*/
+				key->stat_storage_length = (size_t) ((index->stat_index_size * srv_page_size) /
+					ib_table->stat_n_rows);
+
+				/*
+					The above can be too large
+					A) in case of tables with very few rows
+					B) in case of indexes with partially full pages.
+					So, clip the above estimate by a conservative estimate we've used
+					before:
+				*/
+				size_t conservative_estimate = table->key_storage_length_from_ddl(i);
+				if (key->stat_storage_length > conservative_estimate)
+					key->stat_storage_length = conservative_estimate;
+			}
 
 			for (j = 0; j < key->ext_key_parts; j++) {
 

From d613f03c201915667dafb80152338ac4d012b59e Mon Sep 17 00:00:00 2001
From: Andrei Elkin <andrei.elkin@pp.inet.fi>
Date: Tue, 2 Dec 2025 17:14:45 +0200
Subject: [PATCH 072/119] MDEV-37541 Race of rolling back and committing
 transaction to binlog

Two transactions could binlog their completions in opposite to how it
is done in Engine. That is is rare situations ROLLBACK in Engine of
the dependency parent transaction could be scheduled by the
transaction before its binlogging. That give a follower dependency
child one get binlogged ahead of the parent.

For fixing this bug its necessary to ensure the binlogging phase is
always first one in the internal one-phase rollback protocol.

The commit combines
1. a code polishing piece over a part of MDEV-21117 that
   made binlog handlerton always commit first in no-2pc cases and
2. the same rule now applies to the rollback.

An added test demonstrates how the child could otherwise reach binlog
before its parent.
---
 .../suite/binlog/t/binlog_mdev37541.test      |  9 +++
 sql/handler.cc                                | 70 +++++++++++++------
 sql/log.cc                                    |  3 +-
 sql/log.h                                     |  1 +
 4 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/mysql-test/suite/binlog/t/binlog_mdev37541.test b/mysql-test/suite/binlog/t/binlog_mdev37541.test
index de94f5a5ebd..c6902c9571e 100644
--- a/mysql-test/suite/binlog/t/binlog_mdev37541.test
+++ b/mysql-test/suite/binlog/t/binlog_mdev37541.test
@@ -2,6 +2,15 @@
 --source include/have_innodb.inc
 --source include/have_binlog_format_mixed.inc
 
+# MDEV-37541 Race of rolling back and committing transaction to binlog
+# The tests reproduce a scenario of two conflicting transactions
+# of which the dependency decides to rollback. In order to reproduce the bug
+# the parent features side effects (produced by DROP TEMPORARY TABLE)
+# and multiple engines.
+# The tests prove that the child transaction can not win race to binlogging
+# with its parent as it gets stuck at engine lock acquiring all time
+# while the parent conducts binlogging on its own.
+
 create table t1 (a int primary key, b text) engine=innodb;
 
 connect(trx1_rollback,localhost,root,,);
diff --git a/sql/handler.cc b/sql/handler.cc
index 19c0b31c1fe..de34df3f9ff 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -2152,11 +2152,34 @@ static bool is_ro_1pc_trans(THD *thd, Ha_trx_info *ha_info, bool all,
   return !rw_trans;
 }
 
-static bool has_binlog_hton(Ha_trx_info *ha_info)
+inline Ha_trx_info* get_binlog_hton(Ha_trx_info *ha_info)
 {
-  bool rc;
-  for (rc= false; ha_info && !rc; ha_info= ha_info->next())
-    rc= ha_info->ht() == binlog_hton;
+  for (; ha_info; ha_info= ha_info->next())
+    if (ha_info->ht() == binlog_hton)
+      return ha_info;
+
+  return ha_info;
+}
+
+static int run_binlog_first(THD *thd, bool all, THD_TRANS *trans,
+                            bool is_real_trans, bool is_commit)
+{
+  int rc= 0;
+  Ha_trx_info *ha_info= trans->ha_list;
+
+  if ((ha_info= get_binlog_hton(ha_info)))
+  {
+    int err;
+    if ((err= is_commit ? binlog_commit(thd, all,
+                                        is_ro_1pc_trans(thd, ha_info, all,
+                                                        is_real_trans))
+                        : binlog_rollback(ha_info->ht(), thd, all)))
+    {
+      my_error(is_commit ? ER_ERROR_DURING_COMMIT : ER_ERROR_DURING_ROLLBACK,
+               MYF(0), err);
+      rc= 1;
+    }
+  }
 
   return rc;
 }
@@ -2174,18 +2197,19 @@ commit_one_phase_2(THD *thd, bool all, THD_TRANS *trans, bool is_real_trans)
   if (ha_info)
   {
     int err= 0;
-
-    if (has_binlog_hton(ha_info) &&
-        (err= binlog_commit(thd, all,
-                            is_ro_1pc_trans(thd, ha_info, all, is_real_trans))))
+    /*
+      Binlog hton must be called first regardless of its position
+      in trans->ha_list at least to prevent from commiting any engine
+      branches when afterward a duplicate GTID error out of binlog_commit()
+      is generated.
+    */
+    for (int binlog_err= error=
+           run_binlog_first(thd, all, trans, is_real_trans, true);
+         ha_info; ha_info= ha_info_next)
     {
-      my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
-      error= 1;
+      if (binlog_err)
+        goto err;
 
-      goto err;
-    }
-    for (; ha_info; ha_info= ha_info_next)
-    {
       handlerton *ht= ha_info->ht();
       if ((err= ht->commit(ht, thd, all)))
       {
@@ -2311,17 +2335,17 @@ int ha_rollback_trans(THD *thd, bool all)
     if (is_real_trans)                          /* not a statement commit */
       thd->stmt_map.close_transient_cursors();
 
-    int err;
-    if (has_binlog_hton(ha_info) &&
-        (err= binlog_hton->rollback(binlog_hton, thd, all)))
-    {
-      my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
-      error= 1;
-    }
-    for (; ha_info; ha_info= ha_info_next)
+    /*
+      Binlog hton must be called first regardless of its position
+      in trans->ha_list in order to avoid race to binlog between the current
+      rollbacker and any transaction that depends on it. This guarantees
+      the execution time dependency identifies binlog ordering.
+    */
+    for (error= run_binlog_first(thd, all, trans, is_real_trans, false);
+         ha_info; ha_info= ha_info_next)
     {
+      int err;
       handlerton *ht= ha_info->ht();
-
       if (ht != binlog_hton && (err= ht->rollback(ht, thd, all)))
       {
         // cannot happen
diff --git a/sql/log.cc b/sql/log.cc
index 9e35cc9530a..13fd5846294 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -97,7 +97,6 @@ static int binlog_savepoint_set(handlerton *hton, THD *thd, void *sv);
 static int binlog_savepoint_rollback(handlerton *hton, THD *thd, void *sv);
 static bool binlog_savepoint_rollback_can_release_mdl(handlerton *hton,
                                                       THD *thd);
-static int binlog_rollback(handlerton *hton, THD *thd, bool all);
 static int binlog_prepare(handlerton *hton, THD *thd, bool all);
 static int binlog_start_consistent_snapshot(handlerton *hton, THD *thd);
 static int binlog_flush_cache(THD *thd, binlog_cache_mngr *cache_mngr,
@@ -2489,7 +2488,7 @@ int binlog_commit(THD *thd, bool all, bool ro_1pc)
 
   @see handlerton::rollback
 */
-static int binlog_rollback(handlerton *hton, THD *thd, bool all)
+int binlog_rollback(handlerton *hton, THD *thd, bool all)
 {
   DBUG_ENTER("binlog_rollback");
 
diff --git a/sql/log.h b/sql/log.h
index e779271c7f5..d8af4916804 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -1277,6 +1277,7 @@ const char *
 get_gtid_list_event(IO_CACHE *cache, Gtid_list_log_event **out_gtid_list);
 
 int binlog_commit(THD *thd, bool all, bool is_ro_1pc= false);
+int binlog_rollback(handlerton *hton, THD *thd, bool all);
 int binlog_commit_by_xid(handlerton *hton, XID *xid);
 int binlog_rollback_by_xid(handlerton *hton, XID *xid);
 bool write_bin_log_start_alter(THD *thd, bool& partial_alter,

From d0ae38c0ad48701dacfb517bac4eb90c55d953b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Wed, 3 Dec 2025 08:48:24 +0200
Subject: [PATCH 073/119] MDEV-37688: Relax a too strict assertion

page_zip_decompress_low(): Skip the 8 bytes after FIL_PAGE_TYPE
to be consistent with the rest of ROW_FORMAT=COMPRESSED page handling.

The 8 bytes after FIL_PAGE_TYPE may differ between the compressed
and uncompressed copy of a page when SET GLOBAL innodb_encrypt_tables
is being executed while data pages are being evicted and reloaded
into the buffer pool.
---
 storage/innobase/page/page0zip.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/storage/innobase/page/page0zip.cc b/storage/innobase/page/page0zip.cc
index 0448f24a42c..551371b93b4 100644
--- a/storage/innobase/page/page0zip.cc
+++ b/storage/innobase/page/page0zip.cc
@@ -3013,8 +3013,9 @@ page_zip_decompress_low(
 		/* Check that the bytes that we skip are identical. */
 #if defined UNIV_DEBUG || defined UNIV_ZIP_DEBUG
 		ut_a(!memcmp(FIL_PAGE_TYPE + page,
-			     FIL_PAGE_TYPE + page_zip->data,
-			     PAGE_HEADER - FIL_PAGE_TYPE));
+			     FIL_PAGE_TYPE + page_zip->data, 2));
+		ut_a(!memcmp(FIL_PAGE_SPACE_ID + page,
+			     FIL_PAGE_SPACE_ID + page_zip->data, 4));
 		ut_a(!memcmp(PAGE_HEADER + PAGE_LEVEL + page,
 			     PAGE_HEADER + PAGE_LEVEL + page_zip->data,
 			     PAGE_DATA - (PAGE_HEADER + PAGE_LEVEL)));
@@ -3028,7 +3029,8 @@ page_zip_decompress_low(
 
 #if defined UNIV_DEBUG || defined UNIV_ZIP_DEBUG
 		/* Check that the page headers match after copying. */
-		ut_a(!memcmp(page, page_zip->data, PAGE_DATA));
+		ut_a(!memcmp(page_zip->data + FIL_PAGE_DATA,
+			     page + FIL_PAGE_DATA, PAGE_DATA - FIL_PAGE_DATA));
 #endif /* UNIV_DEBUG || UNIV_ZIP_DEBUG */
 	}
 

From f3a5d38fa7bd51cfff41892cc3c12fceab794964 Mon Sep 17 00:00:00 2001
From: Andrei Elkin <andrei.elkin@pp.inet.fi>
Date: Thu, 4 Dec 2025 19:26:40 +0200
Subject: [PATCH 074/119] Revert "MDEV-37686 rpl.create_or_replace_mix2 fails
 in MDEV-35915 branch"

This reverts commit 3241798214b066d62ba3274ba5dc29549349ca65.
Due to MDEV-38212.
---
 sql/sql_class.cc | 3 ---
 sql/sql_class.h  | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 5c4b3d8cc0a..1769fe9912b 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -6364,8 +6364,6 @@ start_new_trans::start_new_trans(THD *thd)
   thd->server_status&= ~(SERVER_STATUS_IN_TRANS |
                          SERVER_STATUS_IN_TRANS_READONLY);
   thd->server_status|= SERVER_STATUS_AUTOCOMMIT;
-  org_rgi_slave= thd->rgi_slave;
-  thd->rgi_slave= NULL;
 }
 
 
@@ -6382,7 +6380,6 @@ void start_new_trans::restore_old_transaction()
     MYSQL_COMMIT_TRANSACTION(org_thd->m_transaction_psi);
   org_thd->m_transaction_psi= m_transaction_psi;
   org_thd->variables.wsrep_on= wsrep_on;
-  org_thd->rgi_slave= org_rgi_slave;
   org_thd= 0;
 }
 
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 7b649d2db35..119a036fd98 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -5885,11 +5885,6 @@ class start_new_trans
   uint in_sub_stmt;
   uint server_status;
   my_bool wsrep_on;
-  /*
-    THD:rgi_slave may hold a part of the replicated "old" transaction's
-    execution context. Therefore it has to be reset/restored too.
-  */
-  rpl_group_info* org_rgi_slave;
 
 public:
   start_new_trans(THD *thd);

From 10cb25e642b0cbd5525a7629ff43cfec08a8b9a7 Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Fri, 5 Dec 2025 16:11:12 +0100
Subject: [PATCH 075/119] MDEV-38126:fix the version of server_audit plugin
 taking into account its feature set

---
 plugin/server_audit/server_audit.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/server_audit/server_audit.cc b/plugin/server_audit/server_audit.cc
index b1cc1c08ce2..d171f7f564f 100644
--- a/plugin/server_audit/server_audit.cc
+++ b/plugin/server_audit/server_audit.cc
@@ -15,8 +15,8 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
 
-#define PLUGIN_VERSION 0x106
-#define PLUGIN_STR_VERSION "1.6.0"
+#define PLUGIN_VERSION 0x108
+#define PLUGIN_STR_VERSION "1.8.0"
 
 #include <my_config.h>
 #include "my_counter.h"

From 688c6aea7b693bb3a2e2d5012a5eda87df9f4fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Tue, 9 Dec 2025 10:20:10 +0200
Subject: [PATCH 076/119] MDEV-38280 : Fix test regression caused by MDEV-35617

---
 mysql-test/suite/galera/r/MW-416.result             | 2 +-
 mysql-test/suite/galera/r/galera_change_user.result | 2 ++
 mysql-test/suite/galera/r/galera_read_only.result   | 2 +-
 mysql-test/suite/galera/r/galera_roles.result       | 2 +-
 mysql-test/suite/galera/r/rename.result             | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mysql-test/suite/galera/r/MW-416.result b/mysql-test/suite/galera/r/MW-416.result
index ea0ca763603..1b47c1a6fd4 100644
--- a/mysql-test/suite/galera/r/MW-416.result
+++ b/mysql-test/suite/galera/r/MW-416.result
@@ -93,7 +93,7 @@ Got one of the listed errors
 connection node_1;
 DROP USER 'userMW416'@'localhost';
 Warnings:
-Note	4226	Dropped users 'userMW416'@'localhost' have active connections. Use KILL CONNECTION if they should not be used anymore.
+Note	4227	Dropped users 'userMW416'@'localhost' have active connections. Use KILL CONNECTION if they should not be used anymore.
 SHOW DATABASES;
 Database
 information_schema
diff --git a/mysql-test/suite/galera/r/galera_change_user.result b/mysql-test/suite/galera/r/galera_change_user.result
index 3be9c956a28..55f3bb76910 100644
--- a/mysql-test/suite/galera/r/galera_change_user.result
+++ b/mysql-test/suite/galera/r/galera_change_user.result
@@ -4,10 +4,12 @@ connection node_1;
 CREATE USER user1;
 CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB;
 connect node_1a, 127.0.0.1, root, , test, $MYPORT_NODE_1;
+change_user user1,,;
 disconnect node_1a;
 connect node_1a, 127.0.0.1, root, , test, $MYPORT_NODE_1;
 START TRANSACTION;
 INSERT INTO t1 VALUES (1);
+change_user user1,,;
 disconnect node_1a;
 connection node_1;
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_read_only.result b/mysql-test/suite/galera/r/galera_read_only.result
index e76dc15b9cd..c88a539f5bb 100644
--- a/mysql-test/suite/galera/r/galera_read_only.result
+++ b/mysql-test/suite/galera/r/galera_read_only.result
@@ -34,4 +34,4 @@ SET GLOBAL read_only=FALSE;
 DROP TABLE t1;
 DROP USER foo@localhost;
 Warnings:
-Note	4226	Dropped users 'foo'@'localhost' have active connections. Use KILL CONNECTION if they should not be used anymore.
+Note	4227	Dropped users 'foo'@'localhost' have active connections. Use KILL CONNECTION if they should not be used anymore.
diff --git a/mysql-test/suite/galera/r/galera_roles.result b/mysql-test/suite/galera/r/galera_roles.result
index ebad1a6bedc..34d7e74ec86 100644
--- a/mysql-test/suite/galera/r/galera_roles.result
+++ b/mysql-test/suite/galera/r/galera_roles.result
@@ -168,7 +168,7 @@ disconnect foo_node_2;
 connection node_1;
 DROP USER foo@localhost;
 Warnings:
-Note	4226	Dropped users 'foo'@'localhost' have active connections. Use KILL CONNECTION if they should not be used anymore.
+Note	4227	Dropped users 'foo'@'localhost' have active connections. Use KILL CONNECTION if they should not be used anymore.
 DROP DATABASE test1;
 #
 # MDEV-10566: Create role statement replicated inconsistently in Galera Cluster
diff --git a/mysql-test/suite/galera/r/rename.result b/mysql-test/suite/galera/r/rename.result
index 61a36979729..3fd7d6d18bb 100644
--- a/mysql-test/suite/galera/r/rename.result
+++ b/mysql-test/suite/galera/r/rename.result
@@ -45,6 +45,6 @@ i
 connection node_1;
 DROP USER foo@localhost;
 Warnings:
-Note	4226	Dropped users 'foo'@'localhost' have active connections. Use KILL CONNECTION if they should not be used anymore.
+Note	4227	Dropped users 'foo'@'localhost' have active connections. Use KILL CONNECTION if they should not be used anymore.
 DROP TABLE t2;
 # End of tests

From 997d0c4dfc551ea54faa1e9b7d56f3a0ff2ca849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Tue, 9 Dec 2025 10:26:37 +0200
Subject: [PATCH 077/119] MDEV-38282 : Fix test regression caused by
 MDEV-28933.

---
 mysql-test/suite/galera_sr/r/galera_sr_multirow_rollback.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/suite/galera_sr/r/galera_sr_multirow_rollback.result b/mysql-test/suite/galera_sr/r/galera_sr_multirow_rollback.result
index 1795d16bbfa..19eed1a9871 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_multirow_rollback.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_multirow_rollback.result
@@ -108,7 +108,7 @@ SET SESSION wsrep_trx_fragment_size=1000;
 START TRANSACTION;
 INSERT INTO c VALUES (3,1);
 INSERT INTO c VALUES (1,1), (2,2);
-ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`c`, CONSTRAINT `c_ibfk_1` FOREIGN KEY (`fk1`) REFERENCES `p` (`id`))
+ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`c`, CONSTRAINT `1` FOREIGN KEY (`fk1`) REFERENCES `p` (`id`))
 COMMIT;
 SELECT * FROM p;
 id	j

From 88efded2d205cf7f07d592ca0e87075ead640f65 Mon Sep 17 00:00:00 2001
From: Mohammad El-Shennawy <mohamedwork216@gmail.com>
Date: Mon, 24 Nov 2025 09:15:13 +0200
Subject: [PATCH 078/119] MDEV-36269: improve error handling for source command

- refactor batch_readline_init to mysql.cc for proper error handling
- add unit test and move it to the end of main/mysql_client_test.test
to resolve embedded test failures
- remove unnecessary code and duplicates to clean up implementation
- redirect error message from stderr to stdout in .test file
- use labels to avoid code duplication
- handle windows check for block device
- ensure file failing to open in windows because being a directory
 is different from any other reason for clear error message
---
 client/my_readline.h                     |  3 +-
 client/mysql.cc                          | 94 ++++++++++++++++++++----
 client/readline.cc                       | 30 +-------
 mysql-test/main/mysql_client_test.result |  6 ++
 mysql-test/main/mysql_client_test.test   | 10 +++
 5 files changed, 98 insertions(+), 45 deletions(-)

diff --git a/client/my_readline.h b/client/my_readline.h
index ec43d81f2c0..2ff5edcf31c 100644
--- a/client/my_readline.h
+++ b/client/my_readline.h
@@ -34,9 +34,10 @@ typedef struct st_line_buffer
   bool truncated;
 } LINE_BUFFER;
 
-extern LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file);
 extern LINE_BUFFER *batch_readline_command(LINE_BUFFER *buffer, char * str);
 extern char *batch_readline(LINE_BUFFER *buffer, bool binary_mode);
 extern void batch_readline_end(LINE_BUFFER *buffer);
+extern bool init_line_buffer(LINE_BUFFER *buffer, File file, ulong size,
+                             ulong max_size);
 
 #endif /* CLIENT_MY_READLINE_INCLUDED */
diff --git a/client/mysql.cc b/client/mysql.cc
index bce4a4e5fa2..ea8e350956c 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1207,6 +1207,81 @@ inline int get_command_index(char cmd_char)
   return -1;
 }
 
+static LINE_BUFFER *batch_readline_init(ulong max_size, const char *path)
+{
+  LINE_BUFFER *line_buff;
+  File file;
+  MY_STAT input_file_stat;
+  char buff[FN_REFLEN + 512];
+
+  if (path)
+  {
+    if ((file= my_open(path, O_RDONLY | O_BINARY, MYF(0))) < 0)
+    {
+#ifdef _WIN32
+      if (my_errno == EACCES && my_stat(path, &input_file_stat, MYF(0)) &&
+          MY_S_ISDIR(input_file_stat.st_mode))
+        my_snprintf(buff, sizeof(buff), "Can't read from a directory '%.*s'",
+                    FN_REFLEN, path);
+      else
+#endif
+      my_snprintf(buff, sizeof(buff), "Failed to open file '%.*s', error: %d",
+                  FN_REFLEN, path, my_errno);
+      put_info(buff, INFO_ERROR, 0);
+      return 0;
+    }
+  }
+  else
+  {
+    file= my_fileno(stdin);
+  }
+
+  if (my_fstat(file, &input_file_stat, MYF(0)))
+  {
+    my_snprintf(buff, sizeof(buff), "Failed to stat file '%.*s', error: %d",
+                FN_REFLEN, path ? path : "stdin", my_errno);
+    goto err1;
+  }
+
+  if (MY_S_ISDIR(input_file_stat.st_mode))
+  {
+    my_snprintf(buff, sizeof(buff), "Can't read from a directory '%.*s'",
+                FN_REFLEN, path ? path : "stdin");
+    goto err1;
+  }
+
+#ifndef _WIN32
+  if (MY_S_ISBLK(input_file_stat.st_mode))
+  {
+    my_snprintf(buff, sizeof(buff), "Can't read from a block device '%.*s'",
+                FN_REFLEN, path ? path : "stdin");
+    goto err1;
+  }
+#endif
+
+  if (!(line_buff= (LINE_BUFFER*) my_malloc(PSI_NOT_INSTRUMENTED,
+                                            sizeof(*line_buff),
+                                            MYF(MY_WME | MY_ZEROFILL))))
+  {
+    goto err;
+  }
+
+  if (init_line_buffer(line_buff, file, IO_SIZE, max_size))
+  {
+    my_free(line_buff);
+    goto err;
+  }
+
+  return line_buff;
+
+err1:
+  put_info(buff, INFO_ERROR, 0);
+err:
+  if (path)
+    my_close(file, MYF(0));
+  return 0;
+}
+
 static int delimiter_index= -1;
 static int charset_index= -1;
 static int sandbox_index= -1;
@@ -1281,10 +1356,8 @@ int main(int argc,char *argv[])
   }
 
   if (status.batch && !status.line_buff &&
-      !(status.line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, stdin)))
+      !(status.line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, NULL)))
   {
-    put_info("Can't initialize batch_readline - may be the input source is "
-             "a directory or a block device.", INFO_ERROR, 0);
     free_defaults(defaults_argv);
     my_end(0);
     exit(1);
@@ -4682,7 +4755,6 @@ static int com_source(String *, char *line)
   LINE_BUFFER *line_buff;
   int error;
   STATUS old_status;
-  FILE *sql_file;
   my_bool save_ignore_errors;
 
   if (status.sandbox)
@@ -4702,18 +4774,10 @@ static int com_source(String *, char *line)
     end--;
   end[0]=0;
   unpack_filename(source_name,source_name);
-  /* open file name */
-  if (!(sql_file = my_fopen(source_name, O_RDONLY | O_BINARY,MYF(0))))
-  {
-    char buff[FN_REFLEN+60];
-    sprintf(buff,"Failed to open file '%s', error: %d", source_name,errno);
-    return put_info(buff, INFO_ERROR, 0);
-  }
 
-  if (!(line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, sql_file)))
+  if (!(line_buff= batch_readline_init(MAX_BATCH_BUFFER_SIZE, source_name)))
   {
-    my_fclose(sql_file,MYF(0));
-    return put_info("Can't initialize batch_readline", INFO_ERROR, 0);
+    return ignore_errors ? -1 : 1;
   }
 
   /* Save old status */
@@ -4732,7 +4796,7 @@ static int com_source(String *, char *line)
   ignore_errors= save_ignore_errors;
   status=old_status;				// Continue as before
   in_com_source= aborted= 0;
-  my_fclose(sql_file,MYF(0));
+  my_close(line_buff->file, MYF(0));
   batch_readline_end(line_buff);
   /*
     If we got an error during source operation, don't abort the client
diff --git a/client/readline.cc b/client/readline.cc
index e4014658c08..f88a942f012 100644
--- a/client/readline.cc
+++ b/client/readline.cc
@@ -23,38 +23,11 @@
 #include <my_dir.h>
 #include "my_readline.h"
 
-static bool init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,
-			    ulong max_size);
 static bool init_line_buffer_from_string(LINE_BUFFER *buffer,char * str);
 static size_t fill_buffer(LINE_BUFFER *buffer);
 static char *intern_read_line(LINE_BUFFER *buffer, ulong *out_length);
 
 
-LINE_BUFFER *batch_readline_init(ulong max_size,FILE *file)
-{
-  LINE_BUFFER *line_buff;
-
-#ifndef _WIN32
-  MY_STAT input_file_stat;
-  if (my_fstat(fileno(file), &input_file_stat, MYF(MY_WME)) ||
-      MY_S_ISDIR(input_file_stat.st_mode) ||
-      MY_S_ISBLK(input_file_stat.st_mode))
-    return 0;
-#endif
-
-  if (!(line_buff=(LINE_BUFFER*)
-        my_malloc(PSI_NOT_INSTRUMENTED, sizeof(*line_buff),
-                  MYF(MY_WME | MY_ZEROFILL))))
-    return 0;
-  if (init_line_buffer(line_buff,my_fileno(file),IO_SIZE,max_size))
-  {
-    my_free(line_buff);
-    return 0;
-  }
-  return line_buff;
-}
-
-
 char *batch_readline(LINE_BUFFER *line_buff, bool binary_mode)
 {
   char *pos;
@@ -105,8 +78,7 @@ LINE_BUFFER *batch_readline_command(LINE_BUFFER *line_buff, char * str)
       Functions to handle buffered readings of lines from a stream
 ******************************************************************************/
 
-static bool
-init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,ulong max_buffer)
+bool init_line_buffer(LINE_BUFFER *buffer,File file,ulong size,ulong max_buffer)
 {
   buffer->file=file;
   buffer->bufread=size;
diff --git a/mysql-test/main/mysql_client_test.result b/mysql-test/main/mysql_client_test.result
index dbd5aaeaae5..4c7b20314c0 100644
--- a/mysql-test/main/mysql_client_test.result
+++ b/mysql-test/main/mysql_client_test.result
@@ -262,3 +262,9 @@ SET @@global.collation_server= @save_collation_server;
 SET @@global.character_set_client= @save_character_set_client;
 SET @@global.collation_connection= @save_collation_connection;
 FOUND 1 /Aborted connection.*'u' host: '192.0.2.1' real ip: '(localhost|::1)'/ in mysqld.1.err
+#
+# MDEV-36269: Improve error handling for SOURCE command
+# Test that SOURCE on an existent directory returns a clear error
+#
+ERROR at line 1: Can't read from a directory '.'
+End of 10.11 tests
diff --git a/mysql-test/main/mysql_client_test.test b/mysql-test/main/mysql_client_test.test
index d620f4c7078..f99aecace80 100644
--- a/mysql-test/main/mysql_client_test.test
+++ b/mysql-test/main/mysql_client_test.test
@@ -63,3 +63,13 @@ SET @@global.collation_connection= @save_collation_connection;
 let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err;
 let SEARCH_PATTERN= Aborted connection.*'u' host: '192.0.2.1' real ip: '(localhost|::1)';
 source include/search_pattern_in_file.inc;
+
+--echo #
+--echo # MDEV-36269: Improve error handling for SOURCE command
+--echo # Test that SOURCE on an existent directory returns a clear error
+--echo #
+
+--error 1
+--exec $MYSQL -e "source ." 2>&1
+
+--echo End of 10.11 tests

From 4ee491f1b2eb356e9dc40f388f79b62cfeb13609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Thu, 11 Dec 2025 08:22:41 +0200
Subject: [PATCH 079/119] MDEV-38289: innodb.log_corruption_recovery
 sporadically fails

When the test is starting up the server with innodb_force_recovery=1,
there will be messages about the LSN being in the future. The current
LSN is expected to be 12338 plus any number of FILE_CHECKPOINT records
(16 bytes each). We have observed anything up to 12402=12338+16*4 in
our CI systems. To be on the safe side, let us allow up to ten records.
---
 mysql-test/suite/innodb/r/log_corruption_recovery.result | 2 +-
 mysql-test/suite/innodb/t/log_corruption_recovery.test   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-test/suite/innodb/r/log_corruption_recovery.result b/mysql-test/suite/innodb/r/log_corruption_recovery.result
index 8d44df0b2ea..54bbe092f90 100644
--- a/mysql-test/suite/innodb/r/log_corruption_recovery.result
+++ b/mysql-test/suite/innodb/r/log_corruption_recovery.result
@@ -5,7 +5,7 @@ call mtr.add_suppression("InnoDB: OPT_PAGE_CHECKSUM mismatch on \\[page id: spac
 call mtr.add_suppression("InnoDB: Set innodb_force_recovery=1");
 call mtr.add_suppression("InnoDB: Cannot apply log to \\[page id: space=127, page number=0\\] of corrupted file '.*test/t\\.ibd");
 call mtr.add_suppression("(InnoDB: Plugin|Plugin 'InnoDB')");
-call mtr.add_suppression("InnoDB: Page .* Current system log sequence number 123(38|54)\\.");
+call mtr.add_suppression("InnoDB: Page .* Current system log sequence number 12(3(38|54|70|86)|4(02|18|34|50|66|82|98))");
 SET GLOBAL innodb_fast_shutdown=0;
 # restart
 SELECT * FROM INFORMATION_SCHEMA.ENGINES
diff --git a/mysql-test/suite/innodb/t/log_corruption_recovery.test b/mysql-test/suite/innodb/t/log_corruption_recovery.test
index 06069679e91..489010f9b77 100644
--- a/mysql-test/suite/innodb/t/log_corruption_recovery.test
+++ b/mysql-test/suite/innodb/t/log_corruption_recovery.test
@@ -14,8 +14,8 @@ call mtr.add_suppression("InnoDB: OPT_PAGE_CHECKSUM mismatch on \\[page id: spac
 call mtr.add_suppression("InnoDB: Set innodb_force_recovery=1");
 call mtr.add_suppression("InnoDB: Cannot apply log to \\[page id: space=127, page number=0\\] of corrupted file '.*test/t\\.ibd");
 call mtr.add_suppression("(InnoDB: Plugin|Plugin 'InnoDB')");
-call mtr.add_suppression("InnoDB: Page .* Current system log sequence number 123(38|54)\\.");
-
+# Allow innodb_force_recovery=1 to write up to 10 FILE_CHECKPOINT records
+call mtr.add_suppression("InnoDB: Page .* Current system log sequence number 12(3(38|54|70|86)|4(02|18|34|50|66|82|98))");
 SET GLOBAL innodb_fast_shutdown=0;
 --source include/shutdown_mysqld.inc
 --move_file $DATADIR/ib_logfile0 $DATADIR/ib_logfile0.old

From 478802a8edb45886b0f105280ed613414f6a580c Mon Sep 17 00:00:00 2001
From: Akshat Nehra <anehra@amazon.com>
Date: Tue, 22 Apr 2025 17:06:00 +0000
Subject: [PATCH 080/119] MDEV-28823 Secure mariadb-secure-installation output
 file with chmod

Fix security issue where temporary output files containing SQL commands
and password hashes were created with default permissions (world-readable).
Modified prepare() function to create and umask the $output $config and
$command files. It is more secure than chmod as files can be opened, before
the chmod is applied, and then read when its its later populated.

All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer Amazon Web
Services, Inc.
---
 scripts/mysql_secure_installation.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 scripts/mysql_secure_installation.sh

diff --git a/scripts/mysql_secure_installation.sh b/scripts/mysql_secure_installation.sh
old mode 100644
new mode 100755
index 27911774be6..a4fffc24836
--- a/scripts/mysql_secure_installation.sh
+++ b/scripts/mysql_secure_installation.sh
@@ -1,16 +1,16 @@
 #!/bin/sh
 
 # Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
-# 
+#
 # 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
 # the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA
@@ -212,8 +212,8 @@ validate_reply () {
 }
 
 prepare() {
-    touch $config $command
-    chmod 600 $config $command
+    umask 0077
+    touch $config $command $output
 }
 
 do_query() {

From bb32acebf3ded9b5ac77ff9d0db30e7712d72aac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Thu, 27 Nov 2025 10:11:38 +0200
Subject: [PATCH 081/119] MDEV-37354 : SIGSEGV in
 Wsrep_server_service::release_high_priority_service |
 discard_streaming_applier

This issue seems to be already fixed. However, to avoid future problems:

Wsrep_server_service::release_storage_service
  Add assertion that storage service is not nullptr and
  contains thd. In production binaries add guard to
  not use nullptr.

Wsrep_server_service::release_high_priority_service
  Add assertion that high_priority service is not nullptr and
  contains thd. In production binaries add guard to
  not use nullptr.

wsrep_is_BF_lock_timeout
  Remove printing of record lock because its page might
  not be latched leading to assertion in multi-master
  testing.
---
 .../suite/galera/r/galera_mdev_31517.result   |  4 ++
 .../suite/galera/t/galera_mdev_31517.test     |  6 +++
 sql/wsrep_server_service.cc                   | 44 ++++++++++++++-----
 storage/innobase/lock/lock0lock.cc            | 22 ++--------
 4 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/mysql-test/suite/galera/r/galera_mdev_31517.result b/mysql-test/suite/galera/r/galera_mdev_31517.result
index efb3f985622..600df72a43b 100644
--- a/mysql-test/suite/galera/r/galera_mdev_31517.result
+++ b/mysql-test/suite/galera/r/galera_mdev_31517.result
@@ -1,5 +1,9 @@
 connection node_2;
 connection node_1;
+# Make sure that the test is operating on the right version of galera library.
+# Correct Galera library found
+connection node_1;
+connection node_2;
 connection node_2;
 CALL mtr.add_suppression("unknown variable 'non_existing_variable=ON'");
 CALL mtr.add_suppression("Aborting");
diff --git a/mysql-test/suite/galera/t/galera_mdev_31517.test b/mysql-test/suite/galera/t/galera_mdev_31517.test
index 39ceb2db5a1..853746cebac 100644
--- a/mysql-test/suite/galera/t/galera_mdev_31517.test
+++ b/mysql-test/suite/galera/t/galera_mdev_31517.test
@@ -24,6 +24,11 @@
 --let $galera_version=26.4.25
 source ../wsrep/include/check_galera_version.inc;
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
 # Suppress expected errors and warnings:
 --connection node_2
 CALL mtr.add_suppression("unknown variable 'non_existing_variable=ON'");
@@ -129,4 +134,5 @@ DROP TABLE t;
 EOF
 --remove_file $TEST_LOG.copy
 
+--source include/auto_increment_offset_restore.inc
 --source include/galera_end.inc
diff --git a/sql/wsrep_server_service.cc b/sql/wsrep_server_service.cc
index ca25a41d132..0ede84e4cf9 100644
--- a/sql/wsrep_server_service.cc
+++ b/sql/wsrep_server_service.cc
@@ -80,11 +80,22 @@ void Wsrep_server_service::release_storage_service(
 {
   Wsrep_storage_service* ss=
     static_cast<Wsrep_storage_service*>(storage_service);
-  THD* thd= ss->m_thd;
-  wsrep_reset_threadvars(thd);
-  server_threads.erase(thd);
-  delete ss;
-  delete thd;
+  DBUG_ASSERT(ss && ss->m_thd);
+
+  // Do not crash server on production
+  if (ss)
+  {
+    THD* thd= ss->m_thd;
+    if (thd)
+    {
+      wsrep_reset_threadvars(thd);
+      server_threads.erase(thd);
+      delete ss;
+      delete thd;
+    }
+    else
+      delete ss;
+  }
 }
 
 Wsrep_applier_service*
@@ -141,12 +152,23 @@ void Wsrep_server_service::release_high_priority_service(wsrep::high_priority_se
 {
   Wsrep_high_priority_service* hps=
     static_cast<Wsrep_high_priority_service*>(high_priority_service);
-  THD* thd= hps->m_thd;
-  delete hps;
-  wsrep_store_threadvars(thd);
-  server_threads.erase(thd);
-  delete thd;
-  wsrep_delete_threadvars();
+  DBUG_ASSERT(hps && hps->m_thd);
+
+  // Do not crash server on production
+  if (hps)
+  {
+    THD* thd= hps->m_thd;
+    if (thd)
+    {
+      delete hps;
+      wsrep_store_threadvars(thd);
+      server_threads.erase(thd);
+      delete thd;
+      wsrep_delete_threadvars();
+    }
+    else
+      delete hps;
+  }
 }
 
 void Wsrep_server_service::background_rollback(
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
index 220cd895761..572a7591a77 100644
--- a/storage/innobase/lock/lock0lock.cc
+++ b/storage/innobase/lock/lock0lock.cc
@@ -670,25 +670,9 @@ bool wsrep_is_BF_lock_timeout(const trx_t &trx)
              << " error: " << trx.error_state
              << " query: " << wsrep_thd_query(trx.mysql_thd);
 
-  if (const lock_t*wait_lock = trx.lock.wait_lock)
-  {
-    const my_hrtime_t now= my_hrtime_coarse();
-    const my_hrtime_t suspend_time= trx.lock.suspend_time;
-    fprintf(stderr,
-            "------- TRX HAS BEEN WAITING %llu us"
-            " FOR THIS LOCK TO BE GRANTED:\n",
-            now.val - suspend_time.val);
-
-    if (!wait_lock->is_table()) {
-      mtr_t mtr;
-      lock_rec_print(stderr, wait_lock, mtr);
-    } else {
-      lock_table_print(stderr, wait_lock);
-    }
-
-    fprintf(stderr, "------------------\n");
-  }
-
+  // TODO: Can't use lock_rec_print from here because
+  // record lock page might not be latched and we are
+  // actually only interested lock information.
   return true;
 }
 

From db26f446fd50a0040aba1656ec9472c3bc516783 Mon Sep 17 00:00:00 2001
From: Yuchen Pei <ycp@mariadb.com>
Date: Mon, 15 Dec 2025 17:09:21 +1100
Subject: [PATCH 082/119] MDEV-35562 Do not emit warning when deleting .par
 file in quick_rm_table

...just like the when deleting the .frm file in the same function.
This improves consistency: internal duplicate deletion of .par file
and .frm file both fail silently.
---
 mysql-test/main/partition_alter.result | 25 +++++++++++++++++++++++++
 mysql-test/main/partition_alter.test   | 26 ++++++++++++++++++++++++++
 sql/ha_partition.cc                    | 12 ++++++++----
 sql/ha_partition.h                     |  3 ++-
 sql/handler.cc                         |  6 ++++--
 sql/handler.h                          |  6 ++++--
 sql/sql_table.cc                       |  3 ++-
 7 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/mysql-test/main/partition_alter.result b/mysql-test/main/partition_alter.result
index 29e239aa087..c0a59588a3a 100644
--- a/mysql-test/main/partition_alter.result
+++ b/mysql-test/main/partition_alter.result
@@ -391,3 +391,28 @@ partitio values in (2, 3, 4),
 pn values in (52, 53, 54));
 drop table t1;
 # End of 10.7 tests
+#
+# MDEV-35562 On partitionen tables algorithm is not supported
+# throw "no such file or directory" error
+#
+set @old_alter_algorithm=@@alter_algorithm;
+set alter_algorithm='NOCOPY';
+CREATE TABLE t1par (
+f1 datetime ,
+f2 VARCHAR(2) ,
+f3 VARCHAR(200) NOT NULL ,
+f4 VARCHAR(100) charset utf8
+)
+PARTITION BY RANGE COLUMNS(f2)
+(
+PARTITION p_01 VALUES LESS THAN ('02') ENGINE = InnoDB,
+PARTITION p_31 VALUES LESS THAN (MAXVALUE) ENGINE = InnoDB
+);
+ALTER online TABLE t1par   MODIFY COLUMN f3 VARCHAR(201) NULL , LOCK=NONE;
+ERROR 0A000: ALGORITHM=NOCOPY is not supported for this operation. Try ALGORITHM=INPLACE
+show warnings;
+Level	Code	Message
+Error	1845	ALGORITHM=NOCOPY is not supported for this operation. Try ALGORITHM=INPLACE
+drop table t1par;
+set alter_algorithm=@old_alter_algorithm;
+# End of 10.11 tests
diff --git a/mysql-test/main/partition_alter.test b/mysql-test/main/partition_alter.test
index 827527695fa..b5e9defb4b1 100644
--- a/mysql-test/main/partition_alter.test
+++ b/mysql-test/main/partition_alter.test
@@ -323,3 +323,29 @@ partition by list(x) (
 drop table t1;
 
 --echo # End of 10.7 tests
+
+--echo #
+--echo # MDEV-35562 On partitionen tables algorithm is not supported
+--echo # throw "no such file or directory" error
+--echo #
+
+set @old_alter_algorithm=@@alter_algorithm;
+set alter_algorithm='NOCOPY';
+CREATE TABLE t1par (
+f1 datetime ,
+f2 VARCHAR(2) ,
+f3 VARCHAR(200) NOT NULL ,
+f4 VARCHAR(100) charset utf8
+)
+PARTITION BY RANGE COLUMNS(f2)
+(
+  PARTITION p_01 VALUES LESS THAN ('02') ENGINE = InnoDB,
+  PARTITION p_31 VALUES LESS THAN (MAXVALUE) ENGINE = InnoDB
+);
+--error ER_ALTER_OPERATION_NOT_SUPPORTED
+ALTER online TABLE t1par   MODIFY COLUMN f3 VARCHAR(201) NULL , LOCK=NONE;
+show warnings;
+drop table t1par;
+set alter_algorithm=@old_alter_algorithm;
+
+--echo # End of 10.11 tests
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index e40fe12b429..f3b2bf194c6 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -670,8 +670,10 @@ int ha_partition::rename_table(const char *from, const char *to)
   SYNOPSIS
     create_partitioning_metadata()
     path                              Path to the new frm file (without ext)
-    old_p                             Path to the old frm file (without ext)
-    create_info                       Create info generated for CREATE TABLE
+    old_path                          Path to the old frm file (without ext)
+    action_flag                       Action to take
+    ignore_delete_error               Whether to ignore error in call to
+                                      mysql_file_delete
 
   RETURN VALUE
     >0                        Error
@@ -687,7 +689,8 @@ int ha_partition::rename_table(const char *from, const char *to)
 
 int ha_partition::create_partitioning_metadata(const char *path,
                                                const char *old_path,
-                                               chf_create_flags action_flag)
+                                               chf_create_flags action_flag,
+                                               bool ignore_delete_error)
 {
   partition_element *part;
   DBUG_ENTER("ha_partition::create_partitioning_metadata");
@@ -706,7 +709,8 @@ int ha_partition::create_partitioning_metadata(const char *path,
     strxmov(name, path, ha_par_ext, NullS);
     strxmov(old_name, old_path, ha_par_ext, NullS);
     if ((action_flag == CHF_DELETE_FLAG &&
-         mysql_file_delete(key_file_ha_partition_par, name, MYF(MY_WME))) ||
+         mysql_file_delete(key_file_ha_partition_par, name,
+                           ignore_delete_error ? MYF(0) : MYF(MY_WME))) ||
         (action_flag == CHF_RENAME_FLAG &&
          mysql_file_rename(key_file_ha_partition_par, old_name, name,
                            MYF(MY_WME))))
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 09b4802624d..05b67f542d7 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -552,7 +552,8 @@ public:
              HA_CREATE_INFO *create_info) override;
   int create_partitioning_metadata(const char *name,
                                    const char *old_name,
-                                   chf_create_flags action_flag)
+                                   chf_create_flags action_flag,
+                                   bool ignore_delete_error)
     override;
   bool check_if_updates_are_ignored(const char *op) const override;
   void update_create_info(HA_CREATE_INFO *create_info) override;
diff --git a/sql/handler.cc b/sql/handler.cc
index de34df3f9ff..09e1072b443 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -5696,7 +5696,8 @@ handler::ha_create(const char *name, TABLE *form, HA_CREATE_INFO *info_arg)
 int
 handler::ha_create_partitioning_metadata(const char *name,
                                          const char *old_name,
-                                         chf_create_flags action_flag)
+                                         chf_create_flags action_flag,
+                                         bool ignore_delete_error)
 {
   /*
     Normally this is done when unlocked, but in fast_alter_partition_table,
@@ -5706,7 +5707,8 @@ handler::ha_create_partitioning_metadata(const char *name,
   DBUG_ASSERT(m_lock_type == F_UNLCK ||
               (!old_name && strcmp(name, table_share->path.str)));
 
-  return create_partitioning_metadata(name, old_name, action_flag);
+  return create_partitioning_metadata(name, old_name, action_flag,
+                                      ignore_delete_error);
 }
 
 
diff --git a/sql/handler.h b/sql/handler.h
index b919aaeea55..df750d4ee22 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -3529,7 +3529,8 @@ public:
   int ha_create(const char *name, TABLE *form, HA_CREATE_INFO *info);
 
   int ha_create_partitioning_metadata(const char *name, const char *old_name,
-                                      chf_create_flags action_flag);
+                                      chf_create_flags action_flag,
+                                      bool ignore_delete_error= false);
 
   int ha_change_partitions(HA_CREATE_INFO *create_info,
                            const char *path,
@@ -5071,7 +5072,8 @@ public:
 
   virtual int create_partitioning_metadata(const char *name,
                                            const char *old_name,
-                                           chf_create_flags action_flag)
+                                           chf_create_flags action_flag,
+                                           bool ignore_delete_error)
   { return FALSE; }
 
   virtual int change_partitions(HA_CREATE_INFO *create_info,
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 5e790bcaf45..b9e24cb6a36 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -2102,7 +2102,8 @@ bool quick_rm_table(THD *thd, handlerton *base, const LEX_CSTRING *db,
     handler *file= get_new_handler((TABLE_SHARE*) 0, thd->mem_root, base);
     if (!file)
       DBUG_RETURN(true);
-    (void) file->ha_create_partitioning_metadata(path, NULL, CHF_DELETE_FLAG);
+    (void) file->ha_create_partitioning_metadata(path, NULL, CHF_DELETE_FLAG,
+                                                 true);
     delete file;
   }
   if (!(flags & (FRM_ONLY|NO_HA_TABLE)))

From ba6e0cbd1ff9606a86da5d8e8c5a4d4c62b6f961 Mon Sep 17 00:00:00 2001
From: Denis Protivensky <denis.protivensky@mariadb.com>
Date: Wed, 5 Nov 2025 13:57:27 +0300
Subject: [PATCH 083/119] MDEV-37229: Set proper trx isolation level for Wsrep
 system threads

Every Wsrep system thread should run with READ_COMMITTED transaction
isolation level to prevent issues caused by InnoDB gap locks.

The exception is statement-based replication for appliers, where
REPEATABLE_READ is required by the server code. To account for that,
set the isolation level before every applied event. It won't affect
an already running transaction, but allows to handle both statement-
and row-based replications accordingly.
However, the problem might arise with the mixed replication format.

Apart from that, there was a separate issue with applier thread vars:
wsrep_plugins_post_init() would overwrite thd->variables for every
applier thread and forget to restore proper default isolation level.
Then, upon every server transaction termination,
trans_reset_one_shot_statistics() would set thread's isolation
level to the one stored in thd->variables, thus spoiling the isolation
level value for appliers.
---
 mysql-test/suite/galera/r/MDEV-37229.result   | 53 +++++++++++++++++++
 .../r/galera_binlog_stmt_autoinc.result       | 26 +++++++++
 mysql-test/suite/galera/t/MDEV-37229.test     | 49 +++++++++++++++++
 .../galera/t/galera_binlog_stmt_autoinc.cnf   |  1 +
 .../galera/t/galera_binlog_stmt_autoinc.test  | 11 +++-
 sql/sql_plugin.cc                             |  2 +
 sql/wsrep_applier.cc                          | 24 +++++++++
 sql/wsrep_schema.cc                           |  1 +
 sql/wsrep_storage_service.cc                  |  1 +
 9 files changed, 167 insertions(+), 1 deletion(-)
 create mode 100644 mysql-test/suite/galera/r/MDEV-37229.result
 create mode 100644 mysql-test/suite/galera/t/MDEV-37229.test

diff --git a/mysql-test/suite/galera/r/MDEV-37229.result b/mysql-test/suite/galera/r/MDEV-37229.result
new file mode 100644
index 00000000000..59d908c451e
--- /dev/null
+++ b/mysql-test/suite/galera/r/MDEV-37229.result
@@ -0,0 +1,53 @@
+connection node_2;
+connection node_1;
+connection node_2;
+connection node_1;
+CREATE TABLE t1 (i INT NOT NULL PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
+SET GLOBAL wsrep_forced_binlog_format='STATEMENT';
+START TRANSACTION;
+INSERT INTO t1(i) VALUES(NULL);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave
+INSERT INTO t1(i) VALUES(NULL);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave
+SET GLOBAL wsrep_forced_binlog_format='ROW';
+INSERT INTO t1(i) VALUES(NULL);
+INSERT INTO t1(i) VALUES(NULL);
+COMMIT;
+SET GLOBAL wsrep_forced_binlog_format='ROW';
+START TRANSACTION;
+INSERT INTO t1(i) VALUES(NULL);
+INSERT INTO t1(i) VALUES(NULL);
+SET GLOBAL wsrep_forced_binlog_format='STATEMENT';
+INSERT INTO t1(i) VALUES(NULL);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave
+INSERT INTO t1(i) VALUES(NULL);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave
+COMMIT;
+SELECT * FROM t1 ORDER BY i;
+i
+1
+3
+5
+7
+9
+11
+13
+15
+connection node_2;
+SELECT * FROM t1 ORDER BY i;
+i
+1
+3
+5
+7
+9
+11
+13
+15
+connection node_1;
+SET GLOBAL wsrep_forced_binlog_format='NONE';
+DROP TABLE t1;
diff --git a/mysql-test/suite/galera/r/galera_binlog_stmt_autoinc.result b/mysql-test/suite/galera/r/galera_binlog_stmt_autoinc.result
index 10b94fdbc01..d4b025c3eb9 100644
--- a/mysql-test/suite/galera/r/galera_binlog_stmt_autoinc.result
+++ b/mysql-test/suite/galera/r/galera_binlog_stmt_autoinc.result
@@ -33,6 +33,28 @@ i	c
 3	dummy_text
 5	dummy_text
 7	dummy_text
+insert into t1(i) values(null);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave
+insert into t1(i) values(null);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave
+insert into t1(i) values(null);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave
+insert into t1(i) values(null);
+Warnings:
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system variable that may have a different value on the slave
+select * from t1 order by i;
+i	c
+1	dummy_text
+3	dummy_text
+5	dummy_text
+7	dummy_text
+9	dummy_text
+11	dummy_text
+13	dummy_text
+15	dummy_text
 connection node_2;
 show variables like 'auto_increment%';
 Variable_name	Value
@@ -44,6 +66,10 @@ i	c
 3	dummy_text
 5	dummy_text
 7	dummy_text
+9	dummy_text
+11	dummy_text
+13	dummy_text
+15	dummy_text
 SET GLOBAL wsrep_forced_binlog_format='none';
 connection node_1;
 SET GLOBAL wsrep_forced_binlog_format='none';
diff --git a/mysql-test/suite/galera/t/MDEV-37229.test b/mysql-test/suite/galera/t/MDEV-37229.test
new file mode 100644
index 00000000000..8d1fc600330
--- /dev/null
+++ b/mysql-test/suite/galera/t/MDEV-37229.test
@@ -0,0 +1,49 @@
+##
+## Test that mixed binlog replication works at the applier side.
+##
+
+--source include/galera_cluster.inc
+--source include/have_innodb.inc
+
+--connection node_2
+--disable_query_log
+call mtr.add_suppression("Unsafe statement written to the binary log");
+--enable_query_log
+
+--connection node_1
+--disable_query_log
+call mtr.add_suppression("Unsafe statement written to the binary log");
+--enable_query_log
+
+CREATE TABLE t1 (i INT NOT NULL PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
+
+# Try mixed replication: statement then row.
+SET GLOBAL wsrep_forced_binlog_format='STATEMENT';
+START TRANSACTION;
+INSERT INTO t1(i) VALUES(NULL);
+INSERT INTO t1(i) VALUES(NULL);
+SET GLOBAL wsrep_forced_binlog_format='ROW';
+INSERT INTO t1(i) VALUES(NULL);
+INSERT INTO t1(i) VALUES(NULL);
+COMMIT;
+
+# Try mixed replication: row then statement.
+SET GLOBAL wsrep_forced_binlog_format='ROW';
+START TRANSACTION;
+INSERT INTO t1(i) VALUES(NULL);
+INSERT INTO t1(i) VALUES(NULL);
+SET GLOBAL wsrep_forced_binlog_format='STATEMENT';
+INSERT INTO t1(i) VALUES(NULL);
+INSERT INTO t1(i) VALUES(NULL);
+COMMIT;
+
+SELECT * FROM t1 ORDER BY i;
+
+--connection node_2
+--let $wait_condition = SELECT COUNT(*) = 8 FROM t1;
+--source include/wait_condition.inc
+SELECT * FROM t1 ORDER BY i;
+
+--connection node_1
+SET GLOBAL wsrep_forced_binlog_format='NONE';
+DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.cnf b/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.cnf
index 00e5017455f..d176cdd845d 100644
--- a/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.cnf
+++ b/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.cnf
@@ -5,5 +5,6 @@ auto_increment_offset=1
 auto_increment_increment=2
 
 [mysqld.2]
+wsrep_slave_threads=2
 auto_increment_offset=2
 auto_increment_increment=2
diff --git a/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test b/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test
index 81bf6738086..3998da5cca9 100644
--- a/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test
+++ b/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test
@@ -48,8 +48,17 @@ insert into t1(i) values(null), (null), (null);
 
 select * from t1 order by i;
 
+# Ensure both appliers have some work to perform in parallel.
+# This way we can see they both have proper isolation level set.
+insert into t1(i) values(null);
+insert into t1(i) values(null);
+insert into t1(i) values(null);
+insert into t1(i) values(null);
+
+select * from t1 order by i;
+
 --connection node_2
---let $wait_condition = SELECT COUNT(*) = 4 FROM t1;
+--let $wait_condition = SELECT COUNT(*) = 8 FROM t1;
 --source include/wait_condition.inc
 show variables like 'auto_increment%';
 select * from t1 order by i;
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index c7fad3a9a59..03f89c3de9f 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -4547,6 +4547,8 @@ my_bool post_init_callback(THD *thd, void *)
     thd->variables.tx_read_only= false;
     // Restore option_bits
     thd->variables.option_bits= option_bits_saved;
+    // Restore proper default isolation level for appliers
+    thd->variables.tx_isolation= ISO_READ_COMMITTED;
   }
   set_current_thd(0);
   return 0;
diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc
index 4eaef4fb489..dfd20708561 100644
--- a/sql/wsrep_applier.cc
+++ b/sql/wsrep_applier.cc
@@ -279,6 +279,30 @@ int wsrep_apply_events(THD*        thd,
       }
     }
 
+    /* Statement-based replication requires InnoDB repeatable read
+       transaction isolation level or higher.
+       The isolation level will be reset to the default upon
+       transaction termination.
+       Although the isolation level can only be set on a newly
+       started server transaction, it cannot be determined until
+       we see the first applied binlog event.
+
+       Even though the isolation level is changed for every next
+       applied event, it won't affect the overall setting for a
+       running transaction.
+       This should create an issue with the mixed replication mode
+       as applying query and row events should be performed with
+       different isolation levels, but now it doesn't surface.
+       */
+    if (LOG_EVENT_IS_QUERY(typ))
+    {
+      thd->tx_isolation= ISO_REPEATABLE_READ;
+    }
+    else
+    {
+      thd->tx_isolation= ISO_READ_COMMITTED;
+    }
+
     if (LOG_EVENT_IS_WRITE_ROW(typ) ||
         LOG_EVENT_IS_UPDATE_ROW(typ) ||
         LOG_EVENT_IS_DELETE_ROW(typ))
diff --git a/sql/wsrep_schema.cc b/sql/wsrep_schema.cc
index dcce91e71f0..b1b651928f7 100644
--- a/sql/wsrep_schema.cc
+++ b/sql/wsrep_schema.cc
@@ -730,6 +730,7 @@ static void wsrep_init_thd_variables(THD *thd)
   /* No general log */
   thd->variables.option_bits|= OPTION_LOG_OFF;
   /* Read committed isolation to avoid gap locking */
+  thd->tx_isolation= ISO_READ_COMMITTED;
   thd->variables.tx_isolation= ISO_READ_COMMITTED;
 }
 
diff --git a/sql/wsrep_storage_service.cc b/sql/wsrep_storage_service.cc
index 7e9229c65e0..72ad3949a3a 100644
--- a/sql/wsrep_storage_service.cc
+++ b/sql/wsrep_storage_service.cc
@@ -63,6 +63,7 @@ Wsrep_storage_service::Wsrep_storage_service(THD* thd)
   thd->variables.option_bits |= OPTION_LOG_OFF;
 
   /* Read committed isolation to avoid gap locking */
+  thd->tx_isolation = ISO_READ_COMMITTED;
   thd->variables.tx_isolation = ISO_READ_COMMITTED;
 
   /* Keep wsrep on to enter commit ordering hooks */

From 514f2e6c6d62ba0ec83f9fb1ef1288a6ea8ed35c Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@gmail.com>
Date: Fri, 12 Dec 2025 21:21:28 +0100
Subject: [PATCH 084/119] MDEV-38226 File permission issues with mariadb-dump
 --dir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When mariadb-dump runs with the --dir parameter, it creates new
directories. These directories must allow both mariadb-dump and
mariadbd to create new files in them.

If mariadb-dump and mariadbd run under different users, this is not
guaranteed. One problem is my_mkdir(), which by default creates
directories writable only by the current user and group, due to the
default my_umask_dir value of 0700.

This fix tries to preserve the permissions and owner of the original
backup directory passed with --dir when creating subdirectories.

If this fails, a warning is issued and mariadb-dump continues. This is
a best-effort approach. Failures may still occur later when the server
tries to write to a newly created directory. In such cases, the
permissions of the backup root directory (which maria­db-dump does not
create) would already be incorrect.
---
 client/mysqldump.cc | 80 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/client/mysqldump.cc b/client/mysqldump.cc
index 89c7c93839c..26fa2751536 100644
--- a/client/mysqldump.cc
+++ b/client/mysqldump.cc
@@ -7303,6 +7303,85 @@ static void init_connection_pool(uint n_connections)
   connection_pool.init(conn, n_connections);
 }
 
+/*
+  Fix permissions and ownership of given directory to be the same
+  as the root output directory.
+
+  The function is used for newly created database directories,
+  together with --dir option
+
+  This function is not thread-safe, nor does it need to be, because
+  it is called from the main thread only.
+
+  chmod/chown errors are ignored after the first one, with a warning printed,
+  so it is really the best effort attempt. We might see an error later
+  if the server can't write into the directory, and this will be the
+  real error.
+
+  On Windows, this function does nothing, because the permissions are
+  inherited from the parent directory anyway.
+
+  @param dirpath  Directory path
+*/
+static void fix_permissions_and_owner(const char *dirpath)
+{
+#ifndef _WIN32
+  // Permissions and ownership of output directory (--dir)
+  static struct stat  st_out_dir;
+
+  static bool fix_perms= true; // Try fixing permission bits
+  static bool fix_ownership_uid= true; // Try fixing user+group ownership
+  static bool fix_ownership_gid= false; // Try fixing group ownership only
+
+  static bool first_time= true;
+  if (first_time)
+  {
+    /* Find out permissions and ownership of output directory */
+    first_time= false;
+    if (stat(opt_dir, &st_out_dir) != 0)
+    {
+      die(EX_CONSCHECK, "Error: cannot stat output directory %s, errno %d",
+          opt_dir, errno);
+    }
+  }
+
+  /* Change permissions to be the same as for the output directory*/
+  if (fix_perms &&
+      chmod(dirpath, st_out_dir.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO)))
+  {
+    fprintf(stderr,
+        "Warning: cannot set permissions on directory %s, errno %d\n",
+        dirpath, errno);
+    fix_perms= false;
+  }
+
+  /*
+    Change ownership to be the same as backup root dir.
+    If user can't be changed, try changing owner group only.
+  */
+  if (fix_ownership_uid &&
+          chown(dirpath, st_out_dir.st_uid, st_out_dir.st_gid))
+  {
+    // No warning, error is expected, unless current user is root.
+    fix_ownership_uid= false;
+    fix_ownership_gid= true;
+  }
+
+  if (fix_ownership_gid && chown(dirpath, -1, st_out_dir.st_gid))
+  {
+    if (!(st_out_dir.st_mode & S_IWOTH))
+    {
+      /* Only warn if directory is not world-writable (group ownership
+         matters more in this case), to avoid spamming stderr.*/
+      fprintf(stderr,
+              "Warning: cannot set group ownership on directory %s, errno %d\n",
+              dirpath, errno);
+    }
+    fix_ownership_gid= false;
+  }
+#endif
+}
+
 /*
   If --dir option is in use, ensure that output directory for given db
   exists.
@@ -7322,6 +7401,7 @@ static void ensure_out_dir_exists(const char *db)
   }
   if (my_mkdir(outdir, 0777, MYF(MY_WME)))
     die(EX_MYSQLERR, "Error creating directory %s", outdir);
+  fix_permissions_and_owner(outdir);
 }
 
 

From 2a3bc9ef6a96002fecd0b98d1e53f6326300ef94 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@gmail.com>
Date: Wed, 17 Dec 2025 00:54:58 +0100
Subject: [PATCH 085/119] MDEV-38360 parsec client plugin is not built on
 Windows

Remove bogus CMake check for threads.h that causes CLIENT_PLUGIN_PARSEC
to be set to OFF on Windows. That header is not used by the code.
---
 cmake/mariadb_connector_c.cmake | 5 -----
 libmariadb                      | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/cmake/mariadb_connector_c.cmake b/cmake/mariadb_connector_c.cmake
index 86e7d5612e2..859f96a8dcc 100644
--- a/cmake/mariadb_connector_c.cmake
+++ b/cmake/mariadb_connector_c.cmake
@@ -7,12 +7,7 @@ ENDIF()
 SET(CONC_WITH_SIGNCODE ${SIGNCODE})
 SET(SIGN_OPTIONS ${SIGNTOOL_PARAMETERS})
 SET(CONC_WITH_EXTERNAL_ZLIB ON)
-SET(CLIENT_PLUGIN_PARSEC OFF)
 
-CHECK_INCLUDE_FILES (threads.h HAVE_THREADS_H)
-IF(HAVE_THREADS_H)
-SET(CLIENT_PLUGIN_PARSEC DYNAMIC)
-ENDIF()
 
 IF(NOT CONC_WITH_SSL)
   IF(SSL_DEFINES MATCHES "WOLFSSL")
diff --git a/libmariadb b/libmariadb
index 46880b00365..ad30f836240 160000
--- a/libmariadb
+++ b/libmariadb
@@ -1 +1 @@
-Subproject commit 46880b003653a000e9588bd73c8b1dd65088c686
+Subproject commit ad30f8362402012cdeb3adaeb3a14bb55bdbbb76

From eea493463bc366534764f37114298c2a48c6489d Mon Sep 17 00:00:00 2001
From: Dave Gosselin <dave.gosselin@mariadb.com>
Date: Tue, 4 Nov 2025 18:19:01 -0500
Subject: [PATCH 086/119] MDEV-38003: Intermittent Replication Failure on a
 multi-table DELETE

When deleting from multiple tables, the DELETE operator uses a temporary table
to collect the row IDs of rows that will be deleted. If this table grows too
large, then we convert it from a heap temporary table to a persistent (on-disk)
temporary table to avoid unbounded memory usage. There are several error codes
that gate creating this persistent temporary table but themselves don't
indicate a problem with the DELETE operation. However, regardless of this error
code value, we need to clear it after deciding whether or not to create the
persistent temporary table. If we don't clear this value, then the error
code's stale state prevents binlog replication when its value is muxed with
local_error during multi_delete::send_eof.
---
 .../suite/rpl/r/rpl_multi_delete_join.result  | 60 +++++++++++++++++++
 .../suite/rpl/t/rpl_multi_delete_join.test    | 46 ++++++++++++++
 sql/sql_delete.cc                             |  1 +
 3 files changed, 107 insertions(+)
 create mode 100644 mysql-test/suite/rpl/r/rpl_multi_delete_join.result
 create mode 100644 mysql-test/suite/rpl/t/rpl_multi_delete_join.test

diff --git a/mysql-test/suite/rpl/r/rpl_multi_delete_join.result b/mysql-test/suite/rpl/r/rpl_multi_delete_join.result
new file mode 100644
index 00000000000..8e23ba56fa8
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_multi_delete_join.result
@@ -0,0 +1,60 @@
+include/master-slave.inc
+[connection master]
+#
+# MDEV-38003 Intermittent Replication Failure on a multi-table DELETE
+#
+connection master;
+set sql_log_bin=1;
+connection slave;
+set sql_log_bin=1;
+reset master;
+connection master;
+create database mdev38003;
+use mdev38003;
+create table t1 (pk int, num int);
+create table t2 (pk int, num int);
+create table t3 (pk int, num int);
+insert into t1 (pk, num) values (1,1900),(2,1901);
+insert into t2 (pk, num) values (2,2001),(2,2002);
+insert into t3 (pk, num) values (1,40),(2,42);
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk;
+pk	num	pk	num	pk	num
+2	1901	2	2001	2	42
+2	1901	2	2002	2	42
+1	1900	NULL	NULL	NULL	NULL
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk where t2.num <= 2002;
+pk	num	pk	num	pk	num
+2	1901	2	2001	2	42
+2	1901	2	2002	2	42
+connection slave;
+use mdev38003;
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk;
+pk	num	pk	num	pk	num
+2	1901	2	2001	2	42
+2	1901	2	2002	2	42
+1	1900	NULL	NULL	NULL	NULL
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk where t2.num <= 2002;
+pk	num	pk	num	pk	num
+2	1901	2	2001	2	42
+2	1901	2	2002	2	42
+connection master;
+use mdev38003;
+delete t1, t2, t3 from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk where t2.num <= 2002;
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk;
+pk	num	pk	num	pk	num
+1	1900	NULL	NULL	NULL	NULL
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk where t2.num <= 2002;
+pk	num	pk	num	pk	num
+connection slave;
+use mdev38003;
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk;
+pk	num	pk	num	pk	num
+1	1900	NULL	NULL	NULL	NULL
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk where t2.num <= 2002;
+pk	num	pk	num	pk	num
+connection master;
+use mdev38003;
+drop table t1, t2, t3;
+drop database mdev38003;
+# End of 11.8 tests
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_multi_delete_join.test b/mysql-test/suite/rpl/t/rpl_multi_delete_join.test
new file mode 100644
index 00000000000..5e98cd5ca65
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_multi_delete_join.test
@@ -0,0 +1,46 @@
+source include/master-slave.inc;
+
+--echo #
+--echo # MDEV-38003 Intermittent Replication Failure on a multi-table DELETE
+--echo #
+connection master;
+set sql_log_bin=1;
+sync_slave_with_master;
+set sql_log_bin=1;
+reset master;
+connection master;
+create database mdev38003;
+use mdev38003;
+create table t1 (pk int, num int);
+create table t2 (pk int, num int);
+create table t3 (pk int, num int);
+insert into t1 (pk, num) values (1,1900),(2,1901);
+insert into t2 (pk, num) values (2,2001),(2,2002);
+insert into t3 (pk, num) values (1,40),(2,42);
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk;
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk where t2.num <= 2002;
+
+sync_slave_with_master;
+use mdev38003;
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk;
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk where t2.num <= 2002;
+
+connection master;
+use mdev38003;
+delete t1, t2, t3 from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk where t2.num <= 2002;
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk;
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk where t2.num <= 2002;
+
+sync_slave_with_master;
+use mdev38003;
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk;
+select * from t1 left join t2 on t1.pk = t2.pk left join t3 on t2.pk = t3.pk where t2.num <= 2002;
+
+connection master;
+use mdev38003;
+drop table t1, t2, t3;
+drop database mdev38003;
+
+--echo # End of 11.8 tests
+
+--source include/rpl_end.inc
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index 56c1856b9a1..25be3f79d74 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -1477,6 +1477,7 @@ int multi_delete::send_data(List<Item> &values)
               }
               found++;
           }
+          error= 0;
       }
     }
   }

From 5cbe01730d244376a54f30f7be7d1400ae664a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= <otto@kekalainen.net>
Date: Fri, 12 Dec 2025 11:19:12 -0800
Subject: [PATCH 087/119] MDEV-38332 Detect Hurd based on CMAKE_SYSTEM_NAME
 being "GNU"

In 22afd13 Hurd detection was introduced using the processor type,
as incidentally only the hurd-i386 build on Debian was using i686.
This method however does not detect a hurd-amd64 system. Fix this
by using the actual system name following CMake conventions.

Hurd is a kernel project by the GNU project, thus system is called
"GNU".
---
 cmake/build_configurations/mysql_release.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index c52ff46843e..e2adb59027c 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -121,8 +121,8 @@ ELSEIF(DEB)
   SET(WITH_ZLIB system CACHE STRING "")
   SET(WITH_LIBWRAP ON)
   SET(HAVE_EMBEDDED_PRIVILEGE_CONTROL ON)
-  # No hurd implementation
-  IF(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "i686-AT386")
+  # On Hurd systems (GNU) there is no auth socket implementation
+  IF(NOT CMAKE_SYSTEM_NAME STREQUAL "GNU")
     SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "")
   ENDIF()
   SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "")

From a9006bdf292ed432398d6618fd67420898e0ff71 Mon Sep 17 00:00:00 2001
From: ethanxhzhao <ethanxhzhao@tencent.com>
Date: Fri, 4 Jul 2025 15:06:28 +0800
Subject: [PATCH 088/119] MDEV-37157 When using rownum in having clause without
 group by or in subquery, the result may be wrong

Fix rownum in HAVING clause or subquery

Description
==========
When rownum used in HAVING without GROUP BY, accepted_rows should be
incremented even if the having cond's value is 0.

When rownum used in subquery
1. Forbid subquery transformed to semi join.
2. New conditions must be added into having clause when doing in2exists.
---
 mysql-test/main/rownum.result | 40 +++++++++++++++++++++++++++++++++++
 mysql-test/main/rownum.test   | 28 ++++++++++++++++++++++++
 sql/item_subselect.cc         |  9 ++++----
 sql/opt_subselect.cc          |  4 +++-
 sql/sql_select.cc             |  7 ++++++
 5 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/mysql-test/main/rownum.result b/mysql-test/main/rownum.result
index b61269b1b47..387b6183c05 100644
--- a/mysql-test/main/rownum.result
+++ b/mysql-test/main/rownum.result
@@ -1015,5 +1015,45 @@ ERROR HY000: The target table v of the UPDATE is not updatable
 DROP VIEW v;
 DROP TABLE t;
 #
+# rownum in having without group by
+#
+create table t1 (a int primary key, b int);
+insert into t1 values (1, 1), (2, 1), (3, 1), (4, 2), (5, 2), (6, 2);
+select * from (select * from t1 order by a, b) dt having rownum() = 4;
+a	b
+4	2
+drop table t1;
+#
+# rownum in subquery
+#
+create table t1 (a int primary key, b int);
+insert into t1 values (1, 1), (2, 1), (3, 1), (4, 2), (5, 2), (6, 2);
+explain select * from t1 where a in (select rownum() from t1);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	PRIMARY	NULL	NULL	NULL	6	
+1	PRIMARY	<subquery2>	eq_ref	distinct_key	distinct_key	8	test.t1.a	1	Using where
+2	MATERIALIZED	t1	index	NULL	PRIMARY	4	NULL	6	Using index
+select * from t1 where a in (select rownum() from t1);
+a	b
+1	1
+2	1
+3	1
+4	2
+5	2
+6	2
+set optimizer_switch='materialization=off';
+explain select * from t1 where a + 1 in (select rownum() from t1);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	Using where
+2	DEPENDENT SUBQUERY	t1	index	NULL	PRIMARY	4	NULL	6	Using index
+select * from t1 where a + 1 in (select rownum() from t1);
+a	b
+1	1
+2	1
+3	1
+4	2
+5	2
+drop table t1;
+#
 # End of 10.6 tests
 #
diff --git a/mysql-test/main/rownum.test b/mysql-test/main/rownum.test
index a68a432b606..24fadf768af 100644
--- a/mysql-test/main/rownum.test
+++ b/mysql-test/main/rownum.test
@@ -617,6 +617,34 @@ UPDATE v SET f = 10 WHERE e > 42 LIMIT 1;
 DROP VIEW v;
 DROP TABLE t;
 
+--echo #
+--echo # rownum in having without group by
+--echo #
+
+create table t1 (a int primary key, b int);
+insert into t1 values (1, 1), (2, 1), (3, 1), (4, 2), (5, 2), (6, 2);
+select * from (select * from t1 order by a, b) dt having rownum() = 4;
+
+drop table t1;
+
+--echo #
+--echo # rownum in subquery
+--echo #
+
+create table t1 (a int primary key, b int);
+insert into t1 values (1, 1), (2, 1), (3, 1), (4, 2), (5, 2), (6, 2);
+
+# When rownum used in subquery, the subquery shouldn't be transformed to semijoin
+explain select * from t1 where a in (select rownum() from t1);
+select * from t1 where a in (select rownum() from t1);
+
+set optimizer_switch='materialization=off';
+# When rownum used in IN-subquery and the subquery is transformed to EXISTS, the new condition should be added to HAVING clause.
+explain select * from t1 where a + 1 in (select rownum() from t1);
+select * from t1 where a + 1 in (select rownum() from t1);
+
+drop table t1;
+
 --echo #
 --echo # End of 10.6 tests
 --echo #
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 9c9e97fed2d..0378aad8537 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -2329,7 +2329,7 @@ Item_in_subselect::create_single_in_to_exists_cond(JOIN *join,
   *having_item= NULL;
 
   if (join_having || select_lex->with_sum_func ||
-      select_lex->group_list.elements)
+      select_lex->group_list.elements || select_lex->with_rownum)
   {
     LEX_CSTRING field_name= this->full_name_cstring();
     Item *item= func->create(thd, expr,
@@ -2576,9 +2576,10 @@ Item_in_subselect::create_row_in_to_exists_cond(JOIN * join,
     during JOIN::optimize: this->tmp_having= this->having; this->having= 0;
   */
   Item* join_having= join->having ? join->having : join->tmp_having;
-  bool is_having_used= (join_having || select_lex->with_sum_func ||
-                        select_lex->group_list.first ||
-                        !select_lex->table_list.elements);
+  bool is_having_used=
+      (join_having || select_lex->with_sum_func ||
+       select_lex->group_list.first || !select_lex->table_list.elements ||
+       select_lex->with_rownum);
   LEX_CSTRING list_ref= { STRING_WITH_LEN("<list ref>")};
   DBUG_ENTER("Item_in_subselect::create_row_in_to_exists_cond");
   DBUG_ASSERT(thd == join->thd);
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index 3d8a6c08d2f..63309acbf89 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -707,6 +707,7 @@ int check_and_do_in_subquery_rewrites(JOIN *join)
         12. All tables supports comparable rowids.
             This is needed for DuplicateWeedout strategy to work (which
             is the catch-all semi-join strategy so it must be applicable).
+        13. Subquery does not have ROWNUM
     */
     if (optimizer_flag(thd, OPTIMIZER_SWITCH_SEMIJOIN) &&
         in_subs &&                                                    // 1
@@ -722,7 +723,8 @@ int check_and_do_in_subquery_rewrites(JOIN *join)
            select_lex->outer_select()->join->select_options)          // 10
           & SELECT_STRAIGHT_JOIN) &&                                  // 10
         select_lex->first_cond_optimization &&                        // 11
-        join->not_usable_rowid_map == 0)                              // 12
+        join->not_usable_rowid_map == 0 &&                            // 12
+        !select_lex->with_rownum)                                     // 13
     {
       DBUG_PRINT("info", ("Subquery is semi-join conversion candidate"));
 
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 5bc1842c4d4..71715f743b6 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -24331,7 +24331,14 @@ end_send(JOIN *join, JOIN_TAB *join_tab, bool end_of_records)
     copy_fields(&join->tmp_table_param);
   }
   if (join->having && join->having->val_bool() == 0)
+  {
+    /*
+      If we have HAVING clause and it is not satisfied, we don't send
+      the row to the client, but rownum should be incremented.
+    */
+    join->accepted_rows++;
     DBUG_RETURN(NESTED_LOOP_OK);               // Didn't match having
+  }
   if (join->procedure)
   {
     if (join->procedure->send_row(join->procedure_fields_list))

From a04ccfe9245a41aada50aa3918f57098ab50e84f Mon Sep 17 00:00:00 2001
From: Tony Chen <ochenton@amazon.com>
Date: Fri, 20 Sep 2024 16:30:03 +0000
Subject: [PATCH 089/119] Add MTR to verify TLS with chain of trust

Add tests to verify that TLS configurations with certificate chain of trust are
supported.

The contents of the commit are inspired from the MySQL project:
https://github.com/mysql/mysql-server/commit/969afef933f1872c5f38ea93047ef05c4509c335

Credits to salman.s.khan@oracle.com

All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer Amazon Web
Services, Inc.
---
 mysql-test/lib/generate-ssl-certs.sh          | 153 ++++++++++++++++++
 mysql-test/main/chained_ssl_certificates.opt  |   3 +
 .../main/chained_ssl_certificates.result      |  12 ++
 mysql-test/main/chained_ssl_certificates.test |  74 +++++++++
 mysql-test/std_data/cachain/client.cachain    |  62 +++++++
 mysql-test/std_data/cachain/client.key        |  52 ++++++
 mysql-test/std_data/cachain/root.crt          |  31 ++++
 .../cachain/root_intermediate_ca1.crt         |  62 +++++++
 mysql-test/std_data/cachain/server.cachain    |  62 +++++++
 mysql-test/std_data/cachain/server.key        |  52 ++++++
 .../std_data/cachain/unrelated_root.crt       |  31 ++++
 mysql-test/suite.pm                           |   4 +
 12 files changed, 598 insertions(+)
 create mode 100644 mysql-test/main/chained_ssl_certificates.opt
 create mode 100644 mysql-test/main/chained_ssl_certificates.result
 create mode 100644 mysql-test/main/chained_ssl_certificates.test
 create mode 100644 mysql-test/std_data/cachain/client.cachain
 create mode 100644 mysql-test/std_data/cachain/client.key
 create mode 100644 mysql-test/std_data/cachain/root.crt
 create mode 100644 mysql-test/std_data/cachain/root_intermediate_ca1.crt
 create mode 100644 mysql-test/std_data/cachain/server.cachain
 create mode 100644 mysql-test/std_data/cachain/server.key
 create mode 100644 mysql-test/std_data/cachain/unrelated_root.crt

diff --git a/mysql-test/lib/generate-ssl-certs.sh b/mysql-test/lib/generate-ssl-certs.sh
index 57caf3b7a4e..1ced695bf7f 100755
--- a/mysql-test/lib/generate-ssl-certs.sh
+++ b/mysql-test/lib/generate-ssl-certs.sh
@@ -64,3 +64,156 @@ rm -fv crldir/*
 cp -v client-cert.crl crldir/`openssl x509 -in client-cert.pem -noout -issuer_hash`.r0
 
 rm -rf demoCA
+
+# --- Certificate Chain ---
+# These tests are inspired from the following commit from MySQL Server
+# https://github.com/mysql/mysql-server/commit/969afef933f1872c5f38ea93047ef05c4509c335
+#
+# Credits to salman.s.khan@oracle.com
+#
+# -------------------------------------------------------------------------------------
+#
+# STEPS TO GENERATE THE FOLLOWING CHAINED CERTIFICATES WHICH IS USED IN THE TEST CASE :
+#
+#                       +---------+
+#                       | Root CA |
+#                       +---------+
+#                            |
+#               /------------+-----------\
+#               |                        |
+#      +------------------+     +------------------+
+#      | Intermediate CA1 |     | Intermediate CA2 |
+#      +------------------+     +------------------+
+#               |                        |
+#        +-------------+          +-------------+
+#        |   Server    |          |   Client    |
+#        | certificate |          | certificate |
+#        +-------------+          +-------------+
+
+cd cachain
+
+mkdir ca
+mkdir server
+mkdir clients
+
+mkdir ca/root.certs
+touch ca/root.index.txt
+touch ca/root.index.txt.attr
+echo '01' > ca/root.serial
+
+cat > ca/root.cfg << EOF
+[ ca ]
+default_ca = CA_default
+[ CA_default ]
+dir = $PWD/ca
+certs = \$dir/certs
+database = \$dir/root.index.txt
+serial   = \$dir/root.serial
+policy= policy_match
+[ policy_match ]
+organizationName = match
+organizationalUnitName = optional
+commonName = supplied
+emailAddress = optional
+[ v3_ca ]
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid:always,issuer
+basicConstraints = critical,CA:TRUE
+keyUsage = critical,keyCertSign,cRLSign
+[ v3_ca_intermediate ]
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid:always,issuer
+basicConstraints = critical,CA:TRUE,pathlen:0
+keyUsage = critical,keyCertSign,cRLSign
+EOF
+
+# Generate Root CA key and cert
+openssl genrsa -out ca/root.key 4096
+openssl req -new -x509 '-sha256' -key ca/root.key -out ca/root.crt -days 7200 -subj "/O=MariaDB/OU=MariaDB/CN=Root CA" -config ca/root.cfg -extensions v3_ca
+
+# Generate Intermediate CA1 key and cert
+openssl genrsa -out ca/intermediate_ca1.key 4096
+openssl req -new '-sha256' -key ca/intermediate_ca1.key -out ca/intermediate_ca1.csr -subj "/O=MariaDB/OU=MariaDB/CN=Intermediate CA1"
+
+openssl ca -batch -days 7200 -notext -md sha256 -in ca/intermediate_ca1.csr -out ca/intermediate_ca1.crt -keyfile ca/root.key -cert ca/root.crt -outdir ca/root.certs/ -config ca/root.cfg -extensions v3_ca_intermediate
+
+mkdir ca/intermediate_ca1.certs
+touch ca/intermediate_ca1.index.txt
+touch ca/intermediate_ca1.index.txt.attr
+echo '01' > ca/intermediate_ca1.serial
+
+cat > ca/intermediate_ca1.cfg << EOF
+[ ca ]
+default_ca = CA_default
+[ CA_default ]
+dir = $PWD/ca
+certs = \$dir/intermediate_ca1.certs
+database = \$dir/intermediate_ca1.index.txt
+serial   = \$dir/intermediate_ca1.serial
+policy= policy_match
+[ policy_match ]
+commonName = supplied
+[ alt_names ]
+DNS.1 = localhost
+IP.1 = 127.0.0.1
+[ server_cert ]
+basicConstraints = CA:FALSE
+keyUsage = critical,digitalSignature,keyEncipherment
+extendedKeyUsage = serverAuth
+subjectAltName = @alt_names
+EOF
+
+# Generate Server key and cert
+openssl genrsa -out server/server.key 4096
+openssl req -new '-sha256' -key server/server.key -out server/server.csr -subj "/CN=localhost"
+
+openssl ca -batch -days 7200 -notext -md sha256 -in server/server.csr -out server/server.crt -keyfile ca/intermediate_ca1.key -cert ca/intermediate_ca1.crt -outdir ca/intermediate_ca1.certs/ -config ca/intermediate_ca1.cfg -extensions server_cert
+
+# Generate Intermediate CA2 key and cert
+openssl genrsa -out ca/intermediate_ca2.key 4096
+
+openssl req -new '-sha256' -key ca/intermediate_ca2.key -out ca/intermediate_ca2.csr -subj "/O=MariaDB/OU=MariaDB/CN=Intermediate CA2"
+openssl ca -batch -days 7200 -notext -md sha256 -in ca/intermediate_ca2.csr -out ca/intermediate_ca2.crt -keyfile ca/root.key -cert ca/root.crt -outdir ca/root.certs/ -config ca/root.cfg -extensions v3_ca_intermediate
+
+mkdir ca/intermediate_ca2.certs
+touch ca/intermediate_ca2.index.txt
+touch ca/intermediate_ca2.index.txt.attr
+echo '01' > ca/intermediate_ca2.serial
+
+cat > ca/intermediate_ca2.cfg << EOF
+[ ca ]
+default_ca = CA_default
+[ CA_default ]
+dir = $PWD/ca
+certs = \$dir/intermediate_ca2.certs
+database = \$dir/intermediate_ca2.index.txt
+serial   = \$dir/intermediate_ca2.serial
+policy= policy_match
+[ policy_match ]
+commonName = supplied
+[ client_cert ]
+basicConstraints = CA:FALSE
+keyUsage = critical,digitalSignature,keyEncipherment
+extendedKeyUsage = clientAuth
+EOF
+
+# Generate Client key and cert
+openssl genrsa -out clients/client.key 4096
+openssl req -new '-sha256' -key clients/client.key -out clients/client.csr -subj "/CN=client"
+
+openssl ca -batch -days 7200 -notext -md sha256 -in clients/client.csr -out clients/client.crt -keyfile ca/intermediate_ca2.key -cert ca/intermediate_ca2.crt -outdir ca/intermediate_ca2.certs/ -config ca/intermediate_ca2.cfg -extensions client_cert
+
+cat server/server.crt ca/intermediate_ca1.crt > server/server.cachain
+
+cat clients/client.crt ca/intermediate_ca2.crt > clients/client.cachain
+
+cat ca/root.crt ca/intermediate_ca1.crt > ca/root_intermediate_ca1.crt
+
+# Generate Unrelated Root CA key and cert
+openssl genrsa -out ca/unrelated_root.key 4096
+openssl req -new -x509 '-sha256' -key ca/unrelated_root.key -out ca/unrelated_root.crt -days 7200 -subj "/O=MariaDB/OU=MariaDB/CN=Root CA" -config ca/root.cfg -extensions v3_ca
+
+cp -v ca/root.crt ca/root_intermediate_ca1.crt ca/unrelated_root.crt server/server.key server/server.cachain clients/client.key clients/client.cachain ./
+rm -rf ca server clients
+
+cd ..
diff --git a/mysql-test/main/chained_ssl_certificates.opt b/mysql-test/main/chained_ssl_certificates.opt
new file mode 100644
index 00000000000..bb2f8e1d883
--- /dev/null
+++ b/mysql-test/main/chained_ssl_certificates.opt
@@ -0,0 +1,3 @@
+--ssl-ca=$MYSQL_TEST_DIR/std_data/cachain/root.crt
+--ssl-key=$MYSQL_TEST_DIR/std_data/cachain/server.key
+--ssl-cert=$MYSQL_TEST_DIR/std_data/cachain/server.cachain
diff --git a/mysql-test/main/chained_ssl_certificates.result b/mysql-test/main/chained_ssl_certificates.result
new file mode 100644
index 00000000000..08911b0c936
--- /dev/null
+++ b/mysql-test/main/chained_ssl_certificates.result
@@ -0,0 +1,12 @@
+call mtr.add_suppression("Server SSL certificate doesn't verify");
+CREATE USER 'user1'@'%' REQUIRE SSL;
+Variable_name	Value
+Ssl_version	TLS
+
+Restart server and provide ssl-ca comprising intermediate_ca1 in addition to the root ca.
+Variable_name	Value
+Ssl_version	TLS
+
+Restart server and provide unrelated ssl-ca at server startup
+ERROR 2026 (HY000): TLS/SSL error:
+DROP USER 'user1';
diff --git a/mysql-test/main/chained_ssl_certificates.test b/mysql-test/main/chained_ssl_certificates.test
new file mode 100644
index 00000000000..9d315e94807
--- /dev/null
+++ b/mysql-test/main/chained_ssl_certificates.test
@@ -0,0 +1,74 @@
+# These tests are inspired from the following commit from MySQL Server
+# https://github.com/mysql/mysql-server/commit/969afef933f1872c5f38ea93047ef05c4509c335
+
+# Credits to salman.s.khan@oracle.com
+
+#####################################################################################
+# This test verifies MariaDB can handle chained ssl certificate
+# This test uses chained ssl certificates which is depicted as
+# below:-
+#
+#                      +---------+
+#                      | Root CA |
+#                      +---------+
+#                           |
+#              /------------+-----------\
+#              |                        |
+#     +------------------+     +------------------+
+#     | Intermediate CA1 |     | Intermediate CA2 |
+#     +------------------+     +------------------+
+#              |                        |
+#       +-------------+          +-------------+
+#       |   Server    |          |   Client    |
+#       | certificate |          | certificate |
+#       +-------------+          +-------------+
+#
+# certificates that may be helpful for chain construction.
+# In order to validate server cert correctly, we need to
+# provide the trusted root certificate and the untrusted
+# intermediate certificates as part of ssl-ca. Hence
+# root_intermediate_ca1.crt (trusted root certificate +
+# untrusted intermediate ca1 certificate) is passed as with
+# --ssl-ca option
+
+--source include/not_embedded.inc
+--source include/have_ssl_communication.inc
+
+#Suppress warning by the server certificate verification check: unrelated CA
+call mtr.add_suppression("Server SSL certificate doesn't verify");
+
+CREATE USER 'user1'@'%' REQUIRE SSL;
+
+--replace_result TLSv1.3 TLS TLSv1.2 TLS
+--exec $MYSQL --host=localhost -P $MASTER_MYPORT --user=user1 --ssl-verify-server-cert --ssl-ca=$MYSQL_TEST_DIR/std_data/cachain/root.crt --ssl-cert=$MYSQL_TEST_DIR/std_data/cachain/client.cachain --ssl-key=$MYSQL_TEST_DIR/std_data/cachain/client.key -e "SHOW STATUS LIKE 'ssl_version'"
+
+--echo
+--echo Restart server and provide ssl-ca comprising intermediate_ca1 in addition to the root ca.
+--write_line wait $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+--write_line "restart:--ssl-ca=$MYSQL_TEST_DIR/std_data/cachain/root_intermediate_ca1.crt --ssl-key=$MYSQL_TEST_DIR/std_data/cachain/server.key --ssl-cert=$MYSQL_TEST_DIR/std_data/cachain/server.cachain" $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--replace_result TLSv1.3 TLS TLSv1.2 TLS
+--exec $MYSQL --host=localhost -P $MASTER_MYPORT --user=user1 --ssl-verify-server-cert --ssl-ca=$MYSQL_TEST_DIR/std_data/cachain/root.crt --ssl-cert=$MYSQL_TEST_DIR/std_data/cachain/client.cachain --ssl-key=$MYSQL_TEST_DIR/std_data/cachain/client.key -e "SHOW STATUS LIKE 'ssl_version'"
+
+--echo
+--echo Restart server and provide unrelated ssl-ca at server startup
+--write_line wait $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server
+--source include/wait_until_disconnected.inc
+
+--write_line "restart:--ssl-ca=$MYSQL_TEST_DIR/std_data/cachain/unrelated_root.crt --ssl-key=$MYSQL_TEST_DIR/std_data/cachain/server.key --ssl-cert=$MYSQL_TEST_DIR/std_data/cachain/server.cachain" $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--replace_regex /(ERROR 2026 \(HY000\): TLS\/SSL error:).*/\1/
+--error 1
+--exec $MYSQL --host=localhost -P $MASTER_MYPORT --user=user1 --ssl-verify-server-cert --ssl-ca=$MYSQL_TEST_DIR/std_data/cachain/unrelated_root.crt --ssl-cert=$MYSQL_TEST_DIR/std_data/cachain/client.cachain --ssl-key=$MYSQL_TEST_DIR/std_data/cachain/client.key -e "SHOW STATUS LIKE 'ssl_version'" 2>&1
+--echo
+
+# Cleanup
+DROP USER 'user1';
diff --git a/mysql-test/std_data/cachain/client.cachain b/mysql-test/std_data/cachain/client.cachain
new file mode 100644
index 00000000000..3a2aa6a8dba
--- /dev/null
+++ b/mysql-test/std_data/cachain/client.cachain
@@ -0,0 +1,62 @@
+-----BEGIN CERTIFICATE-----
+MIIFPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MRAwDgYDVQQKDAdNYXJp
+YURCMRAwDgYDVQQLDAdNYXJpYURCMRkwFwYDVQQDDBBJbnRlcm1lZGlhdGUgQ0Ey
+MB4XDTI1MTIxMjE2NTY0NFoXDTQ1MDgyOTE2NTY0NFowETEPMA0GA1UEAwwGY2xp
+ZW50MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtP9k21MRWxut47OV
+CjK9jn+nJHnZ0agpAJbgdvsIFKrkV4v0VHb7m5dURaqV1lF1WhrSmc8k7gcSB32O
+l+6Fo0OToe80KxH3NeYN5YscfnVOtrtbpwEkoYt4CFSn95TpjFrEaF0nZUwg5mJb
++ZZsXzYk60GBA1It9uLMbqWAioRHbLprV6bIn0yDqKlf5JTQRk4JORxw3J66ppWC
+y+4OI8UmuOF4jJx3nWHTmPmtZEA7FgNisW9ReQC46+A8mdJCUqupIq6M7foG682+
+eKarvX1kjlOhL60PeuzazCmaGYTnkYI1wFC6Js6nE9xRTzS0UWR2UhBfgf9/FB86
+dqtD4qnwleW3VbnOim7XnXFrVq7yJ22sBO0KGRLRmBa2RCb8qvAogZ8zzYj/Jt4x
+QBHoqjFjGreaXZod0/P1yxTqgZBAz526WtH5EP4sO7xiFPvQONmrDsWAkG7PBRbw
+QZkpnYyH+IiGWQuL4Xsv8uSK6aKDvnXyvY97xKNQ3R4Nm/U5lsif9Uuw/dJHsIZl
+FkqG5m9p++7Kj5lAfliFtUmOOIHp3Vb3pMWds3muiJ5BH5g/1Ba2pe69GArWPx6P
+e63nhgUJ6DbUcS0xGX4lCeQg9/NPEimIk1CyqIcqSM6WN8//UUSiJuPArHxV1t5C
+Cv1BFIn27BPrTWGfrSEf4YThpDcCAwEAAaNyMHAwCQYDVR0TBAIwADAOBgNVHQ8B
+Af8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwHQYDVR0OBBYEFDE0JF4hyOMP
+qskQdLbeJ/HEDQglMB8GA1UdIwQYMBaAFBvttDY6KgFqqyQy/GPUCB7wjMIjMA0G
+CSqGSIb3DQEBCwUAA4ICAQBgWR9PtXBDD6FPeZPkm5THyopYdueTHQ2MY4zH01mf
+tAgFJUOZGqaLPgnvhN1wd1JgU5K4kRR1MShz9JWo9B72t5PBL3Pr41xrhcoFja5C
+P+A4VOQ8yzQwA+V96Na11iXa+DiS6K3Vv7dp/bhAtWEk+6O/FTSdGdL5GAjbDXtd
+DKadvMx4tSrFZj4MW6V6xe3FzlCbg5ciEruhWUXPoW9XUOXqPScauPumXPJmYcsL
+OSz0br/Wh46vc6c7nYFTQd8UbyXU63/IdbTqB1AbY/uAZ47bzj9vGketKDWtYgJy
+uLFRybDZ5JX+S/p4kNYisfNeBwXr+Jc0ayTzWYnd2JjbIzeKBwcEsgCieT/rYJwt
+tUWcUb2I9936eeb7cBpqAcxaXSSABfqRdP/tIoVZrfEaufIeou/Gvglc1/PlIdlt
+nwURZBrwI6O2wWT6bZIlcM/kvIYpSVRV028p9SpZ9FGgn6aTYGVxcc50waWz6lSF
+WAaFkhiTeSQZugIPzk7SgDVsLQzL0YudAEb6afNTlF/k0qXrjjLsw1PbFJeVKkON
+guHQtkPAQaNgSRSPJtcG8s9+Qtcg8nGLTs33S0bY/BRF2M5v+aGVHTzlF9FNwVPx
+sLwekeDo75H/IMiB2CWQLsQbkwoCNIVsYaDrcfWGvaWt4OUkNKRjSTQ8OgJn4+OD
+hA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFVjCCAz6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADA2MRAwDgYDVQQKDAdNYXJp
+YURCMRAwDgYDVQQLDAdNYXJpYURCMRAwDgYDVQQDDAdSb290IENBMB4XDTI1MTIx
+MjE2NTY0NFoXDTQ1MDgyOTE2NTY0NFowPzEQMA4GA1UECgwHTWFyaWFEQjEQMA4G
+A1UECwwHTWFyaWFEQjEZMBcGA1UEAwwQSW50ZXJtZWRpYXRlIENBMjCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL+xpdkcY7Xg/B+7ct45WHJtvArOwQdm
+vo6itdVRrXEc+MprySGjbLYvm+MB4QhI/e0Xhwvhh/6WAacSF9nu+GiWw02fZ5hR
+KNiepxAua+uxulPUcDapFRUt+w1H0HfB85qIChvJ1f56t+gtvLZpkNmS+p1U5wnp
+pFdIyBVDF3t6lr0Aoa5LRo1mbcB9MT4lJ7uMzcoTHFFQq4ROeyoRnleFGN0tIbqa
+njMBvN6lRpQToPfstQdD4B8LLwwYmJvPYInxJx76QV39PzPOsmq581WCMi49z3B4
+gBLxNP5/QfrXC6DVCFs1aq9SyuclcIcquMvgvrvQ0hI6l5xbvj6DLySUfJI1unCw
+GUdvg2U1DCQN3TPU3j8tHXHQJgp7y9NNCbaLKi60X+vWB3uhWnAzqV+QMvDxbA3w
+4PZobeBOeygst7f3020UVAcRZLpb4l/MJTzdjTVjmPz0I3wenKPj6m19BH+iVabz
+p4jc4wlBZuyBmhQ4UpYuCYzuIh+ki2daZc43UmdDx8sEKBooE1LBnn85pSQNwBuM
+Iu8FdqN/FpVlfnrbjM1sFKvDfm91knGRRQnd4R1WKm8PB0kmmQ6rq5eMc37Gn7oG
+cCWXomCtaVDExZ7MVscPAWVtfTpHKNkHpKh0WjEtO2+qY1Ts3h1EeJMTjp602rTo
+6vlmm8egTvQ9AgMBAAGjZjBkMB0GA1UdDgQWBBQb7bQ2OioBaqskMvxj1Age8IzC
+IzAfBgNVHSMEGDAWgBQEiu6rzWpHMQmM8hx+uT1eOZrSrDASBgNVHRMBAf8ECDAG
+AQH/AgEAMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAFRDs8s5g
+OZu+0XoDGOka5rVEcuKukOd8hM1kx5YXuFOsKISShJywCGtpBbs2acjqEjKMiiME
+uZSAapm/9YwQv1wM3XNqjzypxAl4ibE/5noJR7vDS0ixMgO884pDVdvHYwfw1aEJ
+lxMfDQkY3foMVDLNgkscHtJWH3rQ9icf6ATzvJh03Oxsk/5ku056Fs2hcNzrK0un
+omrycfAEIBikkqlS/OCWAHNp5nBkxcl/ZN1dO5empcbaYIuDSd9d4oPAFkbW3qoa
+cqOYrwWbKjlbPQ1vXmst0KmWnErWurm7e3aSkXzUTLRor12p0pfyydpQ79vNm/md
+uDXzhMc4/xdMQCSHMcVfbD2Oduz/Xh7G5n+NbGHNj1FzChraHj7Mr+/ls6sY8uRA
+oE/xB+Y+BJcJgsghUhulVFnF/tDPWDwHkSiDG8yXxaOr98/hdtdVlk2SZRmhmu5J
+8yVhAyPj/v7dxInQ4aE4AEkEtlSV9qHo1armzyORa9kqKbWUR9h3yba/U65citRQ
+sT7eDkoYueNew6mYcWrh7mCY6HflhM9Kskyem+Ev5BOPjNHyRU/yuSytfOQefa4R
+Zwh4oTAWlPImUlcImnDHaXTlCxu8carg87tk4RNlQX9VhsqJtZEFA9dvhfyCW1k0
+t9zG0FnuvV5vtSrkT/DUEnTHpSbzgO5dpU0=
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/cachain/client.key b/mysql-test/std_data/cachain/client.key
new file mode 100644
index 00000000000..d39b205bfdb
--- /dev/null
+++ b/mysql-test/std_data/cachain/client.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQC0/2TbUxFbG63j
+s5UKMr2Of6ckednRqCkAluB2+wgUquRXi/RUdvubl1RFqpXWUXVaGtKZzyTuBxIH
+fY6X7oWjQ5Oh7zQrEfc15g3lixx+dU62u1unASShi3gIVKf3lOmMWsRoXSdlTCDm
+Ylv5lmxfNiTrQYEDUi324sxupYCKhEdsumtXpsifTIOoqV/klNBGTgk5HHDcnrqm
+lYLL7g4jxSa44XiMnHedYdOY+a1kQDsWA2Kxb1F5ALjr4DyZ0kJSq6kirozt+gbr
+zb54pqu9fWSOU6EvrQ967NrMKZoZhOeRgjXAULomzqcT3FFPNLRRZHZSEF+B/38U
+Hzp2q0PiqfCV5bdVuc6KbtedcWtWrvInbawE7QoZEtGYFrZEJvyq8CiBnzPNiP8m
+3jFAEeiqMWMat5pdmh3T8/XLFOqBkEDPnbpa0fkQ/iw7vGIU+9A42asOxYCQbs8F
+FvBBmSmdjIf4iIZZC4vhey/y5IrpooO+dfK9j3vEo1DdHg2b9TmWyJ/1S7D90kew
+hmUWSobmb2n77sqPmUB+WIW1SY44gendVvekxZ2zea6InkEfmD/UFral7r0YCtY/
+Ho97reeGBQnoNtRxLTEZfiUJ5CD3808SKYiTULKohypIzpY3z/9RRKIm48CsfFXW
+3kIK/UEUifbsE+tNYZ+tIR/hhOGkNwIDAQABAoICAAQY2eQbE8P/suZ6HLAP6PmO
+Sy7IsVUNHOx9/dPDp/Gr0qJmsR+uV9C0UryG+YBR9LmW7Nh9d2UJ9O8FeRJYXF8P
+OwrJ2uD0tadbL0pYZUs5hZAeWptDq9waR5vMqsawcL70GQkRvsAMwpvkcxeJv6dC
+FwDaSTzVgePaS21fwrKf/uvnpmFkDZuJhFtvhhOrCLHmt0+7JJTh5PC7ZqwOFfTa
+VB+QPwXTzuNZoQwP7sxbpdrANd41Wl9GVGlGeKi0uTqc1yXJVLhYVgrFa//YKgAO
+lBWir/3fyX9rWCKR+IKGXyWMkIHrceNJ/z80WATWeRR0lTcTVs4fBfXjJRQlmVJA
+7PkhK3wuhK7AR9B3ErT8H0eGe4pvouTvWD0gw4xjGfsFPyZuMAoHTFHss9SfDM4Z
+5yAxCX2TYw8eE7ZZ8A7DmDAyfn6PEaI8UZQ1zCtcxTwW3mrj8zwKfEiw4Xt9igCq
+EQaXFUtU2W8J2RaZC414THiD05LtYCH3rUlBAbZbH2nlin6s67BovU8P6EVDPb4F
+HIY0xa4KeckHtdFp+EH3eado5KvRr9xk/Hlju+aAV6xu18/T91RhSxktEcG7KGXB
+469RA47uuGRw//WYfH1B0avOLKe4UgCedUK/xU5jwQR7KifJHhc5Lh3xBSrUsGnx
+zhv9ibTWsJkx5AyEZMopAoIBAQDfhXxGLqRm7cNZF6zxjbozb7SCqOQ9XNuKYC0B
+2LjBbN4mKQrqNpetwkrbOlTwEOzDM5+jc5KgwHGJk43k6F1QqTo/2OR0QVNGZmgW
+5xat/KY6Cpeld2i1QPJ++r8ICDWHMhkwN2Sp36GsAoz3MQJQ5H+a3zBRvDImyxev
+rPzvJRsPKtnK/9rpNg7Twnzn2mLSM6tnmSy2dQWLRK+8A3/qW65/87KbQ4cGiLPy
+f4dGCS9XLMzBH3OuZIDuqQqcOFdZezIrOtNJZH+S1I+Xr7tNlqpFAg38S2uXg3xc
+iRaKuPBAvsZy5X+e0ylWm+sRuidiUx6zCoXcPUaADTjk8zBpAoIBAQDPTB17MHOL
+gLLmtux2sKXqrpmdFngPTpOD7Sbq/OzeuaA6ZPzRYZsYAbeuy4yAP5kR0vg/FrmQ
+8JTeCBYTYNhLKYXkBE+zXOtelrYovKBwaLFok9LHqTXsZ9GuRrlaQY35IwZpf6H0
+/1vNbgh10vSLs0uTA+QM0NsVMt2gQSbcW+v8WFaI02t8fOo5WdVvnYrNAUhHtW4/
+lBPaIuM/xZOfePozEJfEE5See/ZI/8OX0C3DCKdueRW3C2rPMGuPzpqPWmNwUDMc
+QhcMHmrdCXvAvTdXohApkZz5rlsQoP2KDtvZlhOEHlSYQNLHvO3QkJEj1YlGs1Rw
+K3V4vKamb5ufAoIBAC8Lx4Z2FsBbVvyPkSUecYyV/GZr6e5IdyT+7TowRWLg6Tka
+9mMprm8yL9NIycvlpA/J89XRY5FWMA+G8Ry3E70AgXQi0KLvhPmSYGJBrXJddRdO
+V3DKW02bJ+82E7M7FxknoEmXvyZKHZs4xjbZJ+Wi0oDkbSUm+V9U691cCbjEFJfy
+qvihNZBUgnZrvyKFwrr/iRo7EUAuDUas5FgsXGYVefsQbg1j/y2O5GEsGmrRUBeH
+JGmZlx2jpceV6NfMvAXnej3DGemer4NWHgsNP90q0xfHQO5TaYfwcuJ/MDFuj5Lx
+FI/mYiApzc+e7bFDfzqgyBtjIZ2jgA0/uzPlQ9ECggEBAMhgZdrvMbE2PTggt5/f
+DvIzxc7/qhv5s0QB1+2rgHembMglV/A47gcdmeT/YpeRYi/FgyrQl50PwIaCwHwI
+z+qPf5mxxSy2c9lhy0DDXD5sJJjW0xcmbDZRAHD6ci5ZUZfyED+oHPBKaf3AD7N8
+r9/d9v5r82Oj+zGZkntWnu7Ad/LbnQHzg2G5CVtYh6S1Xzbct3aBXMleJHZl5M5+
++DxdX1Q/BMSGvNEZOC7F89XqaGGvGtEBgEkIYz1VK5O9fM926snk7BKzm72eJWP1
+x8a94CH4SLE1zMvYirQfOhTaWg8QL1s1SkZF2rkx2ZsSMwm1XlWWANfQWmPTzy7w
+kTcCggEBAIi2uhi60gBDrJ3xIPcXQC6YHtDHA/7p6XNFnp9Nx/9He7tPIULgH7AS
+MbLza+etC45w2mc8Ypqy+w2+a44B8FnWpFZ3ff3fi9IlV6CHM9D0OrnL12GAnmOG
+gUXEBPW4Kk5k8kVRyhw9If38qrh9IW7oSifUiYNdiDgoViv9ZTgw/ZWYiU8krqF9
+sPQlnzdhxhNu7TIEBu8iY0t0dh53f6PPlVWwKAHawyo+UXypM7MGNTE1AP0E+x+a
+mUXVjbI5oCrs+mSFpjTA6BrP2NHHrIA+qPI8dchy7LIfXjOnW+2g0m85F7U/Egd0
+0txeBq/S0KIBpAsLK5G0aqD+qASd630=
+-----END PRIVATE KEY-----
diff --git a/mysql-test/std_data/cachain/root.crt b/mysql-test/std_data/cachain/root.crt
new file mode 100644
index 00000000000..55f6f4d51fb
--- /dev/null
+++ b/mysql-test/std_data/cachain/root.crt
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFXTCCA0WgAwIBAgIUMS/WV2Y7lwQy/yLQDAFU66GhILkwDQYJKoZIhvcNAQEL
+BQAwNjEQMA4GA1UECgwHTWFyaWFEQjEQMA4GA1UECwwHTWFyaWFEQjEQMA4GA1UE
+AwwHUm9vdCBDQTAeFw0yNTEyMTIxNjU2NDJaFw00NTA4MjkxNjU2NDJaMDYxEDAO
+BgNVBAoMB01hcmlhREIxEDAOBgNVBAsMB01hcmlhREIxEDAOBgNVBAMMB1Jvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC74Ifa/BBjtlkdANjj
+8IWn8+RL9/CODm5xURmWfJSzW4vebZZPGwkd3J5grTW3Zr+XGpXfbFPwC63pPDAu
+8CzVXCDNSK+Fa2usoLsnYW2CmxeMqrUeBVZk4YCZ0ztjwvvZkwrbN6L/uk0OMpy7
+T6c0lxysMAuTXYPGY8NNDW0tpKh2LbxzGsAkREbM17vAHveHyiJ8YmWHmUeujqir
+IlEcClTVEqSR8sWDwu01W/aD9u9wY1CJZyTNF3lJPZ8XqNBVZ89Ydl0y7W1oXOno
+b/6CTZYUxMQ/xUL00L1i+VcIKjV8jZFrFyrjJsnGlvqLlzUQ3dwFKJISIMcF9Jb2
+PnZTGNjhzROil3zrItjKTbScgLiWuqAh8YNmRRisDIlkMr8kFU2FjznrMkFP3LK8
+BPBKKwNaYzcbeR6xwMgj3rJvT5PDk0ffBn/hjyhgpVJfp10hvkFtV2kSE/ttmU0O
++SQXgjXxsPs9223oTgjxt5FfZei+mdOJ69G6/boupF9eYpKe0cNLYnF0V+rFoxiK
+LFUQhNMJVDBca/cp791N9Nb1bhKSHnR+zQNQjBH4BAmWKzuzKLrt3L6QKK59xyy9
+HdbM/ohbEEKialgm/Lwrr+olcpyPMwujM5B0r9B+Z4b/oPEIsncNpCl553r7YQZ5
+P9PYiJ/kOBxCwnYeYlwk+KygNQIDAQABo2MwYTAdBgNVHQ4EFgQUBIruq81qRzEJ
+jPIcfrk9Xjma0qwwHwYDVR0jBBgwFoAUBIruq81qRzEJjPIcfrk9Xjma0qwwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIB
+AD47H7tlk1aWFEf1UK9Xnh2hELTSXX3/uE5Sxx32DINTL2wcqiLOgxTMEaNr1EeF
+dCkuADFclEsJfh+mWmhRsD7KKKlq4grMX9jTobfj0sd84M+d+YgkqAlP9f9b6QrX
+e9pv2FVCL467JARWSZRuLJ7SZOHK88ajNnAG36LFdtXBDOAcogtddRfAil/5PMP4
+HIgZQOG96h0yMDoIJB1RIicf8f56xsC5m1Jbz4B3V8rPcCGK9CKWLrgd0FiXZV45
+GMuXLsOfEaUEtMz/gRIdQlMHgTWk6Inprm9wynL51J0gE3BZIm26G1gpae3GcG5Z
+q8BQQbQfn6Tg/H8a+56H1CDclt9qQjRMRDH81r5w7hK1LvjKrEKjdmzmxaPAqq71
+Ne5gXJxYjgSwpFB5MYX4K0Do2zoqE7HhuGc/0oWhm0IrAy616tOZtmopoNiYoJ88
+xjHXRCKs6w6vPsNew75u5N7mU7IlCXjxVSF6cSyRd4fnBY3kRxZPJWlOe8jsIuED
+PZYfAI+10nOGNY7c3scvxgZCnNU0THryem0PNIM0XaM/fR+SH+Kl+V9x14sDouIS
+B6gCYEk2oZW7EdfLN3FXFufoIPNsR1KkDsh7RKYamMVlSsGEEFPt3h9I0c3kAaOT
+FHZ29DjuAuSGaEvs4NiOsYmaQP51BM1sFs/gkz678KZy
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/cachain/root_intermediate_ca1.crt b/mysql-test/std_data/cachain/root_intermediate_ca1.crt
new file mode 100644
index 00000000000..bfe207adf48
--- /dev/null
+++ b/mysql-test/std_data/cachain/root_intermediate_ca1.crt
@@ -0,0 +1,62 @@
+-----BEGIN CERTIFICATE-----
+MIIFXTCCA0WgAwIBAgIUMS/WV2Y7lwQy/yLQDAFU66GhILkwDQYJKoZIhvcNAQEL
+BQAwNjEQMA4GA1UECgwHTWFyaWFEQjEQMA4GA1UECwwHTWFyaWFEQjEQMA4GA1UE
+AwwHUm9vdCBDQTAeFw0yNTEyMTIxNjU2NDJaFw00NTA4MjkxNjU2NDJaMDYxEDAO
+BgNVBAoMB01hcmlhREIxEDAOBgNVBAsMB01hcmlhREIxEDAOBgNVBAMMB1Jvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC74Ifa/BBjtlkdANjj
+8IWn8+RL9/CODm5xURmWfJSzW4vebZZPGwkd3J5grTW3Zr+XGpXfbFPwC63pPDAu
+8CzVXCDNSK+Fa2usoLsnYW2CmxeMqrUeBVZk4YCZ0ztjwvvZkwrbN6L/uk0OMpy7
+T6c0lxysMAuTXYPGY8NNDW0tpKh2LbxzGsAkREbM17vAHveHyiJ8YmWHmUeujqir
+IlEcClTVEqSR8sWDwu01W/aD9u9wY1CJZyTNF3lJPZ8XqNBVZ89Ydl0y7W1oXOno
+b/6CTZYUxMQ/xUL00L1i+VcIKjV8jZFrFyrjJsnGlvqLlzUQ3dwFKJISIMcF9Jb2
+PnZTGNjhzROil3zrItjKTbScgLiWuqAh8YNmRRisDIlkMr8kFU2FjznrMkFP3LK8
+BPBKKwNaYzcbeR6xwMgj3rJvT5PDk0ffBn/hjyhgpVJfp10hvkFtV2kSE/ttmU0O
++SQXgjXxsPs9223oTgjxt5FfZei+mdOJ69G6/boupF9eYpKe0cNLYnF0V+rFoxiK
+LFUQhNMJVDBca/cp791N9Nb1bhKSHnR+zQNQjBH4BAmWKzuzKLrt3L6QKK59xyy9
+HdbM/ohbEEKialgm/Lwrr+olcpyPMwujM5B0r9B+Z4b/oPEIsncNpCl553r7YQZ5
+P9PYiJ/kOBxCwnYeYlwk+KygNQIDAQABo2MwYTAdBgNVHQ4EFgQUBIruq81qRzEJ
+jPIcfrk9Xjma0qwwHwYDVR0jBBgwFoAUBIruq81qRzEJjPIcfrk9Xjma0qwwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIB
+AD47H7tlk1aWFEf1UK9Xnh2hELTSXX3/uE5Sxx32DINTL2wcqiLOgxTMEaNr1EeF
+dCkuADFclEsJfh+mWmhRsD7KKKlq4grMX9jTobfj0sd84M+d+YgkqAlP9f9b6QrX
+e9pv2FVCL467JARWSZRuLJ7SZOHK88ajNnAG36LFdtXBDOAcogtddRfAil/5PMP4
+HIgZQOG96h0yMDoIJB1RIicf8f56xsC5m1Jbz4B3V8rPcCGK9CKWLrgd0FiXZV45
+GMuXLsOfEaUEtMz/gRIdQlMHgTWk6Inprm9wynL51J0gE3BZIm26G1gpae3GcG5Z
+q8BQQbQfn6Tg/H8a+56H1CDclt9qQjRMRDH81r5w7hK1LvjKrEKjdmzmxaPAqq71
+Ne5gXJxYjgSwpFB5MYX4K0Do2zoqE7HhuGc/0oWhm0IrAy616tOZtmopoNiYoJ88
+xjHXRCKs6w6vPsNew75u5N7mU7IlCXjxVSF6cSyRd4fnBY3kRxZPJWlOe8jsIuED
+PZYfAI+10nOGNY7c3scvxgZCnNU0THryem0PNIM0XaM/fR+SH+Kl+V9x14sDouIS
+B6gCYEk2oZW7EdfLN3FXFufoIPNsR1KkDsh7RKYamMVlSsGEEFPt3h9I0c3kAaOT
+FHZ29DjuAuSGaEvs4NiOsYmaQP51BM1sFs/gkz678KZy
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFVjCCAz6gAwIBAgIBATANBgkqhkiG9w0BAQsFADA2MRAwDgYDVQQKDAdNYXJp
+YURCMRAwDgYDVQQLDAdNYXJpYURCMRAwDgYDVQQDDAdSb290IENBMB4XDTI1MTIx
+MjE2NTY0MloXDTQ1MDgyOTE2NTY0MlowPzEQMA4GA1UECgwHTWFyaWFEQjEQMA4G
+A1UECwwHTWFyaWFEQjEZMBcGA1UEAwwQSW50ZXJtZWRpYXRlIENBMTCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBALkW2aNhcIYexlXlPUth4nxSID4Oa1H2
+lMxfonge5Ww9nlFmr+DQFgIWeY47ibY5zOxNy6P0Q7iXVNnX9TWPcz57Lfg4Bnrj
+/BzoJ2/dWYo1tdkYx6JLqFV7fT+mMivXAfzYfun6FF9dVJfqPAsu0TwGVJpt83ji
+02P0yCagweDAnfVHdBFEKcLimcNMJh2Kf2gz1dUZoa3sEI3q/9GZYEoBxv7/jVMZ
+s1WnSGXfJpLkZNxXY/btsiCl40K1T/tj3pz8oMDQ5Ew2UzOYZECayXnF7fCmdmis
+ffSk7OW+6OV3I4e/jwT25h+aI8GL/uipOTS8EiilGJkl+0a9VqWs0SuzjwfHbuOJ
+XP1KflVTOej6qex8MeQP7w8dw5boCRUkEEftT5fF0h/keidsLzHkwZ3LZVTPEGwc
+Rw4fTJniy7eAb5LSsfFBXhH8bPSmw/xFErKytxrY9CD7oK6tPnT/dXNjQRM0e4zG
+cRtRpl6oCbIzWdhivuJlR6FVwg1OcU6PnuSAtV7u6YZ25vPlH7VK9Dc++84k/ytA
+7u5OOIHLg6MRiNMwNeCo4d5PpixFM2fD5C+iOz4kQedRzej8Q2/i06H+zP3qIt9V
+lee8xi8MLfZt0zsjfYMRDWgnQG+g3ISRhjCGduoLiVCJDGOdNQT6TKVW7hvc0TkQ
+bzj2+BDcyzYFAgMBAAGjZjBkMB0GA1UdDgQWBBS5EWzI/eI7TuAsZDv5XXgSz+xU
+jzAfBgNVHSMEGDAWgBQEiu6rzWpHMQmM8hx+uT1eOZrSrDASBgNVHRMBAf8ECDAG
+AQH/AgEAMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEApKU4JBjL
+8/HxxKv6VxdZdxgzisr48wopo2or9DzJFzJrTDHgKbt6QHnEAZKRMaTn4+lIwAbM
+XGlOjId1LXnLoMO+ya6Pu4ESjNSRyXVRUU+JhNL3kAWZSx5m0JnoVXSTIDBWcPq6
+1LFsoRBxY1Bc9S2LCpsvErNeKEPa570oDeE3pPkZkVXA1vntPkg6JzrQZkmfJiAI
+5+iqvcRzYi0lAU+CSUS0J674mT9IFFYeer5qe1T+LYGiWRlLfTvGolk3+2mQA77m
+x8R+liNKhrwO49arVkCwH+glut+Bizd0dkomb/8Vj/ZtDCpu9c3+WqiP90Xkd0uY
+AY5vBT91drPV7hmccVBKZvYTO5zA9okrjnjwpG842CtieQ8OivsTDQ4knDvMA7X2
+29CYtKKx/4OmbAWJfB/1gfoQTUS1JsI9JwFV1ArfVCC3nVV/bxlAV+ThvlhYA+Ru
+RAh9DpHDZ0s5tbHjuYGgvQaD+11qKf3LUxwl44hJfEk64AmxA6uTzE4l36SnCZW+
+a68TnhdlH0JooGNFK/6PRfFzONwIn29PlWN+ApZwSDmCexxo49ygGgRNE/ry/Ec0
+V9vmoieOq8sUlRtYuZPdPGVS5q7ghsghkkk95VkdJ2DAROTJhlfgXEOH8mUDvScy
+wzJ8juBHAKg9M4albgBgoNUeUgw7glBXH8g=
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/cachain/server.cachain b/mysql-test/std_data/cachain/server.cachain
new file mode 100644
index 00000000000..fb3688d263b
--- /dev/null
+++ b/mysql-test/std_data/cachain/server.cachain
@@ -0,0 +1,62 @@
+-----BEGIN CERTIFICATE-----
+MIIFXjCCA0agAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MRAwDgYDVQQKDAdNYXJp
+YURCMRAwDgYDVQQLDAdNYXJpYURCMRkwFwYDVQQDDBBJbnRlcm1lZGlhdGUgQ0Ex
+MB4XDTI1MTIxMjE2NTY0M1oXDTQ1MDgyOTE2NTY0M1owFDESMBAGA1UEAwwJbG9j
+YWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAoiFgd9lQ/0nc
+EigR34t7kuOfLbk4mV4Fi3xTyEossd3YbXsU+3ghxztpsebXMz9SsshoCBRNcH5V
+qrUA4KGZ+CpyxgUaJionNxakvYT+Wmrp/A59ue3t4FNQFdncZi6RfVCqSgiLPTDK
+ZM85/w2Fw0gorYSCAp7fo+5nJOaX0KdcvLCL3v9ji0wYPn2T8mF+0iJlyIAf+zpB
+lJa9jb5jEVloaN7nXZgb4MRsEyp6d3XhofWDzUhFMSArDSuQ87XDtN/WT3b+/Acd
+SCFwSWWHxkWyyTxtxSg8yeuQyOZo3lWvAnOgD8k6nb2+anMD3BDBksJoBDrLIOm0
+353j0rUNvvamC+c5dowxSCyGDARNHPbZ++ZTa0uwlcS92KrX2b2Y3HCZ+5F6bQ95
+XA+qtR+zWy9rfsalkHiAR7FDYj/gn8g73BuCAgtXib+4f6Qjya+XJBI734sV17Kr
+zezFckiUTW7fmOWj6zR1bNobk6c73ye+umwXLCIAxlFs7LOgbOd/Wp6jgyNFDp7l
+MeHfRjjWBEKvbCz7CJEMRJYcxuN2UjoxIVqiU0+BDC/Gyhui9+XgBnRnQWjUXIW6
+/RjBBe3dZmi2vfEUy532qg8EbXAHOBbJEyPYQ1Z5zC5juHJLe4aeo8NvLh4Xadp7
+8fChxB7dNduLe5yFZ+6a4sPySL1206ECAwEAAaOBjzCBjDAJBgNVHRMEAjAAMA4G
+A1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAaBgNVHREEEzARggls
+b2NhbGhvc3SHBH8AAAEwHQYDVR0OBBYEFKSBD7mJScqWEJMqEmuMWZFeQZ8aMB8G
+A1UdIwQYMBaAFLkRbMj94jtO4CxkO/ldeBLP7FSPMA0GCSqGSIb3DQEBCwUAA4IC
+AQCctxHJgQH1ybfuRA7bygjtKg75sjSLSalfO14QcxQw0O4Wcz2S+r/hZD42Ukn5
+cLqh5PBeGwALzSa88BDlqBVSKBamjTdw2xa14RmAEpa/U0WMcFMRRmHmi+do26se
+vSSz4Zqg2YOTdzuBYz+L7DVDvEqQrT55Gotbh4NBWaGfM7qiCeEUdPmT1BoUpnlG
+CpG18hcnAbRR2DdBICs6SMBqPGF5nef+wikEXELZ0tDdqtdN/rewtJc7Rm+x2j0g
+FosrFQkXUt4aQomXVv8IJ1gN4dhxFx/Y8LFbPz1w+j4NiKDmK1EJFHX5m86YNz+w
+99KdIghwo/ChbtFL0+nyQbYD1z4a1qUfnoeuw+PAiRKMRJiHcHFQhkKd6kD46Kuz
+qXKd+b7SrOROj2/ws7Bq94JhQ9xwfKr9VxxvyCd8m8/Ev6YjFEexZRaXvteiTCT9
+/0vob7yRWgMllr/zeYV4hUrYk5xnIUamVSBJmerpf34HCB3+YNdM7QlC5OoP15uu
+cBkSVKCrs8GQgFFz5yZnBsV7Z0ZUL2+15+/Kz+W+6Rs3OzDdUnvby5MiRpi+m9kI
+gDjdfDkL6WjN145i9fo5X5SZp17fbhlNgwtguB051g2noxje4XGQarVGzUVvlsNT
+gD/tFYB4JmVuDPdmdwAy5aZCbpcoApzN7tGWm6fuTcVGCA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFVjCCAz6gAwIBAgIBATANBgkqhkiG9w0BAQsFADA2MRAwDgYDVQQKDAdNYXJp
+YURCMRAwDgYDVQQLDAdNYXJpYURCMRAwDgYDVQQDDAdSb290IENBMB4XDTI1MTIx
+MjE2NTY0MloXDTQ1MDgyOTE2NTY0MlowPzEQMA4GA1UECgwHTWFyaWFEQjEQMA4G
+A1UECwwHTWFyaWFEQjEZMBcGA1UEAwwQSW50ZXJtZWRpYXRlIENBMTCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBALkW2aNhcIYexlXlPUth4nxSID4Oa1H2
+lMxfonge5Ww9nlFmr+DQFgIWeY47ibY5zOxNy6P0Q7iXVNnX9TWPcz57Lfg4Bnrj
+/BzoJ2/dWYo1tdkYx6JLqFV7fT+mMivXAfzYfun6FF9dVJfqPAsu0TwGVJpt83ji
+02P0yCagweDAnfVHdBFEKcLimcNMJh2Kf2gz1dUZoa3sEI3q/9GZYEoBxv7/jVMZ
+s1WnSGXfJpLkZNxXY/btsiCl40K1T/tj3pz8oMDQ5Ew2UzOYZECayXnF7fCmdmis
+ffSk7OW+6OV3I4e/jwT25h+aI8GL/uipOTS8EiilGJkl+0a9VqWs0SuzjwfHbuOJ
+XP1KflVTOej6qex8MeQP7w8dw5boCRUkEEftT5fF0h/keidsLzHkwZ3LZVTPEGwc
+Rw4fTJniy7eAb5LSsfFBXhH8bPSmw/xFErKytxrY9CD7oK6tPnT/dXNjQRM0e4zG
+cRtRpl6oCbIzWdhivuJlR6FVwg1OcU6PnuSAtV7u6YZ25vPlH7VK9Dc++84k/ytA
+7u5OOIHLg6MRiNMwNeCo4d5PpixFM2fD5C+iOz4kQedRzej8Q2/i06H+zP3qIt9V
+lee8xi8MLfZt0zsjfYMRDWgnQG+g3ISRhjCGduoLiVCJDGOdNQT6TKVW7hvc0TkQ
+bzj2+BDcyzYFAgMBAAGjZjBkMB0GA1UdDgQWBBS5EWzI/eI7TuAsZDv5XXgSz+xU
+jzAfBgNVHSMEGDAWgBQEiu6rzWpHMQmM8hx+uT1eOZrSrDASBgNVHRMBAf8ECDAG
+AQH/AgEAMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEApKU4JBjL
+8/HxxKv6VxdZdxgzisr48wopo2or9DzJFzJrTDHgKbt6QHnEAZKRMaTn4+lIwAbM
+XGlOjId1LXnLoMO+ya6Pu4ESjNSRyXVRUU+JhNL3kAWZSx5m0JnoVXSTIDBWcPq6
+1LFsoRBxY1Bc9S2LCpsvErNeKEPa570oDeE3pPkZkVXA1vntPkg6JzrQZkmfJiAI
+5+iqvcRzYi0lAU+CSUS0J674mT9IFFYeer5qe1T+LYGiWRlLfTvGolk3+2mQA77m
+x8R+liNKhrwO49arVkCwH+glut+Bizd0dkomb/8Vj/ZtDCpu9c3+WqiP90Xkd0uY
+AY5vBT91drPV7hmccVBKZvYTO5zA9okrjnjwpG842CtieQ8OivsTDQ4knDvMA7X2
+29CYtKKx/4OmbAWJfB/1gfoQTUS1JsI9JwFV1ArfVCC3nVV/bxlAV+ThvlhYA+Ru
+RAh9DpHDZ0s5tbHjuYGgvQaD+11qKf3LUxwl44hJfEk64AmxA6uTzE4l36SnCZW+
+a68TnhdlH0JooGNFK/6PRfFzONwIn29PlWN+ApZwSDmCexxo49ygGgRNE/ry/Ec0
+V9vmoieOq8sUlRtYuZPdPGVS5q7ghsghkkk95VkdJ2DAROTJhlfgXEOH8mUDvScy
+wzJ8juBHAKg9M4albgBgoNUeUgw7glBXH8g=
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/cachain/server.key b/mysql-test/std_data/cachain/server.key
new file mode 100644
index 00000000000..019006f3bfa
--- /dev/null
+++ b/mysql-test/std_data/cachain/server.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQCiIWB32VD/SdwS
+KBHfi3uS458tuTiZXgWLfFPISiyx3dhtexT7eCHHO2mx5tczP1KyyGgIFE1wflWq
+tQDgoZn4KnLGBRomKic3FqS9hP5aaun8Dn257e3gU1AV2dxmLpF9UKpKCIs9MMpk
+zzn/DYXDSCithIICnt+j7mck5pfQp1y8sIve/2OLTBg+fZPyYX7SImXIgB/7OkGU
+lr2NvmMRWWho3uddmBvgxGwTKnp3deGh9YPNSEUxICsNK5DztcO039ZPdv78Bx1I
+IXBJZYfGRbLJPG3FKDzJ65DI5mjeVa8Cc6APyTqdvb5qcwPcEMGSwmgEOssg6bTf
+nePStQ2+9qYL5zl2jDFILIYMBE0c9tn75lNrS7CVxL3YqtfZvZjccJn7kXptD3lc
+D6q1H7NbL2t+xqWQeIBHsUNiP+CfyDvcG4ICC1eJv7h/pCPJr5ckEjvfixXXsqvN
+7MVySJRNbt+Y5aPrNHVs2huTpzvfJ766bBcsIgDGUWzss6Bs539anqODI0UOnuUx
+4d9GONYEQq9sLPsIkQxElhzG43ZSOjEhWqJTT4EML8bKG6L35eAGdGdBaNRchbr9
+GMEF7d1maLa98RTLnfaqDwRtcAc4FskTI9hDVnnMLmO4ckt7hp6jw28uHhdp2nvx
+8KHEHt0124t7nIVn7priw/JIvXbToQIDAQABAoICABwyzur5Zp+IMpkL1BP72AnT
+wh87PE9cbX11qcLHt99VtOtRwXP9UG6s9DSncB1vMYx707A4C8H5jx/KLHVlVfi2
+NVEgmQwzP6/SpeN6ipyiRMD8qjxY2AswoliylCVHizFvArcupj0Fy+Xdrvof2Xh+
+B+kqB0y6Yi5KbDEcVCJLwZLl5+XoqGEVYpAX2lAJSfv1VJubQTS6TKax0xUgnG1r
+jf/TaQ07w/mDYEKzHCrD23MGVx6wp6wkKqi3P5ZLsla2qbkXesDN4fdmLXfuiz9e
+ZvqeIn9sgKoj6QIwJOQqpe44uwmT17iQxFoSWAUB+xDx9BJsQWEflMBh3zqKF/Is
+Le+QguZEWbgZ4Y4MpM/VpyJ/LOf2OtOI77LuAhsl8D77ZSWHfzAP4eN42v0ob9d4
+55vfXPkR1KehJWLY8hWnRu4NAXV/VOX+IZq+Ggld59kl/gc3csh1ivAPkDgeJRJ7
+KgVNZvHwYsFOxHv4P8PXOZt0f2OCj42zU5dFUlv+e2mBxYv8T4BlRRu43CVCVdx7
+kwG68WuRYGNMuJbDs+NTROuwxcp/bQtdw7kpfD+G7vHRb46dB4fQhD8gRz52iAPR
+4646ELPhEHPra+3dDP4X/MrzkvwVLDoi+/a2dhOLlrfRNX0PZLq0iMLTwkdLhJf2
+B5N3XAPKHv/5AWdBqy95AoIBAQDczsWnj2EmDqviT0PxB9652XoHuHhnX4ZfnQRb
+Mv7j5aVd+Q2HnvyYg1N6OVlcO9h2G7olHFpKledS2NcIFm/8W1y/crpQ4ZtKnlEb
+2kJxNCuhsolUaR/Fk4XMHC3B9Xy6oDW/HP1/Iadtc9MxuFK4fFRUzQW1KVk3ilDD
+sseHbHM6dQ6SR3D6zcvCMpKp8rDTECdlRlPgjoRFlVhIzEpykiqZ2pW1D8I041cY
+RdB1rilYiRqeaupd36Y/tdm6/RlKLA0k1Dtwrz1bBBGERzKNiZe6wyrOmitJMWST
+PRMoLU84qt94UnEJIxCBzG6pb+zOqv/tqBxJNmSHnpKdeNmNAoIBAQC7+H9GBWhB
+lVUo4ZWjj+Lrn0Rs/KSNLhubXJiTlPkIz3WP4U9/HHrCt3ob6AJyBNkHVSnMcpMK
+eFR+D4oqh3sglz1jMLMCSYXGYSqkbvUDifgvVXC6ILXlw6dPKA5yiaUMriUkhcxF
+QIIXcFzCA/e40GdS6Svq5EoUL22jxx8eTfL3AbBG7p6lQloke9yGIzFEFd5KBXrO
+QCF4XNx0zlLbZAJ47DsIT71hEGn9uonn9WMOvkUNZ3Y4QCTJM6CWOXeaUzbLZnyT
+R9/JTqgDRJsL+UPcY4q7UgRW5Lz+J9esKA8/BEPB7TdnxIqYKru7Ezav7ditKHC2
+NTnQW5D0G7tlAoIBAAjf3p3Pa24mJM5htS9Yy6DYlsj8pwowkqwBGY24zPnH3w+Z
+1OtgfnJ6xL4i0+6bESYeEysuqopY4AU6ZdoTXMjduyqOp+JcTut+1W+zI/x8xkwn
+atGTsA020qfTchtbjHnLup1FwwJ7DcmeYByddeWoSZNm8hXH5agPzRMwekh9GVx+
+G+nRKT9LSicx9ScTc/vnqE2vt+tMjxBk4jl6zHsyWLf6Sw4N5hZOFNAK7kfsigje
+6cz4Kxc+x+XDn06eoYeToaubRBBRWrvvu+x/GA8MOqbs9Sl8lMTKUWqBh+WTfJ2g
+cH7bgWOGn0E4QDJbJz9fLA4XNZvTrdKtkuL1WnkCggEBAKZxOMmY2iNQhvLHJYiK
+TSXUhnN3FoIItNtSF6x+ujFJ+lBn8sucPTuT2aVCQIATuNUcXQGy5m7b8/0X54EX
+LDjEks/0/F1nGvR5b5fgxEXY8pF/N20or8h/AfQ+hOR461QaE7uOWj1sDIWSsh/+
+AWl96C/rVj8M3GeZQ51FIVHlNeHwddWpT4MICOfLYY7JNMOUFZw30/Ezqi95EqC/
+XXD00peenfsTGJ8NOL06YwipKYiRhHWFCpJugeRDOcwroLNfQeLDokWL3CXV50HV
+ivEETEmnPt31lvAWZR8rynafljh3n0PluCzDRPHOzSKutbr8geN6Lqu437OWkPkG
+YV0CggEBAKePJ2GJeq5XzrKJYsCKdbUfutGmLdesoYziRAZ+hfLIi2SfjH8Gz+Qf
+T7GpmcNmSK8Anr7Em+2tUgnf6afbEUedVny2g5iqmkKcbg4A8py3EUW6Gns3J/ag
+R+uddhtrC9TZoKToqlwafZj4RrqUcvBkAdhiErvLCiJJVoU/0aRy7FTc2o5/UnTm
+T0Utou4d0PxyrPjUZB/lHOsdshPlx/Gplg8AH0dBEkmI2e1Pt3WCnnVj0Nol7kTY
+9eFgma/3kaPPVTlSRovl4inxcf5qn0FhnzN0yd/YRsrM5RV5lHAtpyXSqtF3BYpJ
+By7FxU8G7cnqto61l/KLwxdIeAZFui4=
+-----END PRIVATE KEY-----
diff --git a/mysql-test/std_data/cachain/unrelated_root.crt b/mysql-test/std_data/cachain/unrelated_root.crt
new file mode 100644
index 00000000000..ae98e874942
--- /dev/null
+++ b/mysql-test/std_data/cachain/unrelated_root.crt
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFXTCCA0WgAwIBAgIUeQKcZZsEZFZt1xhFkSikz0lYh+kwDQYJKoZIhvcNAQEL
+BQAwNjEQMA4GA1UECgwHTWFyaWFEQjEQMA4GA1UECwwHTWFyaWFEQjEQMA4GA1UE
+AwwHUm9vdCBDQTAeFw0yNTEyMTIxNjU2NDVaFw00NTA4MjkxNjU2NDVaMDYxEDAO
+BgNVBAoMB01hcmlhREIxEDAOBgNVBAsMB01hcmlhREIxEDAOBgNVBAMMB1Jvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDeG9rtI3IXA84EfEow
+kBZYgmYRAHUoW2EaQP3KET8rDJhFfDmCrjLJF9wCJ0DVo64Hsf9dHE255+DvFJ2I
+c2c5DwwKBqYVYOiiV8z54SJ+fmbtCvK/lU5PlbymNZhONZNxk4lYGWWH+tLLWndH
+xHe/RgI5o4Ba8NQ2LrzpS4dYQzHfGqMmIea8blAcmtyqTwXZc1O1cswiIPD0pRlV
+AomGc2AtTVU2IqCmdVvGz7N7ki8QO4AR/SLnT3SANuLUx/lpaGvNyGz2KB5NPxE2
+8VYzRIEsMPEtsDKnvW8qo8rIbuTJqQPJi/WI6D5BnFLiKpeQAUVZBYZlx5ntQHV1
+we4afaHCDU6SNRt7UfzI/SfHPRZPnzm6K/KOtzYdJzA1Ap8PD4ZwL7hg9yUxVzsl
+jpySLW6+8PtxcMbkqZ8/nrTF0TH6qYszPitSNsAgB1zxSSteOJkwt9ou+WKGB0Tf
+5yYJ6flSmz8GUzUovO/FUmJP8uoJOVGHOYuAGH1203fxBez6aKo+wbpk8r7S2/4Z
+Ad4/OKgwU6ZaTKgIfzwkGuiR2kj6WKj+OLGN+fB9gTs+YTmb0wu+8sH9ub32y2ig
+kNLyrALJWyQhbrJeLOdwqj0mJkY238OP0Y8LKwbWLZWmhAW8tGbDA76vceH1+Hb4
+AqqbK9+Uhh1JXfrU/USaExS1bwIDAQABo2MwYTAdBgNVHQ4EFgQUNhJVtzmAj38l
+AL8UgHmb0i+xkQwwHwYDVR0jBBgwFoAUNhJVtzmAj38lAL8UgHmb0i+xkQwwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIB
+AHi3EtRvq9Dq6SISzL52X0Lzycm9GJ6lZ5D/8nWP8wdMMWVi9OxDKV5KSIPFf2t2
+E6LS/bi45iBSsqrcJqr1NSf+nzvbhSWMbFcC/9xIwKaeRIj5JtafQHwpYX8uwAXr
+nnN0GJ3tXd9Gc213ZjUsqCtPfStovDqchD58qIxGf1xUyWoOZwikmSjrbc2w75Zr
+oBQ8yTUcdHiFNZqhRqKTe/rbxKIDbRnEV4dLoEfGJPaSygba/NPTxtmSX5vJbLLR
+/l74jKOTxM+tNhSQ8e8HGo5yyunMWsnHtqvVl0JlQ9qKkF0wPPTJWkSeWh74e0Dd
+mnnz0iDzkknguVwihvnuz0tFW5Cynsu4owVJpRSDd7C94f00S6lRQ10AWJiQLNhR
+4370dVcbNCdIIwVOMQ0xA6fSKmOpLclIz1c6XHHuGR+klR1U8sX6dNOQMBRa8nZy
+xGMXSQ0X05pqPnBBdZRmQDka1bWn/Uuk+2tY5CamWjF191EurtsZ1cJ7HQnPtheV
+zdZxP+YSOvE5TJVnziqxlkIChxa+INBuaQoISxepBi2m2VPGj5SjAZcDPx9+uled
+CzLan4jnrDW8d8HeiOleeWuQHp/mdKScKfsVD6yyoEQqVajBl4QV5QncgZQiH9LD
+hzldPqgBh2P+MOiKGEPDPDe/+DSJOeASicDTeV5kFug7
+-----END CERTIFICATE-----
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index 7531c5ca8b7..e7797837686 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -109,6 +109,10 @@ sub skip_combinations {
   $skip{'include/check_windows_admin.inc'} = 'Requires admin privileges'
     unless IS_WINDOWS and Win32::IsAdminUser();
 
+  # MDEV-38326. Chained TLS certificates fails verification for schannel clients
+  $skip{'main/chained_ssl_certificates.test'} = 'Skip if on Windows without OpenSSL'
+    unless !IS_WINDOWS || $openssl_ver;
+
   %skip;
 }
 

From 7093e1c4a9f96b3f9e43127407cbb7de337912da Mon Sep 17 00:00:00 2001
From: Yuchen Pei <ycp@mariadb.com>
Date: Fri, 19 Dec 2025 13:29:19 +1100
Subject: [PATCH 090/119] MDEV-37972 Do not emit XID not found error in
 spider_internal_xa_commit_by_xid

This fixes "external" XA commits initiated by syncing binlog a slave
with a master that has done XA commits.

Note that spider_internal_xa_rollback_by_xid already did not emit the
error in the same scenario.
---
 .../spider/bugfix/r/mdev_37972.result         | 18 ++++++++++++++
 .../mysql-test/spider/bugfix/t/mdev_37972.cnf |  1 +
 .../spider/bugfix/t/mdev_37972.test           | 24 +++++++++++++++++++
 storage/spider/spd_trx.cc                     |  2 --
 4 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 storage/spider/mysql-test/spider/bugfix/r/mdev_37972.result
 create mode 100644 storage/spider/mysql-test/spider/bugfix/t/mdev_37972.cnf
 create mode 100644 storage/spider/mysql-test/spider/bugfix/t/mdev_37972.test

diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_37972.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_37972.result
new file mode 100644
index 00000000000..13f5633217c
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_37972.result
@@ -0,0 +1,18 @@
+include/master-slave.inc
+[connection master]
+connection slave;
+INSTALL SONAME 'ha_spider';
+connection master;
+CREATE TABLE t (a INT) ENGINE=InnoDB;
+XA START 'x';
+INSERT INTO t VALUES (1),(2);
+XA END 'x';
+XA PREPARE 'x';
+XA COMMIT 'x';
+connection slave;
+connection master;
+DROP TABLE t;
+connection slave;
+Warnings:
+Warning	1620	Plugin is busy and will be uninstalled on shutdown
+include/rpl_end.inc
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_37972.cnf b/storage/spider/mysql-test/spider/bugfix/t/mdev_37972.cnf
new file mode 100644
index 00000000000..5339ea4cc89
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_37972.cnf
@@ -0,0 +1 @@
+!include ../../../../../../mysql-test/suite/rpl/rpl_1slave_base.cnf
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_37972.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_37972.test
new file mode 100644
index 00000000000..0341cd20aae
--- /dev/null
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_37972.test
@@ -0,0 +1,24 @@
+--source include/have_innodb.inc
+--source include/master-slave.inc
+
+--connection slave
+INSTALL SONAME 'ha_spider';
+# set spider_internal_xa=1; # no use
+
+--connection master
+CREATE TABLE t (a INT) ENGINE=InnoDB;
+XA START 'x';
+INSERT INTO t VALUES (1),(2);
+XA END 'x';
+XA PREPARE 'x';
+XA COMMIT 'x';
+
+--sync_slave_with_master
+
+--connection master
+DROP TABLE t;
+
+--connection slave
+--disable_query_log
+--source ../../include/clean_up_spider.inc
+--source include/rpl_end.inc
diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc
index 39432d0f6d2..9b25dd7c633 100644
--- a/storage/spider/spd_trx.cc
+++ b/storage/spider/spd_trx.cc
@@ -2418,8 +2418,6 @@ int spider_internal_xa_commit_by_xid(
       table_xa->file->print_error(error_num, MYF(0));
       goto error;
     }
-    my_message(ER_SPIDER_XA_NOT_EXISTS_NUM, ER_SPIDER_XA_NOT_EXISTS_STR,
-      MYF(0));
     error_num = ER_SPIDER_XA_NOT_EXISTS_NUM;
     goto error;
   }

From 3c8a5ea12827041c86ebafeb4ac0a2e133416eb3 Mon Sep 17 00:00:00 2001
From: Yuchen Pei <ycp@mariadb.com>
Date: Fri, 19 Dec 2025 13:30:00 +1100
Subject: [PATCH 091/119] MDEV-37972 Factor out duplicate code shared by
 spider_internal_xa_{commit,rollback}_by_xid

---
 storage/spider/spd_trx.cc | 304 ++++++--------------------------------
 1 file changed, 45 insertions(+), 259 deletions(-)

diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc
index e41be358ee6..aaab62379bb 100644
--- a/storage/spider/spd_trx.cc
+++ b/storage/spider/spd_trx.cc
@@ -2286,15 +2286,17 @@ error_create_read_record:
   DBUG_RETURN(0);
 }
 
-int spider_internal_xa_commit_by_xid(
+static int spider_internal_xa_commit_or_rollback_by_xid(
   THD* thd,
   SPIDER_TRX *trx,
-  XID* xid
+  XID* xid,
+  bool is_rollback
 ) {
   TABLE *table_xa, *table_xa_member = 0;
   int error_num;
   char xa_key[MAX_KEY_LENGTH];
   char xa_member_key[MAX_KEY_LENGTH];
+  /* This share has only one link */
   SPIDER_SHARE tmp_share;
   char *tmp_connect_info[SPIDER_TMP_SHARE_CHAR_PTR_COUNT];
   uint tmp_connect_info_length[SPIDER_TMP_SHARE_UINT_COUNT];
@@ -2307,7 +2309,7 @@ int spider_internal_xa_commit_by_xid(
   bool table_xa_opened = FALSE;
   bool table_xa_member_opened = FALSE;
   bool created_tmp_thd = FALSE;
-  DBUG_ENTER("spider_internal_xa_commit_by_xid");
+  DBUG_ENTER("spider_internal_xa_commit_or_rollback_by_xid");
   if (!thd)
   {
     if (!(thd = spider_create_tmp_thd()))
@@ -2347,36 +2349,40 @@ int spider_internal_xa_commit_by_xid(
     goto error;
   }
   SPD_INIT_ALLOC_ROOT(&mem_root, 4096, 0, MYF(MY_WME));
-  if (
-    force_commit != 2 &&
-    (error_num = spider_check_sys_xa_status(
-      table_xa,
-      SPIDER_SYS_XA_PREPARED_STR,
-      SPIDER_SYS_XA_COMMIT_STR,
-      NULL,
-      ER_SPIDER_XA_NOT_PREPARED_NUM,
-      &mem_root))
-  ) {
-    free_root(&mem_root, MYF(0));
-    if (error_num == ER_SPIDER_XA_NOT_PREPARED_NUM)
-      my_message(error_num, ER_SPIDER_XA_NOT_PREPARED_STR, MYF(0));
-    goto error;
+  if (force_commit != 2)
+  {
+    error_num = is_rollback ?
+      spider_check_sys_xa_status(
+        table_xa, SPIDER_SYS_XA_NOT_YET_STR, SPIDER_SYS_XA_PREPARED_STR,
+        SPIDER_SYS_XA_ROLLBACK_STR, ER_SPIDER_XA_PREPARED_NUM, &mem_root) :
+      spider_check_sys_xa_status(
+        table_xa, SPIDER_SYS_XA_PREPARED_STR, SPIDER_SYS_XA_COMMIT_STR,
+        NULL, ER_SPIDER_XA_NOT_PREPARED_NUM, &mem_root);
+    if (error_num)
+    {
+      free_root(&mem_root, MYF(0));
+      if (error_num == ER_SPIDER_XA_PREPARED_NUM)
+        my_message(error_num, ER_SPIDER_XA_PREPARED_STR, MYF(0));
+      if (error_num == ER_SPIDER_XA_NOT_PREPARED_NUM)
+        my_message(error_num, ER_SPIDER_XA_NOT_PREPARED_STR, MYF(0));
+      goto error;
+    }
   }
-
   /*
     update
       mysql.spider_xa
     set
-      status = 'COMMIT'
+      status = 'ROLLBACK' / 'COMMIT'
     where
       format_id = trx->xid.format_id and
       gtrid_length = trx->xid.gtrid_length and
       data = trx->xid.data
   */
-  if (
-    (error_num = spider_update_xa(
-      table_xa, xid, SPIDER_SYS_XA_COMMIT_STR))
-  ) {
+  error_num= is_rollback ?
+    spider_update_xa(table_xa, xid, SPIDER_SYS_XA_ROLLBACK_STR) :
+    spider_update_xa(table_xa, xid, SPIDER_SYS_XA_COMMIT_STR);
+  if (error_num)
+  {
     free_root(&mem_root, MYF(0));
     goto error;
   }
@@ -2453,8 +2459,10 @@ int spider_internal_xa_commit_by_xid(
     }
     conn->error_mode &= spider_param_error_read_mode(thd, 0);
     conn->error_mode &= spider_param_error_write_mode(thd, 0);
-    if (
-      (error_num = spider_db_xa_commit(conn, xid)) &&
+    error_num = is_rollback ?
+      spider_db_xa_rollback(conn, xid) :
+      spider_db_xa_commit(conn, xid);
+    if (error_num &&
       (force_commit == 0 ||
         (force_commit == 1 && error_num != ER_XAER_NOTA))
     ) {
@@ -2527,246 +2535,24 @@ error_open_table:
   DBUG_RETURN(error_num);
 }
 
+int spider_internal_xa_commit_by_xid(
+  THD* thd,
+  SPIDER_TRX *trx,
+  XID* xid
+) {
+  DBUG_ENTER("spider_internal_xa_commit_by_xid");
+  DBUG_RETURN(spider_internal_xa_commit_or_rollback_by_xid(
+                thd, trx, xid, false));
+}
+
 int spider_internal_xa_rollback_by_xid(
   THD* thd,
   SPIDER_TRX *trx,
   XID* xid
 ) {
-  TABLE *table_xa, *table_xa_member = 0;
-  int error_num;
-  char xa_key[MAX_KEY_LENGTH];
-  char xa_member_key[MAX_KEY_LENGTH];
-  /* This share has only one link */
-  SPIDER_SHARE tmp_share;
-  char *tmp_connect_info[SPIDER_TMP_SHARE_CHAR_PTR_COUNT];
-  uint tmp_connect_info_length[SPIDER_TMP_SHARE_UINT_COUNT];
-  long tmp_long[SPIDER_TMP_SHARE_LONG_COUNT];
-  longlong tmp_longlong[SPIDER_TMP_SHARE_LONGLONG_COUNT];
-  SPIDER_CONN *conn;
-  uint force_commit = spider_param_force_commit(thd);
-  MEM_ROOT mem_root;
-  SPIDER_Open_tables_backup open_tables_backup;
-  bool table_xa_opened = FALSE;
-  bool table_xa_member_opened = FALSE;
-  bool created_tmp_thd= FALSE;
   DBUG_ENTER("spider_internal_xa_rollback_by_xid");
-  if (!thd)
-  {
-    if (!(thd = spider_create_tmp_thd()))
-    {
-      error_num = HA_ERR_OUT_OF_MEM;
-      goto error;
-    }
-    created_tmp_thd= TRUE;
-  }
-  /*
-    select
-      status
-    from
-      mysql.spider_xa
-    where
-      format_id = xid->format_id and
-      gtrid_length = xid->gtrid_length and
-      data = xid->data
-  */
-  if (
-    !(table_xa = spider_open_sys_table(
-      thd, SPIDER_SYS_XA_TABLE_NAME_STR, SPIDER_SYS_XA_TABLE_NAME_LEN,
-      TRUE, &open_tables_backup, TRUE, &error_num))
-  )
-    goto error_open_table;
-  table_xa_opened = TRUE;
-  spider_store_xa_pk(table_xa, xid);
-  if (
-    (error_num = spider_check_sys_table(table_xa, xa_key))
-  ) {
-    if (error_num != HA_ERR_KEY_NOT_FOUND && error_num != HA_ERR_END_OF_FILE)
-    {
-      table_xa->file->print_error(error_num, MYF(0));
-      goto error;
-    }
-    error_num = ER_SPIDER_XA_NOT_EXISTS_NUM;
-    goto error;
-  }
-  SPD_INIT_ALLOC_ROOT(&mem_root, 4096, 0, MYF(MY_WME));
-  if (
-    force_commit != 2 &&
-    (error_num = spider_check_sys_xa_status(
-      table_xa,
-      SPIDER_SYS_XA_NOT_YET_STR,
-      SPIDER_SYS_XA_PREPARED_STR,
-      SPIDER_SYS_XA_ROLLBACK_STR,
-      ER_SPIDER_XA_PREPARED_NUM,
-      &mem_root))
-  ) {
-    free_root(&mem_root, MYF(0));
-    if (error_num == ER_SPIDER_XA_PREPARED_NUM)
-      my_message(error_num, ER_SPIDER_XA_PREPARED_STR, MYF(0));
-    goto error;
-  }
-
-  /*
-    update
-      mysql.spider_xa
-    set
-      status = 'ROLLBACK'
-    where
-      format_id = trx->xid.format_id and
-      gtrid_length = trx->xid.gtrid_length and
-      data = trx->xid.data
-  */
-  if (
-    (error_num = spider_update_xa(
-      table_xa, xid, SPIDER_SYS_XA_ROLLBACK_STR))
-  ) {
-    free_root(&mem_root, MYF(0));
-    goto error;
-  }
-  spider_close_sys_table(thd, table_xa, &open_tables_backup, TRUE);
-  table_xa_opened = FALSE;
-
-  /*
-    select
-      scheme tmp_share.tgt_wrappers,
-      host tmp_share.tgt_hosts,
-      port tmp_share.tgt_ports,
-      socket tmp_share.tgt_sockets,
-      username tmp_share.tgt_usernames,
-      password tmp_share.tgt_passwords
-    from
-      mysql.spider_xa_member
-    where
-      format_id = xid->format_id and
-      gtrid_length = xid->gtrid_length and
-      data = xid->data
-  */
-  if (
-    !(table_xa_member = spider_open_sys_table(
-      thd, SPIDER_SYS_XA_MEMBER_TABLE_NAME_STR,
-      SPIDER_SYS_XA_MEMBER_TABLE_NAME_LEN, TRUE, &open_tables_backup, TRUE,
-      &error_num))
-  ) {
-    free_root(&mem_root, MYF(0));
-    goto error_open_table;
-  }
-  table_xa_member_opened = TRUE;
-  spider_store_xa_pk(table_xa_member, xid);
-  if (
-    (error_num = spider_get_sys_table_by_idx(table_xa_member, xa_member_key, 0,
-    SPIDER_SYS_XA_PK_COL_CNT))
-  ) {
-    if (error_num != HA_ERR_KEY_NOT_FOUND && error_num != HA_ERR_END_OF_FILE)
-    {
-      free_root(&mem_root, MYF(0));
-      table_xa_member->file->print_error(error_num, MYF(0));
-      goto error;
-    } else {
-      free_root(&mem_root, MYF(0));
-      spider_close_sys_table(thd, table_xa_member, &open_tables_backup, TRUE);
-      table_xa_member_opened = FALSE;
-      goto xa_delete;
-    }
-  }
-
-  memset((void*)&tmp_share, 0, sizeof(SPIDER_SHARE));
-  memset(&tmp_connect_info, 0,
-    sizeof(char *) * SPIDER_TMP_SHARE_CHAR_PTR_COUNT);
-  spider_set_tmp_share_pointer(&tmp_share, tmp_connect_info,
-    tmp_connect_info_length, tmp_long, tmp_longlong);
-  do {
-    SPIDER_BACKUP_DASTATUS;
-    spider_get_sys_server_info(table_xa_member, &tmp_share, 0, &mem_root);
-    if ((error_num = spider_create_conn_keys(&tmp_share)))
-    {
-      spider_sys_index_end(table_xa_member);
-      free_root(&mem_root, MYF(0));
-      goto error;
-    }
-
-    if (!(conn= spider_get_conn(&tmp_share, 0, tmp_share.conn_keys[0], trx,
-                                NULL, FALSE, FALSE, &error_num)) &&
-        (force_commit == 0 ||
-         (force_commit == 1 && error_num != ER_XAER_NOTA)))
-    {
-      spider_sys_index_end(table_xa_member);
-      spider_free_tmp_share_alloc(&tmp_share);
-      free_root(&mem_root, MYF(0));
-      goto error;
-    }
-    conn->error_mode &= spider_param_error_read_mode(thd, 0);
-    conn->error_mode &= spider_param_error_write_mode(thd, 0);
-    if (
-      (error_num = spider_db_xa_rollback(conn, xid)) &&
-      (force_commit == 0 ||
-        (force_commit == 1 && error_num != ER_XAER_NOTA))
-    ) {
-      SPIDER_CONN_RESTORE_DASTATUS_AND_RESET_ERROR_NUM;
-      if (error_num)
-      {
-        spider_sys_index_end(table_xa_member);
-        spider_free_tmp_share_alloc(&tmp_share);
-        free_root(&mem_root, MYF(0));
-        goto error;
-      }
-    }
-    spider_free_tmp_share_alloc(&tmp_share);
-    error_num = spider_sys_index_next_same(table_xa_member, xa_member_key);
-  } while (error_num == 0);
-  if ((error_num = spider_sys_index_end(table_xa_member)))
-  {
-    free_root(&mem_root, MYF(0));
-    goto error;
-  }
-  free_root(&mem_root, MYF(0));
-  spider_reuse_trx_ha(trx);
-  spider_free_trx_conn(trx, FALSE);
-
-  /*
-    delete from
-      mysql.spider_xa_member
-    where
-      format_id = xid->format_id and
-      gtrid_length = xid->gtrid_length and
-      data = xid->data
-  */
-  if ((error_num = spider_delete_xa_member(table_xa_member, xid)))
-    goto error;
-  spider_close_sys_table(thd, table_xa_member, &open_tables_backup, TRUE);
-  table_xa_member_opened = FALSE;
-
-xa_delete:
-  /*
-    delete from
-      mysql.spider_xa
-    where
-      format_id = xid->format_id and
-      gtrid_length = xid->gtrid_length and
-      data = xid->data
-  */
-  if (
-    !(table_xa = spider_open_sys_table(
-      thd, SPIDER_SYS_XA_TABLE_NAME_STR, SPIDER_SYS_XA_TABLE_NAME_LEN,
-      TRUE, &open_tables_backup, TRUE, &error_num))
-  )
-    goto error_open_table;
-  table_xa_opened = TRUE;
-  if ((error_num = spider_delete_xa(table_xa, xid)))
-    goto error;
-  spider_close_sys_table(thd, table_xa, &open_tables_backup, TRUE);
-  table_xa_opened = FALSE;
-  if (created_tmp_thd)
-    spider_free_tmp_thd(thd);
-  DBUG_RETURN(0);
-
-error:
-  if (table_xa_opened)
-    spider_close_sys_table(thd, table_xa, &open_tables_backup, TRUE);
-  if (table_xa_member_opened)
-    spider_close_sys_table(thd, table_xa_member, &open_tables_backup, TRUE);
-error_open_table:
-  if (created_tmp_thd)
-    spider_free_tmp_thd(thd);
-  DBUG_RETURN(error_num);
+  DBUG_RETURN(spider_internal_xa_commit_or_rollback_by_xid(
+                thd, trx, xid, true));
 }
 
 int spider_start_consistent_snapshot(

From 4deadb9b870d3146f2f6e8dac247f476262e7e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Fri, 19 Dec 2025 09:46:54 +0200
Subject: [PATCH 092/119] MDEV-38390 : Galera test failure on
 wsrep.wsrep_provider_plugin_defaults

Test result depends on Galera library version that should be 26.4.25
for these test results.
---
 mysql-test/include/galera_variables_ok.inc                   | 2 +-
 mysql-test/suite/wsrep/r/variables.result                    | 1 +
 mysql-test/suite/wsrep/r/variables_debug.result              | 1 +
 mysql-test/suite/wsrep/t/variables.test                      | 2 +-
 mysql-test/suite/wsrep/t/variables_debug.test                | 3 ++-
 mysql-test/suite/wsrep/t/wsrep_provider_plugin_defaults.test | 2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mysql-test/include/galera_variables_ok.inc b/mysql-test/include/galera_variables_ok.inc
index 9bd31bb32b2..d10bf1fd36e 100644
--- a/mysql-test/include/galera_variables_ok.inc
+++ b/mysql-test/include/galera_variables_ok.inc
@@ -5,7 +5,7 @@ if (!$_galera_variables_delta) {
 --let $galera_variables_delta=0
 }
 
---let $galera_variables_expected=`SELECT 51 + $galera_variables_delta`
+--let $galera_variables_expected=`SELECT 50 + $galera_variables_delta`
 
 --let $galera_variables_count=`SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'`
 
diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result
index 15836b9a0c2..d29b28e9c37 100644
--- a/mysql-test/suite/wsrep/r/variables.result
+++ b/mysql-test/suite/wsrep/r/variables.result
@@ -44,6 +44,7 @@ wsrep_commit_window	#
 wsrep_local_state	#
 wsrep_local_state_comment	#
 wsrep_cert_index_size	#
+wsrep_causal_reads	#
 wsrep_cert_interval	#
 wsrep_open_transactions	#
 wsrep_open_connections	#
diff --git a/mysql-test/suite/wsrep/r/variables_debug.result b/mysql-test/suite/wsrep/r/variables_debug.result
index 6c4f8877761..594a840ae2f 100644
--- a/mysql-test/suite/wsrep/r/variables_debug.result
+++ b/mysql-test/suite/wsrep/r/variables_debug.result
@@ -44,6 +44,7 @@ wsrep_commit_window	#
 wsrep_local_state	#
 wsrep_local_state_comment	#
 wsrep_cert_index_size	#
+wsrep_causal_reads	#
 wsrep_cert_interval	#
 wsrep_open_transactions	#
 wsrep_open_connections	#
diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test
index c82d0ae02c2..3121266f8ae 100644
--- a/mysql-test/suite/wsrep/t/variables.test
+++ b/mysql-test/suite/wsrep/t/variables.test
@@ -3,7 +3,7 @@
 --source include/have_innodb.inc
 --source include/galera_no_debug_sync.inc
 
---let $galera_version=26.4.23
+--let $galera_version=26.4.25
 source include/check_galera_version.inc;
 
 source include/galera_variables_ok.inc;
diff --git a/mysql-test/suite/wsrep/t/variables_debug.test b/mysql-test/suite/wsrep/t/variables_debug.test
index e50cee28a15..989b82a447d 100644
--- a/mysql-test/suite/wsrep/t/variables_debug.test
+++ b/mysql-test/suite/wsrep/t/variables_debug.test
@@ -5,9 +5,10 @@
 --source include/have_debug_sync.inc
 --source include/galera_have_debug_sync.inc
 
---let $galera_version=26.4.23
+--let $galera_version=26.4.25
 source include/check_galera_version.inc;
 
+--let $galera_variables_delta=1
 source include/galera_variables_ok_debug.inc;
 
 --replace_column 2 #
diff --git a/mysql-test/suite/wsrep/t/wsrep_provider_plugin_defaults.test b/mysql-test/suite/wsrep/t/wsrep_provider_plugin_defaults.test
index 1e0b6a49efc..44dc3f7cb72 100644
--- a/mysql-test/suite/wsrep/t/wsrep_provider_plugin_defaults.test
+++ b/mysql-test/suite/wsrep/t/wsrep_provider_plugin_defaults.test
@@ -1,7 +1,7 @@
 --source include/have_wsrep.inc
 --source include/have_innodb.inc
 
---let $galera_version=26.4.24
+--let $galera_version=26.4.25
 source include/check_galera_version.inc;
 
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep_provider%' AND VARIABLE_NAME NOT IN (

From 5d2da8ef1e6bcff57479240c1580c64906c15005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Mon, 22 Dec 2025 08:29:57 +0200
Subject: [PATCH 093/119] MDEV-38408 WITH_DBUG_TRACE=OFF doesn't disable
 DBUG_DUMP or DBUG_LOG

DBUG_DUMP(), DBUG_LOG(): Null expand unless DBUG_TRACE is enabled.

Fixes up commit a69cf6f07ee7286d4813ef5c602d5b79b39d3028 (MDEV-29613)
---
 include/my_dbug.h | 5 +++--
 sql/log_event.cc  | 2 +-
 sql/rpl_record.cc | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/my_dbug.h b/include/my_dbug.h
index b4b16d653b5..18ea052da6a 100644
--- a/include/my_dbug.h
+++ b/include/my_dbug.h
@@ -79,6 +79,7 @@ extern int (*dbug_sanity)(void);
 
 #define DBUG_PRINT(keyword,arglist) \
         do if (_db_pargs_(__LINE__,keyword)) _db_doprnt_ arglist; while(0)
+#define DBUG_DUMP(keyword,a1,a2) _db_dump_(__LINE__,keyword,a1,a2)
 
 #ifdef HAVE_ATTRIBUTE_CLEANUP
 #define DBUG_ENTER(a) struct _db_stack_frame_ _db_stack_frame_  __attribute__((cleanup(_db_return_))); \
@@ -98,6 +99,7 @@ extern int (*dbug_sanity)(void);
 #define DBUG_RETURN(a1) return(a1)
 #define DBUG_VOID_RETURN return
 #define DBUG_PRINT(keyword,arglist) do{} while(0)
+#define DBUG_DUMP(keyword,a1,a2) do{} while(0)
 #endif
 
 #define DBUG_EXECUTE(keyword,a1) \
@@ -116,7 +118,6 @@ extern int (*dbug_sanity)(void);
 #define DBUG_SET_INITIAL(a1) _db_set_init_ (a1)
 #define DBUG_PROCESS(a1) _db_process_(a1)
 #define DBUG_FILE _db_fp_()
-#define DBUG_DUMP(keyword,a1,a2) _db_dump_(__LINE__,keyword,a1,a2)
 #define DBUG_END()  _db_end_ ()
 #define DBUG_LOCK_FILE _db_lock_file_()
 #define DBUG_UNLOCK_FILE _db_unlock_file_()
@@ -236,7 +237,7 @@ void debug_sync_point(const char* lock_name, uint lock_timeout);
   one should #include <sstream>. We intentionally avoid including it here to save
   compilation time.
 */
-# ifdef DBUG_OFF
+# if defined DBUG_OFF || !defined DBUG_TRACE
 #  define DBUG_LOG(keyword, v) do {} while (0)
 # else
 #  define DBUG_LOG(keyword, v) do { \
diff --git a/sql/log_event.cc b/sql/log_event.cc
index b1657275128..04385e886c9 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -216,7 +216,7 @@ private:
   Log_event *m_ev; // Used for Flashback
 };
 
-#ifndef DBUG_OFF
+#if !defined DBUG_OFF && defined DBUG_TRACE
 #define DBUG_DUMP_EVENT_BUF(B,L)                                         \
   do {                                                                   \
     const uchar *_buf=(uchar*)(B);                                       \
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc
index 6266acf7805..194d16bf5b6 100644
--- a/sql/rpl_record.cc
+++ b/sql/rpl_record.cc
@@ -100,7 +100,7 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
           length is stored in little-endian format, since this is the
           format used for the binlog.
         */
-#ifndef DBUG_OFF
+#if !defined DBUG_OFF && defined DBUG_TRACE
         const uchar *old_pack_ptr= pack_ptr;
 #endif
         pack_ptr= field->pack(pack_ptr, field->ptr + offset,

From 6892722577f3e37ea62506d4e38a7ff5ea8fe148 Mon Sep 17 00:00:00 2001
From: Thirunarayanan Balathandayuthapani <thiru@mariadb.com>
Date: Mon, 22 Dec 2025 11:57:34 +0530
Subject: [PATCH 094/119] MDEV-38271   Server hangs during concurrent set
 innodb_encryption_threads

Problem:
=======
 - Multiple user threads waits for all encryption threads to start
before returing the control to user. But in fil_crypt_thread(),
InnoDB signals that thread is started after incrementing
srv_n_fil_crypt_threads_started variable. For multiple waiters,
pthread_cond_broadcast() would be more appropriate as
it wakes all waiting threads.

Solution:
========
fil_crypt_thread(): Use pthread_cond_broadcast instead of
pthread_cond_signal(fil_crypt_cond) to wake multiple waiter
threads
---
 storage/innobase/fil/fil0crypt.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
index 28078747318..3d32d1c640b 100644
--- a/storage/innobase/fil/fil0crypt.cc
+++ b/storage/innobase/fil/fil0crypt.cc
@@ -2021,7 +2021,7 @@ static void fil_crypt_thread()
 #endif /* UNIV_PFS_THREAD */
 	mysql_mutex_lock(&fil_crypt_threads_mutex);
 	rotate_thread_t thr(srv_n_fil_crypt_threads_started++);
-	pthread_cond_signal(&fil_crypt_cond); /* signal that we started */
+	pthread_cond_broadcast(&fil_crypt_cond);
 
 	if (!thr.should_shutdown()) {
 		/* if we find a tablespace that is starting, skip over it
@@ -2093,7 +2093,7 @@ wait_for_work:
 
 	fil_crypt_return_iops(&thr);
 	srv_n_fil_crypt_threads_started--;
-	pthread_cond_signal(&fil_crypt_cond); /* signal that we stopped */
+	pthread_cond_broadcast(&fil_crypt_cond);
 	mysql_mutex_unlock(&fil_crypt_threads_mutex);
 
 	my_thread_end();

From 291cc20bf1bba64f735503c5e4a7c21c9a00f831 Mon Sep 17 00:00:00 2001
From: Rucha Deodhar <rucha.deodhar@mariadb.com>
Date: Mon, 22 Sep 2025 15:26:54 +0530
Subject: [PATCH 095/119] MDEV-33640: Server crashes at my_hash_free

Analysis:
While parsing the json schema, we dont initialize the hash that stores
properties, but we try to free hash while cleanup. This happend because
the variable that checks whether hash is initialized has garbage value.
So the check becomes true and we end up deleting the uninitialized hash.

Fix:
Initialize the is_hash_inited to false.
---
 mysql-test/main/func_json.result | 5 +++++
 mysql-test/main/func_json.test   | 8 ++++++++
 sql/json_schema.h                | 5 +++++
 3 files changed, 18 insertions(+)

diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result
index edb0ba36796..d0d186538a8 100644
--- a/mysql-test/main/func_json.result
+++ b/mysql-test/main/func_json.result
@@ -5379,4 +5379,9 @@ result
 [["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
 [["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
 [["2", "6"], ["3", "8"], ["4", "5"], ["1", "7"]]
+#
+# MDEV-33640: Server crashes at my_hash_free
+#
+SELECT JSON_SCHEMA_VALID('{"properties": "a_string": {"pattern": "^[5-9]$"}}}', '{"a_string": "8"}');
+ERROR HY000: Invalid value for keyword properties
 # End of 11.4 Test
diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test
index 2045b5df09c..23a418f16de 100644
--- a/mysql-test/main/func_json.test
+++ b/mysql-test/main/func_json.test
@@ -4275,4 +4275,12 @@ SELECT ( WITH x AS ( WITH x ( x ) AS ( SELECT ( 1.000000 ) ) SELECT x FROM x ) S
 
 select json_array_intersect('[["1", "7"], ["2", "6"], ["4", "5"], ["3", "8"]]', '[["2","6"],["3","8"],["4","5"],["1","7"]]') as result from (values (1),(2),(3),(4),(5)) x;
 
+
+--echo #
+--echo # MDEV-33640: Server crashes at my_hash_free
+--echo #
+
+--error ER_JSON_INVALID_VALUE_FOR_KEYWORD
+SELECT JSON_SCHEMA_VALID('{"properties": "a_string": {"pattern": "^[5-9]$"}}}', '{"a_string": "8"}');
+
 --echo # End of 11.4 Test
diff --git a/sql/json_schema.h b/sql/json_schema.h
index 28cd8b411b9..6063597ec56 100644
--- a/sql/json_schema.h
+++ b/sql/json_schema.h
@@ -475,6 +475,7 @@ class Json_schema_properties : public Json_schema_keyword
     Json_schema_properties()
     {
       priority= 1;
+      is_hash_inited= false;
     }
     bool validate(const json_engine_t *je, const uchar *k_start= NULL,
                   const uchar *k_end= NULL) override;
@@ -503,6 +504,10 @@ class Json_schema_dependent_schemas : public Json_schema_keyword
       if (is_hash_inited)
        my_hash_free(&properties);
     }
+    Json_schema_dependent_schemas()
+    {
+      is_hash_inited= false;
+    }
     bool validate(const json_engine_t *je, const uchar *k_start= NULL,
                   const uchar *k_end= NULL) override;
     bool handle_keyword(THD *thd, json_engine_t *je,

From dfd28e53242ae61d35072fdbd04e0e2943362231 Mon Sep 17 00:00:00 2001
From: Aleksey Midenkov <midenok@gmail.com>
Date: Tue, 23 Dec 2025 13:42:45 +0300
Subject: [PATCH 096/119] MDEV-29114 Pruning depends on current timestamp for
 partition by SYSTEM_TIME

Wrong "fastpath" boundary conditions. The right boundary is open, the
left boundary is closed. The condition range_value[loc_hist_id - 1] as
left boundary must be checked with <= operator. The same with the
right boundary range_value[loc_hist_id] as the correct way is to check
it with > operator, the right boundary check was rewritten for clear
understanding:

  ts < range_value[loc_hist_id]

The below code confirms closed endpoint type for left boundary:

      if (range_value[loc_hist_id] <= ts)
        min_hist_id= loc_hist_id + 1;

Also the endpoint type (closed for left, open for right) is confirmed
by vers_set_hist_part() for DML:

  else if (vers_info->interval.is_set() &&
           vers_info->hist_part->range_value <= thd->query_start())

and here (right boundary, rewritten for clarity):

      if (thd->query_start() < next->range_value)
      {
        error= false;
        break;
      }
---
 .../suite/versioning/r/partition.result       | 63 +++++++++++++++++++
 mysql-test/suite/versioning/t/partition.test  | 46 ++++++++++++++
 sql/partition_info.cc                         |  4 +-
 sql/sql_partition.cc                          |  5 +-
 4 files changed, 115 insertions(+), 3 deletions(-)

diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result
index 54b2ab1d469..337de9e15a7 100644
--- a/mysql-test/suite/versioning/r/partition.result
+++ b/mysql-test/suite/versioning/r/partition.result
@@ -3524,6 +3524,69 @@ alter table `t1` partition by system_time interval 7 year ;
 ERROR 22003: TIMESTAMP value is out of range in 'INTERVAL'
 drop table t1;
 #
+# MDEV-29114 ALTER puts row into different partition for system_time
+#            interval partitioning
+#
+# CREATE case
+set timestamp= unix_timestamp('2000-01-01 00:00:00');
+create or replace table t1 (x int) with system versioning
+partition by system_time interval 1 hour (
+partition p0 history, partition p1 history, partition pn current);
+set timestamp= unix_timestamp('2000-01-01 00:00:00');
+insert t1 values (0);
+set timestamp= unix_timestamp('2000-01-01 00:10:00');
+update t1 set x= 1;
+set timestamp= unix_timestamp('2000-01-01 01:00:00');
+update t1 set x= 2;
+set timestamp= unix_timestamp('2000-01-01 01:30:00');
+update t1 set x= 3;
+# CREATE result: row 1 got into p1
+select *, row_start, row_end from t1 partition (p0);
+x	row_start	row_end
+0	2000-01-01 00:00:00.000000	2000-01-01 00:10:00.000000
+select *, row_start, row_end from t1 partition (p1);
+x	row_start	row_end
+1	2000-01-01 00:10:00.000000	2000-01-01 01:00:00.000000
+2	2000-01-01 01:00:00.000000	2000-01-01 01:30:00.000000
+flush tables;
+# For CREATE pruning is affected by current timestamp, but SELECT works
+# in any case since row 1 got into p1
+set timestamp= unix_timestamp('2000-01-01 00:00:00');
+explain partitions select * from t1 for system_time as of '2000-01-01 00:59:59';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p0,p1,pn	ALL	NULL	NULL	NULL	NULL	4	Using where
+select * from t1 for system_time as of '2000-01-01 00:59:59';
+x
+1
+set timestamp= unix_timestamp('2020-01-01 00:00:00');
+explain partitions select * from t1 for system_time as of '2000-01-01 00:59:59';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p0,p1,pn	ALL	NULL	NULL	NULL	NULL	4	Using where
+select * from t1 for system_time as of '2000-01-01 00:59:59';
+x
+1
+# ALTER case
+set timestamp= unix_timestamp('2000-01-01 00:00:00');
+alter table t1
+partition by system_time interval 1 hour (
+partition p0 history, partition p1 history, partition pn current);
+# ALTER result: row 1 got into p1
+Select *, row_start, row_end from t1 partition (p0);
+x	row_start	row_end
+0	2000-01-01 00:00:00.000000	2000-01-01 00:10:00.000000
+Select *, row_start, row_end from t1 partition (p1);
+x	row_start	row_end
+1	2000-01-01 00:10:00.000000	2000-01-01 01:00:00.000000
+2	2000-01-01 01:00:00.000000	2000-01-01 01:30:00.000000
+flush tables;
+Explain partitions select * from t1 for system_time as of '2000-01-01 00:59:59';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p0,p1,pn	ALL	NULL	NULL	NULL	NULL	4	Using where
+Select * from t1 for system_time as of '2000-01-01 00:59:59';
+x
+1
+drop table t1;
+#
 # End of 10.11 tests
 #
 set global innodb_stats_persistent= @save_persistent;
diff --git a/mysql-test/suite/versioning/t/partition.test b/mysql-test/suite/versioning/t/partition.test
index 245d3ff9323..7acc4c22f8d 100644
--- a/mysql-test/suite/versioning/t/partition.test
+++ b/mysql-test/suite/versioning/t/partition.test
@@ -2768,6 +2768,52 @@ partition by system_time interval 1 month (
 alter table `t1` partition by system_time interval 7 year ;
 drop table t1;
 
+--echo #
+--echo # MDEV-29114 ALTER puts row into different partition for system_time
+--echo #            interval partitioning
+--echo #
+--echo # CREATE case
+set timestamp= unix_timestamp('2000-01-01 00:00:00');
+create or replace table t1 (x int) with system versioning
+partition by system_time interval 1 hour (
+  partition p0 history, partition p1 history, partition pn current);
+set timestamp= unix_timestamp('2000-01-01 00:00:00');
+insert t1 values (0);
+set timestamp= unix_timestamp('2000-01-01 00:10:00');
+update t1 set x= 1;
+set timestamp= unix_timestamp('2000-01-01 01:00:00');
+update t1 set x= 2;
+set timestamp= unix_timestamp('2000-01-01 01:30:00');
+update t1 set x= 3;
+
+--echo # CREATE result: row 1 got into p1
+select *, row_start, row_end from t1 partition (p0);
+select *, row_start, row_end from t1 partition (p1);
+flush tables;
+--echo # For CREATE pruning is affected by current timestamp, but SELECT works
+--echo # in any case since row 1 got into p1
+set timestamp= unix_timestamp('2000-01-01 00:00:00');
+explain partitions select * from t1 for system_time as of '2000-01-01 00:59:59';
+select * from t1 for system_time as of '2000-01-01 00:59:59';
+set timestamp= unix_timestamp('2020-01-01 00:00:00');
+explain partitions select * from t1 for system_time as of '2000-01-01 00:59:59';
+select * from t1 for system_time as of '2000-01-01 00:59:59';
+
+--echo # ALTER case
+set timestamp= unix_timestamp('2000-01-01 00:00:00');
+alter table t1
+partition by system_time interval 1 hour (
+  partition p0 history, partition p1 history, partition pn current);
+
+--echo # ALTER result: row 1 got into p1
+Select *, row_start, row_end from t1 partition (p0);
+Select *, row_start, row_end from t1 partition (p1);
+flush tables;
+Explain partitions select * from t1 for system_time as of '2000-01-01 00:59:59';
+Select * from t1 for system_time as of '2000-01-01 00:59:59';
+
+drop table t1;
+
 --echo #
 --echo # End of 10.11 tests
 --echo #
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index f7fdaba5c7b..b459608c764 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -831,6 +831,7 @@ bool partition_info::vers_set_hist_part(THD *thd, uint *create_count)
     return 0;
   }
   else if (vers_info->interval.is_set() &&
+           /* Left boundary is closed */
            vers_info->hist_part->range_value <= thd->query_start())
   {
     partition_element *next= NULL;
@@ -842,7 +843,8 @@ bool partition_info::vers_set_hist_part(THD *thd, uint *create_count)
     while ((next= it++) != vers_info->now_part)
     {
       vers_info->hist_part= next;
-      if (next->range_value > thd->query_start())
+      /* Right boundary is open */
+      if (thd->query_start() < next->range_value)
       {
         error= false;
         break;
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 621ce730c7b..5dac3292eba 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -3511,13 +3511,14 @@ int vers_get_partition_id(partition_info *part_info, uint32 *part_id,
       goto done; // fastpath
 
     ts= row_end->get_timestamp(&unused);
-    if ((loc_hist_id == 0 || range_value[loc_hist_id - 1] < ts) &&
-        (loc_hist_id == max_hist_id || range_value[loc_hist_id] >= ts))
+    if ((loc_hist_id == 0 || range_value[loc_hist_id - 1] <= ts) &&
+        (loc_hist_id == max_hist_id || ts < range_value[loc_hist_id]))
       goto done; // fastpath
 
     while (max_hist_id > min_hist_id)
     {
       loc_hist_id= (max_hist_id + min_hist_id) / 2;
+      /* Left boundary is closed */
       if (range_value[loc_hist_id] <= ts)
         min_hist_id= loc_hist_id + 1;
       else

From 9fad7ac3f7c87295e4a8a1939e913e8e76cf3764 Mon Sep 17 00:00:00 2001
From: Aleksey Midenkov <midenok@gmail.com>
Date: Tue, 23 Dec 2025 13:42:45 +0300
Subject: [PATCH 097/119] Comment cleanup

Comment "Currently the field first_nested ..." is for first_nested,
not for Name_resolution_context context.
---
 sql/sql_lex.h | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index a6cf6303aa6..5c1bc968f44 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -1113,9 +1113,20 @@ Field_pair *find_matching_field_pair(Item *item, List<Field_pair> pair_list);
 class st_select_lex: public st_select_lex_node
 {
 public:
+  Name_resolution_context context;
+  LEX_CSTRING db;
+
+  /*
+    Point to the LEX in which it was created, used in view subquery detection.
+
+    TODO: make also st_select_lex::parent_stmt_lex (see LEX::stmt_lex)
+    and use st_select_lex::parent_lex & st_select_lex::parent_stmt_lex
+    instead of global (from THD) references where it is possible.
+  */
+  LEX *parent_lex;
   /*
     Currently the field first_nested is used only by parser.
-    It containa either a reference to the first select
+    It contains either a reference to the first select
     of the nest of selects to which 'this' belongs to, or
     in the case of priority jump it contains a reference to
     the select to which the priority nest has to be attached to.
@@ -1128,18 +1139,6 @@ public:
     while select3->first_nested points to select2 and
     select1->first_nested points to select1.
   */
-
-  Name_resolution_context context;
-  LEX_CSTRING db;
-
-  /*
-    Point to the LEX in which it was created, used in view subquery detection.
-
-    TODO: make also st_select_lex::parent_stmt_lex (see LEX::stmt_lex)
-    and use st_select_lex::parent_lex & st_select_lex::parent_stmt_lex
-    instead of global (from THD) references where it is possible.
-  */
-  LEX *parent_lex;
   st_select_lex *first_nested;
   Item *where, *having;                         /* WHERE & HAVING clauses */
   Item *prep_where; /* saved WHERE clause for prepared statement processing */

From 9f70e0a76ce2a9c577444e85fc6981bc3dd0f38d Mon Sep 17 00:00:00 2001
From: Aleksey Midenkov <midenok@gmail.com>
Date: Tue, 23 Dec 2025 13:42:45 +0300
Subject: [PATCH 098/119] MDEV-32299 Segfault when preparing unreferenced
 select in recursive CTE

With_element::prepare_unreferenced() contains query from recursive CTE
which is upper owner of unreferenced CTE itself. Such recursive
derived table is resolved into its expression and it tries to resolve
fields or any other data from subqueries which are not yet
prepared. These subqueries are preparing in upper frames of the same
stack after prepare_unreferenced() finishes.

That does not happen when recursion happens in referenced CTE because
in that case there are links between the derived tables defined by the
parser and descending into such recursion descends further into all
the dependency queries. No such link exists in unreferenced query
therefore it misses its upper dependencies.

The fix moves prepare_unreferenced() later after JOIN::prepare() so it
has the chance to access all the prepared data.

There may be another fix of failing unreferenced queries with error as
such kind of queries seem to be not usable.
---
 mysql-test/main/cte_recursive.result | 107 ++++++++++++++++++++++++
 mysql-test/main/cte_recursive.test   | 119 +++++++++++++++++++++++++++
 sql/sql_cte.cc                       |  13 +++
 sql/sql_cte.h                        |   4 +-
 sql/sql_lex.h                        |   1 +
 sql/sql_prepare.cc                   |   4 +
 sql/sql_select.cc                    |   8 +-
 7 files changed, 249 insertions(+), 7 deletions(-)

diff --git a/mysql-test/main/cte_recursive.result b/mysql-test/main/cte_recursive.result
index 2fcf40bf7a8..e35d26f170c 100644
--- a/mysql-test/main/cte_recursive.result
+++ b/mysql-test/main/cte_recursive.result
@@ -5975,4 +5975,111 @@ drop table t1;
 #
 SELECT ( WITH RECURSIVE x AS ( WITH x AS ( SELECT 1 FROM t14 ) SELECT x ) , t14 AS ( SELECT 1 UNION SELECT 'x' FROM x ) SELECT x FROM x WHERE ( SELECT x FROM x ) ) ;
 ERROR 42S22: Unknown column 'x' in 'SELECT'
+#
+# MDEV-32299 Segfault when preparing unreferenced select in recursive CTE
+#
+SELECT ( WITH RECURSIVE x AS ( SELECT * FROM ( SELECT UTC_TIMESTAMP FROM ( SELECT ( WITH x AS ( WITH x AS ( SELECT * FROM x ) SELECT 1 ) SELECT 1 ) ) x ) x UNION SELECT NULL ) ( SELECT x FROM x ) ) ;
+ERROR 42S22: Unknown column 'x' in 'SELECT'
+select (
+with recursive x as (
+select * from (
+select utc_timestamp
+from (
+select (
+with x as (
+with x as (
+select * from x
+)
+select 1
+)
+select 1
+) s
+) y
+) z
+union
+select null
+)
+(select x from x)
+);
+ERROR 42S22: Unknown column 'x' in 'SELECT'
+select (
+with recursive r as (
+select * from (
+with a as (
+select * from r
+)
+select 1
+) y
+union
+select 1
+)
+(select * from r)
+);
+(
+with recursive r as (
+select * from (
+with a as (
+select * from r
+)
+select 1
+) y
+union
+select 1
+)
+(select * from r)
+)
+1
+create table t1 (x int);
+with recursive r as (
+select f1 from (
+with a as (
+select x from t1
+)
+select 1 as f1
+) y
+union
+select null
+)
+(select * from r);
+f1
+1
+NULL
+with recursive r as (
+select f1 from (
+with a as (
+select f2 from t1
+)
+select 1 as f1
+) y
+union
+select null
+)
+(select * from r);
+ERROR 42S22: Unknown column 'f2' in 'SELECT'
+drop table t1;
+with recursive r as (
+select 1 as f1
+union
+select f1 from (
+with a as (
+select f1 from r
+)
+select 1 as f1
+) y
+)
+(select f1 from r);
+f1
+1
+with recursive r as (
+select 1 as f1
+union
+select f1 from (
+with a as (
+select f2 from r
+)
+select 1 as f1
+) y
+)
+(select f1 from r);
+ERROR 42S22: Unknown column 'f2' in 'SELECT'
 # End of 10.6 tests
diff --git a/mysql-test/main/cte_recursive.test b/mysql-test/main/cte_recursive.test
index 35d3a8609d9..3447ced1a1c 100644
--- a/mysql-test/main/cte_recursive.test
+++ b/mysql-test/main/cte_recursive.test
@@ -3,6 +3,8 @@
 --source include/no_msan_without_big.inc
 --source include/not_valgrind.inc
 --source include/have_innodb.inc
+# --view-protocol fails due to MDEV-37119 for MDEV-32299
+--source include/no_view_protocol.inc
 
 create table t1 (a int, b varchar(32));
 insert into t1 values
@@ -4064,4 +4066,121 @@ drop table t1;
 --error ER_BAD_FIELD_ERROR
 SELECT ( WITH RECURSIVE x AS ( WITH x AS ( SELECT 1 FROM t14 ) SELECT x ) , t14 AS ( SELECT 1 UNION SELECT 'x' FROM x ) SELECT x FROM x WHERE ( SELECT x FROM x ) ) ;
 
+--echo #
+--echo # MDEV-32299 Segfault when preparing unreferenced select in recursive CTE
+--echo #
+
+# As in bug report
+--error ER_BAD_FIELD_ERROR
+SELECT ( WITH RECURSIVE x AS ( SELECT * FROM ( SELECT UTC_TIMESTAMP FROM ( SELECT ( WITH x AS ( WITH x AS ( SELECT * FROM x ) SELECT 1 ) SELECT 1 ) ) x ) x UNION SELECT NULL ) ( SELECT x FROM x ) ) ;
+
+#0  0x00005555569dff7b in TABLE_LIST::reset_const_table (this=0x7fffe0019938) at ../src/sql/table.cc:9615
+#1  0x00005555569dffd4 in TABLE_LIST::reset_const_table (this=0x7fffe001a8c0) at ../src/sql/table.cc:9622
+--error ER_BAD_FIELD_ERROR
+select (
+  with recursive x as (
+    select * from (
+      select utc_timestamp
+      from (
+        select (
+          with x as (
+            with x as (
+              select * from x
+            )
+            select 1
+          )
+          select 1
+        ) s
+      ) y
+    ) z
+
+    union
+
+    select null
+  )
+  (select x from x)
+);
+
+#6  0x00007ffff7639206 in __assert_fail (assertion=0x555555e121b6 "table_ref->table || table_ref->view", file=0x555555cdf138 "../src/sql/table.cc", line=7305, function=0x555555e30e24 "void Field_iterator_table_ref::set_field_iterator()") at ./assert/assert.c:101
+#7  0x00005555569da013 in Field_iterator_table_ref::set_field_iterator (this=0x7ffff0a9afc0) at ../src/sql/table.cc:7305
+select (
+  with recursive r as (
+    select * from (
+      with a as (
+          select * from r
+      )
+      select 1
+    ) y
+
+    union
+
+    select 1
+  )
+  (select * from r)
+);
+
+# Field resolution in unreferenced:
+create table t1 (x int);
+
+with recursive r as (
+  select f1 from (
+    with a as (
+        select x from t1
+    )
+    select 1 as f1
+  ) y
+
+  union
+
+  select null
+)
+(select * from r);
+
+--error ER_BAD_FIELD_ERROR
+with recursive r as (
+  select f1 from (
+    with a as (
+        select f2 from t1
+    )
+    select 1 as f1
+  ) y
+
+  union
+
+  select null
+)
+(select * from r);
+
+drop table t1;
+
+with recursive r as (
+  select 1 as f1
+
+  union
+
+  select f1 from (
+    with a as (
+        select f1 from r
+    )
+    select 1 as f1
+  ) y
+)
+(select f1 from r);
+
+--error ER_BAD_FIELD_ERROR
+with recursive r as (
+  select 1 as f1
+
+  union
+
+  select f1 from (
+    with a as (
+        select f2 from r
+    )
+    select 1 as f1
+  ) y
+)
+(select f1 from r);
+
+
 --echo # End of 10.6 tests
diff --git a/sql/sql_cte.cc b/sql/sql_cte.cc
index 278bc38305f..92bb1dc596a 100644
--- a/sql/sql_cte.cc
+++ b/sql/sql_cte.cc
@@ -100,6 +100,19 @@ bool LEX::check_dependencies_in_with_clauses()
 }
 
 
+bool LEX::prepare_unreferenced_in_with_clauses()
+{
+  for (With_clause *with_clause= with_clauses_list;
+       with_clause;
+       with_clause= with_clause->next_with_clause)
+  {
+    if (with_clause->prepare_unreferenced_elements(thd))
+      return true;
+  }
+  return false;
+}
+
+
 /**
   @brief
     Resolve table references to CTE from a sub-chain of table references
diff --git a/sql/sql_cte.h b/sql/sql_cte.h
index 1da7c6c323a..6d0e1bb41cb 100644
--- a/sql/sql_cte.h
+++ b/sql/sql_cte.h
@@ -438,9 +438,7 @@ public:
   void print(THD *thd, String *str, enum_query_type query_type);
 
   friend class With_element;
-
-  friend
-  bool LEX::check_dependencies_in_with_clauses();
+  friend struct LEX;
 };
 
 inline
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 5c1bc968f44..4055e074f1d 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -4954,6 +4954,7 @@ public:
                               DDL_options ddl_options);
 
   bool check_dependencies_in_with_clauses();
+  bool prepare_unreferenced_in_with_clauses();
   bool check_cte_dependencies_and_resolve_references();
   bool resolve_references_to_cte(TABLE_LIST *tables,
                                  TABLE_LIST **tables_last,
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 218d110e7c5..e62c9056804 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -1628,6 +1628,10 @@ static int mysql_test_select(Prepared_statement *stmt,
   */
   if (unit->prepare(unit->derived, 0, 0))
     goto error;
+
+  if (thd->lex->prepare_unreferenced_in_with_clauses())
+    goto error;
+
   if (!lex->describe && !thd->lex->analyze_stmt && !stmt->is_sql_prepare())
   {
     /* Make copy of item list, as change_columns may change it */
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 71715f743b6..a025b7484b5 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1645,10 +1645,6 @@ JOIN::prepare(TABLE_LIST *tables_init, COND *conds_init, uint og_num,
     }
   }
 
-  With_clause *with_clause=select_lex->get_with_clause();
-  if (with_clause && with_clause->prepare_unreferenced_elements(thd))
-    DBUG_RETURN(1);
-
   With_element *with_elem= select_lex->get_with_element();
   if (with_elem &&
       select_lex->check_unrestricted_recursive(
@@ -5265,6 +5261,10 @@ mysql_select(THD *thd, TABLE_LIST *tables, List<Item> &fields, COND *conds,
   }
 
   thd->get_stmt_da()->reset_current_row_for_warning(1);
+
+  if (thd->lex->prepare_unreferenced_in_with_clauses())
+    goto err;
+
   /* Look for a table owned by an engine with the select_handler interface */
   select_lex->pushdown_select= find_select_handler(thd, select_lex);
 

From 10643cffe98a42ee28a9f16b70ad7dff90563a03 Mon Sep 17 00:00:00 2001
From: Aleksey Midenkov <midenok@gmail.com>
Date: Tue, 23 Dec 2025 13:42:45 +0300
Subject: [PATCH 099/119] MDEV-37325 Incorrect results for INTERSECT ALL in
 ORACLE mode

Oracle mode has no priority between set-operators but the current
implementation with disable_index_if_needed() can not work with
arbitrary mix of distinct/non-distinct set-operators as the algorithm
is tied to the properly wrapped version of expression. Index can be
disabled only once and cannot be reenabled afterwards.

To adapt Oracle mode for the aforementioned implementation we
prioritize each set operator with parens in the order of
appearance. So the expression:

  S1 op1 S2 op2 S3 op3 S4

will be rewritten like this:

  (((S1 op1 S2) op2 S3) op3 S4).

The rewritten expression is valid for both Oracle and default mode and
renders the same result. Prioritizing is done with
create_priority_nest() but it was tweaked to work with derived to be
the first operand. Originally create_priority_nest() could wrap only
second operand, like this:

  S1 op1 S2 op2 S3 -> S1 op1 (S2 op2 S3).

Now this behaviour is kept by non-NULL attach_to argument. With NULL
attach_to argument it produces this transformation:

  S1 op1 S2 -> (S1 op1 S2), but to be strict it will look like this:
  SELECT .. FROM (S1 op1 S2).

This expression is treated as the first one in the select list, so
nothing to "attach to".

On importance of not making fake_select_lex after
create_priority_nest() in parsed_select_expr_start(). This will fail
nastily in Protocol::valid_handler() check in store_longlong() for
EXPLAIN. This happens because select_options are inherited from newly
made fake_select_lex but without SELECT_DESCRIBE flag which is meant
to be assigned by mysql_explain_union() but union_needs_tmp_table() is
false (because now top-level unit has no set-operator, it is just
select from derived), so SELECT_DESCRIBE assignment is
skipped. Depending on that flag send_result_set_metadata() is
conditionally executed in JOIN::exec_inner(). And originally it is
done via select_describe() branch for top-level select when there is
no set operator (it is select from derived as explained above), not
via direct send_result_set_metadata().

On IS_OR_WAS_ORACLE. Sql_mode_save_for_frm_handling removes MODE_ORACLE
when view is registered or opened. We cannot return it back as this
conflicts with MDEV-12478 (tested by compat/oracle.func_concat). So we
are temporarily adding WAS_ORACLE flag instead. WAS_MODE_ORACLE is for
testing both WAS_ORACLE and MODE_ORACLE simultaneously.
---
 mysql-test/main/intersect_all.result          |  271 ++-
 mysql-test/main/intersect_all.test            |  105 +
 mysql-test/main/set_operation_oracle.result   |  102 +-
 .../oracle/r/empty_string_literal.result      |    2 +-
 mysql-test/suite/compat/oracle/r/minus.result |    2 +-
 .../compat/oracle/r/table_value_constr.result | 1783 +++++++++++------
 .../compat/oracle/t/table_value_constr.test   |   12 +
 sql/sql_class.h                               |   13 +-
 sql/sql_lex.cc                                |   48 +-
 sql/sql_lex.h                                 |    6 +-
 sql/sql_union.cc                              |    8 +-
 11 files changed, 1615 insertions(+), 737 deletions(-)

diff --git a/mysql-test/main/intersect_all.result b/mysql-test/main/intersect_all.result
index eeb0c8b5892..028a76944b3 100644
--- a/mysql-test/main/intersect_all.result
+++ b/mysql-test/main/intersect_all.result
@@ -1023,23 +1023,31 @@ NULL	UNION RESULT	<union1,4>	ALL	NULL	NULL	NULL	NULL	NULL
 set sql_mode= 'oracle';
 explain SELECT * from t3 union select * from u3 intersect all select * from i3;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t3	system	NULL	NULL	NULL	NULL	0	Const row not found
-2	UNION	u3	system	NULL	NULL	NULL	NULL	0	Const row not found
-3	INTERSECT	i3	system	NULL	NULL	NULL	NULL	0	Const row not found
-NULL	UNIT RESULT	<unit1,2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
-select * from t3 union select * from u3 intersect select * from i3;
+1	PRIMARY	<derived4>	ALL	NULL	NULL	NULL	NULL	2	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	no matching row in const table
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	no matching row in const table
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+5	INTERSECT	NULL	NULL	NULL	NULL	NULL	NULL	NULL	no matching row in const table
+NULL	INTERSECT RESULT	<intersect4,5>	ALL	NULL	NULL	NULL	NULL	NULL	
+select x from t3 union select x from u3 intersect select x from i3;
 x
-SELECT * from t3 union select * from u3 intersect all select * from i3;
+SELECT x from t3 union select x from u3 intersect all select x from i3;
 x
 insert into t3 values (0);
 insert into i3 values (0);
-Select * from t3 union select * from u3 intersect select * from i3;
+Select x from t3 union select x from u3 intersect select x from i3;
 x
 0
-SELECT * FROM t3 UNION SELECT * FROM u3 INTERSECT ALL SELECT * FROM i3;
+SELECT x FROM t3 UNION SELECT x FROM u3 INTERSECT ALL SELECT x FROM i3;
+x
+0
+create view v as select * from t3 union select * from u3 intersect select * from i3;
+select * from v;
 x
 0
 drop tables t3, u3, i3;
+drop view v;
 # First line of these results is column names, not the result
 # (pay attention to "affected rows")
 values (1, 2) union all values (1, 2);
@@ -1065,10 +1073,47 @@ values (1, 2) union all values (1, 2) union values (4, 3) union all values (4, 3
 1	2
 4	3
 affected rows: 2
+set sql_mode= default;
 create table t1 (a int, b int);
 create table t2 like t1;
 insert t1 values (1, 2), (1, 2), (1, 2), (2, 3), (2, 3), (3, 4), (3, 4);
 insert t2 values (1, 2), (1, 2), (2, 3), (2, 3), (2, 3), (2, 3), (4, 5);
+select * from t1 intersect all select * from t2;
+a	b
+1	2
+2	3
+1	2
+2	3
+select * from t1 intersect all select * from t2 union values (1, 2);
+a	b
+1	2
+2	3
+select * from t1 intersect all (select * from t2 union values (1, 2));
+a	b
+1	2
+2	3
+(select * from t1 intersect all select * from t2) union values (1, 2);
+a	b
+1	2
+2	3
+create view v1 as select * from t1 intersect all select * from t2 union values (1, 2);
+show create view v1;
+View	Create View	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a`,`t1`.`b` AS `b` from `t1` intersect all select `t2`.`a` AS `a`,`t2`.`b` AS `b` from `t2` union values (1,2)	latin1	latin1_swedish_ci
+select * from v1;
+a	b
+1	2
+2	3
+create view v2 as select * from t1 union values (1, 2) intersect all select * from t2;
+show create view v2;
+View	Create View	character_set_client	collation_connection
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `t1`.`a` AS `a`,`t1`.`b` AS `b` from `t1` union select `__5`.`1` AS `1`,`__5`.`2` AS `2` from (values (1,2) intersect all select `t2`.`a` AS `a`,`t2`.`b` AS `b` from `t2`) `__5`	latin1	latin1_swedish_ci
+select * from v2;
+a	b
+1	2
+2	3
+3	4
+set sql_mode= 'oracle';
 select * from t1 intersect select * from t2;
 a	b
 1	2
@@ -1098,8 +1143,6 @@ select * from t1 intersect all select * from t2 union values (1, 2);
 a	b
 1	2
 2	3
-1	2
-2	3
 select * from t1 intersect all (select * from t2 union values (1, 2));
 a	b
 1	2
@@ -1110,9 +1153,209 @@ a	b
 2	3
 explain select * from t1 intersect all select * from t2 union values (1, 2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	7	
-2	INTERSECT	t2	ALL	NULL	NULL	NULL	NULL	7	
-3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNIT RESULT	<unit1,2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived4>	ALL	NULL	NULL	NULL	NULL	8	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	7	
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	7	
+3	INTERSECT	t2	ALL	NULL	NULL	NULL	NULL	7	
+NULL	INTERSECT RESULT	<intersect2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+5	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union4,5>	ALL	NULL	NULL	NULL	NULL	NULL	
+show create view v1;
+View	Create View	character_set_client	collation_connection
+v1	CREATE VIEW "v1" AS select "__6"."a" AS "a","__6"."b" AS "b" from (select "__4"."a" AS "a","__4"."b" AS "b" from (select "t1"."a" AS "a","t1"."b" AS "b" from "t1" intersect all select "t2"."a" AS "a","t2"."b" AS "b" from "t2") "__4" union values (1,2)) "__6"	latin1	latin1_swedish_ci
+select * from v1;
+a	b
+1	2
+2	3
+show create view v2;
+View	Create View	character_set_client	collation_connection
+v2	CREATE VIEW "v2" AS select "__7"."a" AS "a","__7"."b" AS "b" from (select "t1"."a" AS "a","t1"."b" AS "b" from "t1" union select "__5"."1" AS "1","__5"."2" AS "2" from (select "__6"."1" AS "1","__6"."2" AS "2" from (values (1,2) intersect all select "t2"."a" AS "a","t2"."b" AS "b" from "t2") "__6") "__5") "__7"	latin1	latin1_swedish_ci
+select * from v2;
+a	b
+1	2
+2	3
+3	4
+create view v3 as select * from t1 union values (1, 2) intersect all select * from t2;
+show create view v3;
+View	Create View	character_set_client	collation_connection
+v3	CREATE VIEW "v3" AS select "__6"."a" AS "a","__6"."b" AS "b" from (select "__8"."a" AS "a","__8"."b" AS "b" from (select "__4"."a" AS "a","__4"."b" AS "b" from (select "__6"."a" AS "a","__6"."b" AS "b" from (select "t1"."a" AS "a","t1"."b" AS "b" from "t1" union values (1,2)) "__6") "__4" intersect all select "t2"."a" AS "a","t2"."b" AS "b" from "t2") "__8") "__6"	latin1	latin1_swedish_ci
+select * from v3;
+a	b
+1	2
+2	3
 drop tables t1, t2;
+drop view v1, v2, v3;
+create table t3 (x int);
+create table u3 (x int);
+create table i3 (x int);
+create view v4 as SELECT * from t3 union select * from u3 intersect all select * from i3;
+select * from v4;
+x
+drop tables t3, u3, i3;
+drop view v4;
+set sql_mode= default;
+#
+# MDEV-37325 Incorrect results for INTERSECT ALL in ORACLE mode
+#
+create table t1 (a int, b int);
+create table t2 like t1;
+insert t1 values (1, 2), (1, 2), (1, 2), (1, 2);
+insert t2 values (1, 2), (1, 2);
+select * from t1 except all select * from t2 intersect all values (1, 2);
+a	b
+1	2
+1	2
+1	2
+explain select * from t1 except all select * from t2 intersect all values (1, 2);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	4	
+4	EXCEPT	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
+2	DERIVED	t2	ALL	NULL	NULL	NULL	NULL	2	
+3	INTERSECT	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	INTERSECT RESULT	<intersect2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+NULL	EXCEPT RESULT	<except1,4>	ALL	NULL	NULL	NULL	NULL	NULL	
+Explain select * from (select * from (select * from t1 except all select * from t2) __3 intersect all values (1,2)) __5;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
+2	DERIVED	<derived3>	ALL	NULL	NULL	NULL	NULL	4	
+3	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	4	
+4	EXCEPT	t2	ALL	NULL	NULL	NULL	NULL	2	
+NULL	EXCEPT RESULT	<except3,4>	ALL	NULL	NULL	NULL	NULL	NULL	
+5	INTERSECT	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	INTERSECT RESULT	<intersect2,5>	ALL	NULL	NULL	NULL	NULL	NULL	
+create view v1 as select * from t1 except all select * from t2 intersect all values (1, 2);
+show create view v1;
+View	Create View	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a`,`t1`.`b` AS `b` from `t1` except all select `__5`.`a` AS `a`,`__5`.`b` AS `b` from (select `t2`.`a` AS `a`,`t2`.`b` AS `b` from `t2` intersect all values (1,2)) `__5`	latin1	latin1_swedish_ci
+select * from v1;
+a	b
+1	2
+1	2
+1	2
+drop view v1;
+create view v1 as ((select * from t1 except all select * from t2) intersect all values (1, 2));
+show create view v1;
+View	Create View	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `__5`.`a` AS `a`,`__5`.`b` AS `b` from (select `t1`.`a` AS `a`,`t1`.`b` AS `b` from `t1` except all select `t2`.`a` AS `a`,`t2`.`b` AS `b` from `t2`) `__5` intersect all values (1,2)	latin1	latin1_swedish_ci
+select * from v1;
+a	b
+1	2
+drop view v1;
+explain select * from ((select * from t1 except all select * from t2) intersect all values (1, 2)) v;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived5>	ALL	NULL	NULL	NULL	NULL	2	
+5	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	4	
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	4	
+3	EXCEPT	t2	ALL	NULL	NULL	NULL	NULL	2	
+NULL	EXCEPT RESULT	<except2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+4	INTERSECT	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	INTERSECT RESULT	<intersect5,4>	ALL	NULL	NULL	NULL	NULL	NULL	
+# Oracle: first UNION, then INTERSECT ALL
+set sql_mode= 'oracle';
+create view v2 as select * from t1 except all select * from t2 intersect all values (1, 2);
+show create view v2;
+View	Create View	character_set_client	collation_connection
+v2	CREATE VIEW "v2" AS select "__6"."a" AS "a","__6"."b" AS "b" from (select "__8"."a" AS "a","__8"."b" AS "b" from (select "__4"."a" AS "a","__4"."b" AS "b" from (select "__6"."a" AS "a","__6"."b" AS "b" from (select "t1"."a" AS "a","t1"."b" AS "b" from "t1" except all select "t2"."a" AS "a","t2"."b" AS "b" from "t2") "__6") "__4" intersect all values (1,2)) "__8") "__6"	latin1	latin1_swedish_ci
+select * from v2;
+a	b
+1	2
+drop view v2;
+EXPLAIN select * from t1 except all select * from t2 intersect all values (1, 2);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived4>	ALL	NULL	NULL	NULL	NULL	2	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	4	
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	4	
+3	EXCEPT	t2	ALL	NULL	NULL	NULL	NULL	2	
+NULL	EXCEPT RESULT	<except2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+5	INTERSECT	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	INTERSECT RESULT	<intersect4,5>	ALL	NULL	NULL	NULL	NULL	NULL	
+select * from t2 union all select * from t2;
+a	b
+1	2
+1	2
+1	2
+1	2
+select * from t1 except all select * from t2 intersect all values (1, 2) union values (2, 3);
+a	b
+1	2
+2	3
+select * from t2 union all select * from t2 except all select * from t2 intersect all values (1, 2) union values (2, 3);
+a	b
+1	2
+2	3
+select * from t1 except all select * from t2 union values (2, 3);
+a	b
+1	2
+2	3
+# Default: first INTERSECT ALL, then UNION
+select * from t1 union values (1, 2) intersect all select * from t2;
+a	b
+1	2
+select * from t1 union (values (1, 2) intersect all select * from t2);
+a	b
+1	2
+set sql_mode= default;
+select * from t1 union values (1, 2) intersect all select * from t2;
+a	b
+1	2
+select * from t1 union (values (1, 2) intersect all select * from t2);
+a	b
+1	2
+set sql_mode= 'oracle';
+create or replace table t2 like t1;
+insert t2 values (1, 2), (2, 3);
+create table t3 select * from t1 except all select * from t2;
+select * from t3;
+a	b
+1	2
+1	2
+1	2
+select * from t3 intersect all select * from t1;
+a	b
+1	2
+1	2
+1	2
+show create table t2;
+Table	Create Table
+t2	CREATE TABLE "t2" (
+  "a" int(11) DEFAULT NULL,
+  "b" int(11) DEFAULT NULL
+)
+select * from t2 order by a desc;
+a	b
+2	3
+1	2
+select * from t1 except all select * from t2;
+a	b
+1	2
+1	2
+1	2
+select * from t1 except all select * from t2 union all values (0, 1);
+a	b
+1	2
+1	2
+1	2
+0	1
+select * from t1 except all select * from t2 union all values (0, 1) order by a limit 2;
+a	b
+0	1
+1	2
+select * from t1 except all select * from t2 intersect all select * from t1;
+a	b
+1	2
+1	2
+1	2
+select * from t1 except all select * from t2 intersect all select * from t1 union all select * from t2;
+a	b
+1	2
+1	2
+1	2
+1	2
+2	3
+select * from t1 except all select * from t2 intersect all select * from t1 union all select * from t2 order by a desc limit 3;
+a	b
+2	3
+1	2
+1	2
+drop tables t1, t2, t3;
 set sql_mode= default;
diff --git a/mysql-test/main/intersect_all.test b/mysql-test/main/intersect_all.test
index 8217e4ebcbc..c3dc4e123f0 100644
--- a/mysql-test/main/intersect_all.test
+++ b/mysql-test/main/intersect_all.test
@@ -336,13 +336,22 @@ create table i3 (x int);
 explain SELECT * from t3 union select * from u3 intersect all select * from i3;
 set sql_mode= 'oracle';
 explain SELECT * from t3 union select * from u3 intersect all select * from i3;
+# TODO: there is a bug in --view protocol, it displays column name as '*' instead of 'x'
+--replace_result * x
 select * from t3 union select * from u3 intersect select * from i3;
+--replace_result * x
 SELECT * from t3 union select * from u3 intersect all select * from i3;
 insert into t3 values (0);
 insert into i3 values (0);
+--replace_result * x
 Select * from t3 union select * from u3 intersect select * from i3;
+--replace_result * x
 SELECT * FROM t3 UNION SELECT * FROM u3 INTERSECT ALL SELECT * FROM i3;
+# CREATE VIEW still works good
+create view v as select * from t3 union select * from u3 intersect select * from i3;
+select * from v;
 drop tables t3, u3, i3;
+drop view v;
 
 --enable_info
 --echo # First line of these results is column names, not the result
@@ -372,10 +381,26 @@ values (1, 2) union all values (1, 2) union values (4, 3) union all values (4, 3
 values (1, 2) union all values (1, 2) union values (4, 3) union all values (4, 3) union all values (1, 2) union values (1, 2);
 --disable_info
 
+set sql_mode= default;
 create table t1 (a int, b int);
 create table t2 like t1;
 insert t1 values (1, 2), (1, 2), (1, 2), (2, 3), (2, 3), (3, 4), (3, 4);
 insert t2 values (1, 2), (1, 2), (2, 3), (2, 3), (2, 3), (2, 3), (4, 5);
+
+select * from t1 intersect all select * from t2;
+select * from t1 intersect all select * from t2 union values (1, 2);
+select * from t1 intersect all (select * from t2 union values (1, 2));
+(select * from t1 intersect all select * from t2) union values (1, 2);
+
+create view v1 as select * from t1 intersect all select * from t2 union values (1, 2);
+show create view v1;
+select * from v1;
+
+create view v2 as select * from t1 union values (1, 2) intersect all select * from t2;
+show create view v2;
+select * from v2;
+
+set sql_mode= 'oracle';
 select * from t1 intersect select * from t2;
 select * from t1 intersect all select * from t2;
 --echo # Default: first INTERSECT ALL, then UNION
@@ -390,5 +415,85 @@ select * from t1 intersect all select * from t2 union values (1, 2);
 select * from t1 intersect all (select * from t2 union values (1, 2));
 (select * from t1 intersect all select * from t2) union values (1, 2);
 explain select * from t1 intersect all select * from t2 union values (1, 2);
+
+show create view v1;
+select * from v1;
+
+show create view v2;
+select * from v2;
+
+create view v3 as select * from t1 union values (1, 2) intersect all select * from t2;
+show create view v3;
+select * from v3;
+
 drop tables t1, t2;
+drop view v1, v2, v3;
+
+create table t3 (x int);
+create table u3 (x int);
+create table i3 (x int);
+create view v4 as SELECT * from t3 union select * from u3 intersect all select * from i3;
+select * from v4;
+drop tables t3, u3, i3;
+drop view v4;
+set sql_mode= default;
+
+--echo #
+--echo # MDEV-37325 Incorrect results for INTERSECT ALL in ORACLE mode
+--echo #
+create table t1 (a int, b int);
+create table t2 like t1;
+insert t1 values (1, 2), (1, 2), (1, 2), (1, 2);
+insert t2 values (1, 2), (1, 2);
+select * from t1 except all select * from t2 intersect all values (1, 2);
+explain select * from t1 except all select * from t2 intersect all values (1, 2);
+Explain select * from (select * from (select * from t1 except all select * from t2) __3 intersect all values (1,2)) __5;
+
+create view v1 as select * from t1 except all select * from t2 intersect all values (1, 2);
+show create view v1;
+select * from v1;
+drop view v1;
+
+create view v1 as ((select * from t1 except all select * from t2) intersect all values (1, 2));
+show create view v1;
+select * from v1;
+drop view v1;
+
+explain select * from ((select * from t1 except all select * from t2) intersect all values (1, 2)) v;
+
+--echo # Oracle: first UNION, then INTERSECT ALL
+set sql_mode= 'oracle';
+create view v2 as select * from t1 except all select * from t2 intersect all values (1, 2);
+show create view v2;
+select * from v2;
+drop view v2;
+
+EXPLAIN select * from t1 except all select * from t2 intersect all values (1, 2);
+
+select * from t2 union all select * from t2;
+select * from t1 except all select * from t2 intersect all values (1, 2) union values (2, 3);
+select * from t2 union all select * from t2 except all select * from t2 intersect all values (1, 2) union values (2, 3);
+select * from t1 except all select * from t2 union values (2, 3);
+--echo # Default: first INTERSECT ALL, then UNION
+select * from t1 union values (1, 2) intersect all select * from t2;
+select * from t1 union (values (1, 2) intersect all select * from t2);
+set sql_mode= default;
+select * from t1 union values (1, 2) intersect all select * from t2;
+select * from t1 union (values (1, 2) intersect all select * from t2);
+
+set sql_mode= 'oracle';
+create or replace table t2 like t1;
+insert t2 values (1, 2), (2, 3);
+create table t3 select * from t1 except all select * from t2;
+select * from t3;
+select * from t3 intersect all select * from t1;
+show create table t2;
+select * from t2 order by a desc;
+select * from t1 except all select * from t2;
+select * from t1 except all select * from t2 union all values (0, 1);
+select * from t1 except all select * from t2 union all values (0, 1) order by a limit 2;
+select * from t1 except all select * from t2 intersect all select * from t1;
+select * from t1 except all select * from t2 intersect all select * from t1 union all select * from t2;
+select * from t1 except all select * from t2 intersect all select * from t1 union all select * from t2 order by a desc limit 3;
+drop tables t1, t2, t3;
 set sql_mode= default;
diff --git a/mysql-test/main/set_operation_oracle.result b/mysql-test/main/set_operation_oracle.result
index 947e5e9a11c..95cc7dda806 100644
--- a/mysql-test/main/set_operation_oracle.result
+++ b/mysql-test/main/set_operation_oracle.result
@@ -7,34 +7,44 @@ insert into t3 values (1,1),(3,3);
 set SQL_MODE=ORACLE;
 (select a,b from t1) union (select c,d from t2) intersect (select e,f from t3) union (select 4,4);
 a	b
-4	4
 3	3
+4	4
 explain extended
 (select a,b from t1) union (select c,d from t2) intersect (select e,f from t3) union (select 4,4);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
-2	UNION	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
-3	INTERSECT	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
-4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNIT RESULT	<unit1,2,3,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	100.00	
+6	DERIVED	<derived4>	ALL	NULL	NULL	NULL	NULL	2	100.00	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
+3	UNION	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+5	INTERSECT	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
+NULL	INTERSECT RESULT	<intersect4,5>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+7	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union6,7>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	(/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1") union (/* select#2 */ select "test"."t2"."c" AS "c","test"."t2"."d" AS "d" from "test"."t2") intersect (/* select#3 */ select "test"."t3"."e" AS "e","test"."t3"."f" AS "f" from "test"."t3") union (/* select#4 */ select 4 AS "4",4 AS "4")
+Note	1003	/* select#1 */ select "__7"."a" AS "a","__7"."b" AS "b" from (/* select#6 */ select "__5"."a" AS "a","__5"."b" AS "b" from (/* select#4 */ select "__3"."a" AS "a","__3"."b" AS "b" from ((/* select#2 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1") union (/* select#3 */ select "test"."t2"."c" AS "c","test"."t2"."d" AS "d" from "test"."t2")) "__3" intersect (/* select#5 */ select "test"."t3"."e" AS "e","test"."t3"."f" AS "f" from "test"."t3")) "__5" union (/* select#7 */ select 4 AS "4",4 AS "4")) "__7"
 (select e,f from t3) intersect (select c,d from t2) union (select a,b from t1) union (select 4,4);
 e	f
-5	5
 3	3
+5	5
 6	6
 4	4
 explain extended
 (select e,f from t3) intersect (select c,d from t2) union (select a,b from t1) union (select 4,4);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
-2	INTERSECT	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
-3	UNION	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
-4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNIT RESULT	<unit1,2,3,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+6	DERIVED	<derived4>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
+2	DERIVED	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
+3	INTERSECT	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
+NULL	INTERSECT RESULT	<intersect2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+5	UNION	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
+NULL	UNION RESULT	<union4,5>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+7	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union6,7>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	(/* select#1 */ select "test"."t3"."e" AS "e","test"."t3"."f" AS "f" from "test"."t3") intersect (/* select#2 */ select "test"."t2"."c" AS "c","test"."t2"."d" AS "d" from "test"."t2") union (/* select#3 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1") union (/* select#4 */ select 4 AS "4",4 AS "4")
+Note	1003	/* select#1 */ select "__7"."e" AS "e","__7"."f" AS "f" from (/* select#6 */ select "__5"."e" AS "e","__5"."f" AS "f" from (/* select#4 */ select "__3"."e" AS "e","__3"."f" AS "f" from ((/* select#2 */ select "test"."t3"."e" AS "e","test"."t3"."f" AS "f" from "test"."t3") intersect (/* select#3 */ select "test"."t2"."c" AS "c","test"."t2"."d" AS "d" from "test"."t2")) "__3" union (/* select#5 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1")) "__5" union (/* select#7 */ select 4 AS "4",4 AS "4")) "__7"
 create table t12(c1 int);
 insert into t12 values(1);
 insert into t12 values(2);
@@ -61,18 +71,21 @@ insert into t3 values (1,1),(3,3);
 set SQL_MODE=ORACLE;
 select a,b from t1 union all select c,d from t2 intersect select e,f from t3 union all select 4,'4' from dual;
 a	b
-4	4
 3	3
+4	4
 explain extended
 select a,b from t1 union all select c,d from t2 intersect select e,f from t3 union all select 4,'4' from dual;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
-2	UNION	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
-3	INTERSECT	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
-4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNIT RESULT	<unit1,2,3,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	100.00	
+6	DERIVED	<derived4>	ALL	NULL	NULL	NULL	NULL	2	100.00	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
+3	UNION	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
+5	INTERSECT	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
+NULL	INTERSECT RESULT	<intersect4,5>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+7	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" union all /* select#2 */ select "test"."t2"."c" AS "c","test"."t2"."d" AS "d" from "test"."t2" intersect /* select#3 */ select "test"."t3"."e" AS "e","test"."t3"."f" AS "f" from "test"."t3" union all /* select#4 */ select 4 AS "4",'4' AS "4"
+Note	1003	/* select#1 */ select "__7"."a" AS "a","__7"."b" AS "b" from (/* select#6 */ select "__5"."a" AS "a","__5"."b" AS "b" from (/* select#4 */ select "__3"."a" AS "a","__3"."b" AS "b" from (/* select#2 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" union all /* select#3 */ select "test"."t2"."c" AS "c","test"."t2"."d" AS "d" from "test"."t2") "__3" intersect /* select#5 */ select "test"."t3"."e" AS "e","test"."t3"."f" AS "f" from "test"."t3") "__5" union all /* select#7 */ select 4 AS "4",'4' AS "4") "__7"
 select a,b from t1 union all select c,d from t2 intersect all select e,f from t3 union all select 4,'4' from dual;
 a	b
 3	3
@@ -80,29 +93,35 @@ a	b
 explain extended
 select a,b from t1 union all select c,d from t2 intersect all select e,f from t3 union all select 4,'4' from dual;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
-2	UNION	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
-3	INTERSECT	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
-4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNIT RESULT	<unit1,2,3,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	2	100.00	
+6	DERIVED	<derived4>	ALL	NULL	NULL	NULL	NULL	2	100.00	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
+3	UNION	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
+5	INTERSECT	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
+NULL	INTERSECT RESULT	<intersect4,5>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+7	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" union all /* select#2 */ select "test"."t2"."c" AS "c","test"."t2"."d" AS "d" from "test"."t2" intersect all /* select#3 */ select "test"."t3"."e" AS "e","test"."t3"."f" AS "f" from "test"."t3" union all /* select#4 */ select 4 AS "4",'4' AS "4"
+Note	1003	/* select#1 */ select "__7"."a" AS "a","__7"."b" AS "b" from (/* select#6 */ select "__5"."a" AS "a","__5"."b" AS "b" from (/* select#4 */ select "__3"."a" AS "a","__3"."b" AS "b" from (/* select#2 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" union all /* select#3 */ select "test"."t2"."c" AS "c","test"."t2"."d" AS "d" from "test"."t2") "__3" intersect all /* select#5 */ select "test"."t3"."e" AS "e","test"."t3"."f" AS "f" from "test"."t3") "__5" union all /* select#7 */ select 4 AS "4",'4' AS "4") "__7"
 select e,f from t3 intersect select c,d from t2 union all select a,b from t1 union all select 4,'4' from dual;
 e	f
-5	5
 3	3
+5	5
 6	6
 4	4
 explain extended
 select e,f from t3 intersect select c,d from t2 union all select a,b from t1 union all select 4,'4' from dual;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
-2	INTERSECT	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
-3	UNION	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
-4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNIT RESULT	<unit1,2,3,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+6	DERIVED	<derived4>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
+2	DERIVED	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
+3	INTERSECT	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
+NULL	INTERSECT RESULT	<intersect2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+5	UNION	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
+7	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	/* select#1 */ select "test"."t3"."e" AS "e","test"."t3"."f" AS "f" from "test"."t3" intersect /* select#2 */ select "test"."t2"."c" AS "c","test"."t2"."d" AS "d" from "test"."t2" union all /* select#3 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" union all /* select#4 */ select 4 AS "4",'4' AS "4"
+Note	1003	/* select#1 */ select "__7"."e" AS "e","__7"."f" AS "f" from (/* select#6 */ select "__5"."e" AS "e","__5"."f" AS "f" from (/* select#4 */ select "__3"."e" AS "e","__3"."f" AS "f" from (/* select#2 */ select "test"."t3"."e" AS "e","test"."t3"."f" AS "f" from "test"."t3" intersect /* select#3 */ select "test"."t2"."c" AS "c","test"."t2"."d" AS "d" from "test"."t2") "__3" union all /* select#5 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1") "__5" union all /* select#7 */ select 4 AS "4",'4' AS "4") "__7"
 select e,f from t3 intersect all select c,d from t2 union all select a,b from t1 union all select 4,'4' from dual;
 e	f
 3	3
@@ -112,13 +131,16 @@ e	f
 explain extended
 select e,f from t3 intersect all select c,d from t2 union all select a,b from t1 union all select 4,'4' from dual;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
-2	INTERSECT	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
-3	UNION	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
-4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNIT RESULT	<unit1,2,3,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived6>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+6	DERIVED	<derived4>	ALL	NULL	NULL	NULL	NULL	4	100.00	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
+2	DERIVED	t3	ALL	NULL	NULL	NULL	NULL	2	100.00	
+3	INTERSECT	t2	ALL	NULL	NULL	NULL	NULL	2	100.00	
+NULL	INTERSECT RESULT	<intersect2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+5	UNION	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	
+7	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	/* select#1 */ select "test"."t3"."e" AS "e","test"."t3"."f" AS "f" from "test"."t3" intersect all /* select#2 */ select "test"."t2"."c" AS "c","test"."t2"."d" AS "d" from "test"."t2" union all /* select#3 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" union all /* select#4 */ select 4 AS "4",'4' AS "4"
+Note	1003	/* select#1 */ select "__7"."e" AS "e","__7"."f" AS "f" from (/* select#6 */ select "__5"."e" AS "e","__5"."f" AS "f" from (/* select#4 */ select "__3"."e" AS "e","__3"."f" AS "f" from (/* select#2 */ select "test"."t3"."e" AS "e","test"."t3"."f" AS "f" from "test"."t3" intersect all /* select#3 */ select "test"."t2"."c" AS "c","test"."t2"."d" AS "d" from "test"."t2") "__3" union all /* select#5 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1") "__5" union all /* select#7 */ select 4 AS "4",'4' AS "4") "__7"
 set SQL_MODE=default;
 drop table t1,t2,t3;
 set SQL_MODE=oracle;
diff --git a/mysql-test/suite/compat/oracle/r/empty_string_literal.result b/mysql-test/suite/compat/oracle/r/empty_string_literal.result
index 1260c7aa75d..4ac87bf6f24 100644
--- a/mysql-test/suite/compat/oracle/r/empty_string_literal.result
+++ b/mysql-test/suite/compat/oracle/r/empty_string_literal.result
@@ -156,7 +156,7 @@ c1	c2
 1	one
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE VIEW "v1" AS select "t1"."c1" AS "c1","t1"."c2" AS "c2" from "t1" union select "t1"."c1" AS "c1",NULL AS "NULL" from "t1" order by 1,2	cp1250	latin2_general_ci
+v1	CREATE VIEW "v1" AS select "__4"."c1" AS "c1","__4"."c2" AS "c2" from (select "__5"."c1" AS "c1","__5"."c2" AS "c2" from (select "t1"."c1" AS "c1","t1"."c2" AS "c2" from "t1" union select "t1"."c1" AS "c1",NULL AS "NULL" from "t1") "__5") "__4" order by 1,2	cp1250	latin2_general_ci
 DROP VIEW v1;
 DROP TABLE t1;
 EXPLAIN EXTENDED SELECT '';
diff --git a/mysql-test/suite/compat/oracle/r/minus.result b/mysql-test/suite/compat/oracle/r/minus.result
index 67b7e5347c3..9ce10820f90 100644
--- a/mysql-test/suite/compat/oracle/r/minus.result
+++ b/mysql-test/suite/compat/oracle/r/minus.result
@@ -37,9 +37,9 @@ c2
 menny
 SELECT c2 FROM tx1 MINUS SELECT c2 from tx2 UNION SELECT c2 from tx3;
 c2
-jim
 menny
 linda
+jim
 kris
 create table MINUS (a int);
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'MINUS (a int)' at line 1
diff --git a/mysql-test/suite/compat/oracle/r/table_value_constr.result b/mysql-test/suite/compat/oracle/r/table_value_constr.result
index 8b377a2e95b..439b44b1f64 100644
--- a/mysql-test/suite/compat/oracle/r/table_value_constr.result
+++ b/mysql-test/suite/compat/oracle/r/table_value_constr.result
@@ -247,16 +247,16 @@ except
 select 1,2
 union values (1,2);
 1	2
-1	2
 3	4
+1	2
 values (1,2),(3,4)
 except
 values (1,2)
 union
 values (1,2);
 1	2
-1	2
 3	4
+1	2
 values (1,2),(3,4)
 except
 values (1,2)
@@ -278,16 +278,16 @@ select 1,2
 union all
 values (1,2);
 1	2
-1	2
 3	4
+1	2
 values (1,2),(3,4)
 except
 values (1,2)
 union all
 values (1,2);
 1	2
-1	2
 3	4
+1	2
 values (1,2),(3,4)
 except
 values (1,2)
@@ -774,23 +774,24 @@ explain extended select * from t1
 where a in (values (1) union select 2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-4	DEPENDENT SUBQUERY	<derived2>	ref	key0	key0	4	func	2	100.00	
+1	PRIMARY	<derived2>	ref	key0	key0	4	test.t1.a	1	100.00	FirstMatch(t1)
 2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	DEPENDENT UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union4,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#4 */ select "tvc_0"."1" from (values (1)) "tvc_0" where <cache>("test"."t1"."a") = "tvc_0"."1" union /* select#3 */ select 2 having <cache>("test"."t1"."a") = <ref_null_helper>(2))))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" semi join ((values (1) union /* select#3 */ select 2 AS "2") "__4") where "__4"."1" = "test"."t1"."a"
 explain extended select * from t1
 where a in (select * from (values (1)) as tvc_0 union 
 select 2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	<derived3>	ref	key0	key0	4	func	2	100.00	
+1	PRIMARY	<derived2>	ref	key0	key0	4	test.t1.a	1	100.00	FirstMatch(t1)
+2	DERIVED	<derived3>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-4	DEPENDENT UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select "tvc_0"."1" from (values (1)) "tvc_0" where <cache>("test"."t1"."a") = "tvc_0"."1" union /* select#4 */ select 2 having <cache>("test"."t1"."a") = <ref_null_helper>(2))))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" semi join ((/* select#2 */ select "tvc_0"."1" AS "1" from (values (1)) "tvc_0" union /* select#4 */ select 2 AS "2") "__5") where "__5"."1" = "test"."t1"."a"
 # IN-subquery with VALUES structure(s) : UNION with VALUES on the second place
 select * from t1
 where a in (select 2 union values (1));
@@ -809,23 +810,24 @@ explain extended select * from t1
 where a in (select 2 union values (1));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-4	DEPENDENT UNION	<derived3>	ref	key0	key0	4	func	2	100.00	
-3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived2>	ref	key0	key0	4	test.t1.a	1	100.00	FirstMatch(t1)
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select 2 having <cache>("test"."t1"."a") = <ref_null_helper>(2) union /* select#4 */ select "tvc_0"."1" from (values (1)) "tvc_0" where <cache>("test"."t1"."a") = "tvc_0"."1")))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" semi join ((/* select#2 */ select 2 AS "2" union values (1)) "__4") where "__4"."2" = "test"."t1"."a"
 explain extended select * from t1
 where a in (select 2 union 
 select * from (values (1)) tvc_0);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	DEPENDENT UNION	<derived4>	ref	key0	key0	4	func	2	100.00	
+1	PRIMARY	<derived2>	ref	key0	key0	4	test.t1.a	1	100.00	FirstMatch(t1)
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	<derived4>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 4	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select 2 having <cache>("test"."t1"."a") = <ref_null_helper>(2) union /* select#3 */ select "tvc_0"."1" from (values (1)) "tvc_0" where <cache>("test"."t1"."a") = "tvc_0"."1")))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" semi join ((/* select#2 */ select 2 AS "2" union /* select#3 */ select "tvc_0"."1" AS "1" from (values (1)) "tvc_0") "__5") where "__5"."2" = "test"."t1"."a"
 # IN-subquery with VALUES structure(s) : UNION ALL
 select * from t1
 where a in (values (1) union all select b from t1);
@@ -846,21 +848,22 @@ explain extended select * from t1
 where a in (values (1) union all select b from t1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-4	DEPENDENT SUBQUERY	<derived2>	ref	key0	key0	4	func	2	100.00	
+1	PRIMARY	<derived2>	ref	key0	key0	5	test.t1.a	2	100.00	FirstMatch(t1)
 2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	DEPENDENT UNION	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
+3	UNION	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#4 */ select "tvc_0"."1" from (values (1)) "tvc_0" where <cache>("test"."t1"."a") = "tvc_0"."1" union all /* select#3 */ select "test"."t1"."b" from "test"."t1" where <cache>("test"."t1"."a") = "test"."t1"."b")))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" semi join ((values (1) union all /* select#3 */ select "test"."t1"."b" AS "b" from "test"."t1") "__4") where "__4"."1" = "test"."t1"."a"
 explain extended select * from t1
 where a in (select * from (values (1)) as tvc_0 union all 
 select b from t1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	<derived3>	ref	key0	key0	4	func	2	100.00	
+1	PRIMARY	<derived2>	ref	key0	key0	5	test.t1.a	2	100.00	FirstMatch(t1)
+2	DERIVED	<derived3>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-4	DEPENDENT UNION	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
+4	UNION	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select "tvc_0"."1" from (values (1)) "tvc_0" where <cache>("test"."t1"."a") = "tvc_0"."1" union all /* select#4 */ select "test"."t1"."b" from "test"."t1" where <cache>("test"."t1"."a") = "test"."t1"."b")))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" semi join ((/* select#2 */ select "tvc_0"."1" AS "1" from (values (1)) "tvc_0" union all /* select#4 */ select "test"."t1"."b" AS "b" from "test"."t1") "__5") where "__5"."1" = "test"."t1"."a"
 # NOT IN subquery with VALUES structure(s) : simple case
 select * from t1 
 where a not in (values (1),(2));
@@ -908,23 +911,24 @@ explain extended select * from t1
 where a not in (values (1) union select 2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-4	DEPENDENT SUBQUERY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+4	DEPENDENT SUBQUERY	<derived2>	index_subquery	key0	key0	4	func	1	100.00	Using where; Full scan on NULL key
 2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	DEPENDENT UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union4,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where !<expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#4 */ select "tvc_0"."1" from (values (1)) "tvc_0" where trigcond(<cache>("test"."t1"."a") = "tvc_0"."1") union /* select#3 */ select 2 having trigcond(<cache>("test"."t1"."a") = <ref_null_helper>(2)))))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where !<expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(<index_lookup>(<cache>("test"."t1"."a") in (temporary) on key0 where trigcond(<cache>("test"."t1"."a") = "__4"."1")))))
 explain extended select * from t1
 where a not in (select * from (values (1)) as tvc_0 union 
 select 2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+5	DEPENDENT SUBQUERY	<derived2>	index_subquery	key0	key0	4	func	1	100.00	Using where; Full scan on NULL key
+2	DERIVED	<derived3>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-4	DEPENDENT UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where !<expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select "tvc_0"."1" from (values (1)) "tvc_0" where trigcond(<cache>("test"."t1"."a") = "tvc_0"."1") union /* select#4 */ select 2 having trigcond(<cache>("test"."t1"."a") = <ref_null_helper>(2)))))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where !<expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(<index_lookup>(<cache>("test"."t1"."a") in (temporary) on key0 where trigcond(<cache>("test"."t1"."a") = "__5"."1")))))
 # NOT IN subquery with VALUES structure(s) : UNION with VALUES on the second place
 select * from t1
 where a not in (select 2 union values (1));
@@ -943,23 +947,24 @@ explain extended select * from t1
 where a not in (select 2 union values (1));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-4	DEPENDENT UNION	<derived3>	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
-3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+4	DEPENDENT SUBQUERY	<derived2>	index_subquery	key0	key0	4	func	1	100.00	Using where; Full scan on NULL key
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where !<expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select 2 having trigcond(<cache>("test"."t1"."a") = <ref_null_helper>(2)) union /* select#4 */ select "tvc_0"."1" from (values (1)) "tvc_0" where trigcond(<cache>("test"."t1"."a") = "tvc_0"."1"))))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where !<expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(<index_lookup>(<cache>("test"."t1"."a") in (temporary) on key0 where trigcond(<cache>("test"."t1"."a") = "__4"."2")))))
 explain extended select * from t1
 where a not in (select 2 union 
 select * from (values (1)) as tvc_0);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	DEPENDENT UNION	<derived4>	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+5	DEPENDENT SUBQUERY	<derived2>	index_subquery	key0	key0	4	func	1	100.00	Using where; Full scan on NULL key
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	<derived4>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 4	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where !<expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select 2 having trigcond(<cache>("test"."t1"."a") = <ref_null_helper>(2)) union /* select#3 */ select "tvc_0"."1" from (values (1)) "tvc_0" where trigcond(<cache>("test"."t1"."a") = "tvc_0"."1"))))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where !<expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(<index_lookup>(<cache>("test"."t1"."a") in (temporary) on key0 where trigcond(<cache>("test"."t1"."a") = "__5"."2")))))
 # ANY-subquery with VALUES structure(s) : simple case
 select * from t1 
 where a = any (values (1),(2));
@@ -1009,23 +1014,24 @@ explain extended select * from t1
 where a = any (values (1) union select 2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-4	DEPENDENT SUBQUERY	<derived2>	ref	key0	key0	4	func	2	100.00	
+1	PRIMARY	<derived2>	ref	key0	key0	4	test.t1.a	1	100.00	FirstMatch(t1)
 2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	DEPENDENT UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union4,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#4 */ select "tvc_0"."1" from (values (1)) "tvc_0" where <cache>("test"."t1"."a") = "tvc_0"."1" union /* select#3 */ select 2 having <cache>("test"."t1"."a") = <ref_null_helper>(2))))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" semi join ((values (1) union /* select#3 */ select 2 AS "2") "__4") where "__4"."1" = "test"."t1"."a"
 explain extended select * from t1
 where a = any (select * from (values (1)) as tvc_0 union 
 select 2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	<derived3>	ref	key0	key0	4	func	2	100.00	
+1	PRIMARY	<derived2>	ref	key0	key0	4	test.t1.a	1	100.00	FirstMatch(t1)
+2	DERIVED	<derived3>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-4	DEPENDENT UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select "tvc_0"."1" from (values (1)) "tvc_0" where <cache>("test"."t1"."a") = "tvc_0"."1" union /* select#4 */ select 2 having <cache>("test"."t1"."a") = <ref_null_helper>(2))))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" semi join ((/* select#2 */ select "tvc_0"."1" AS "1" from (values (1)) "tvc_0" union /* select#4 */ select 2 AS "2") "__5") where "__5"."1" = "test"."t1"."a"
 # ANY-subquery with VALUES structure(s) : UNION with VALUES on the second place
 select * from t1
 where a = any (select 2 union values (1));
@@ -1044,23 +1050,24 @@ explain extended select * from t1
 where a = any (select 2 union values (1));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-4	DEPENDENT UNION	<derived3>	ref	key0	key0	4	func	2	100.00	
-3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived2>	ref	key0	key0	4	test.t1.a	1	100.00	FirstMatch(t1)
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select 2 having <cache>("test"."t1"."a") = <ref_null_helper>(2) union /* select#4 */ select "tvc_0"."1" from (values (1)) "tvc_0" where <cache>("test"."t1"."a") = "tvc_0"."1")))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" semi join ((/* select#2 */ select 2 AS "2" union values (1)) "__4") where "__4"."2" = "test"."t1"."a"
 explain extended select * from t1
 where a = any (select 2 union 
 select * from (values (1)) as tvc_0);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	DEPENDENT UNION	<derived4>	ref	key0	key0	4	func	2	100.00	
+1	PRIMARY	<derived2>	ref	key0	key0	4	test.t1.a	1	100.00	FirstMatch(t1)
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	<derived4>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 4	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select 2 having <cache>("test"."t1"."a") = <ref_null_helper>(2) union /* select#3 */ select "tvc_0"."1" from (values (1)) "tvc_0" where <cache>("test"."t1"."a") = "tvc_0"."1")))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" semi join ((/* select#2 */ select 2 AS "2" union /* select#3 */ select "tvc_0"."1" AS "1" from (values (1)) "tvc_0") "__5") where "__5"."2" = "test"."t1"."a"
 # ALL-subquery with VALUES structure(s) : simple case
 select * from t1 
 where a = all (values (1));
@@ -1106,21 +1113,22 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
 4	DEPENDENT SUBQUERY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	DEPENDENT UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union4,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <not>(<expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#4 */ select "tvc_0"."1" from (values (1)) "tvc_0" where trigcond(<cache>("test"."t1"."a") <> "tvc_0"."1") union /* select#3 */ select 1 having trigcond(<cache>("test"."t1"."a") <> <ref_null_helper>(1))))))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <not>(<expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#4 */ select "__4"."1" from (values (1) union /* select#3 */ select 1 AS "1") "__4" where trigcond(<cache>("test"."t1"."a") <> "__4"."1")))))
 explain extended select * from t1
 where a = all (select * from (values (1)) as tvc_0 union 
 select 1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	<derived3>	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+5	DEPENDENT SUBQUERY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
+2	DERIVED	<derived3>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-4	DEPENDENT UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+4	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <not>(<expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select "tvc_0"."1" from (values (1)) "tvc_0" where trigcond(<cache>("test"."t1"."a") <> "tvc_0"."1") union /* select#4 */ select 1 having trigcond(<cache>("test"."t1"."a") <> <ref_null_helper>(1))))))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <not>(<expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#5 */ select "__5"."1" from (/* select#2 */ select "tvc_0"."1" AS "1" from (values (1)) "tvc_0" union /* select#4 */ select 1 AS "1") "__5" where trigcond(<cache>("test"."t1"."a") <> "__5"."1")))))
 # ALL-subquery with VALUES structure(s) : UNION with VALUES on the second place
 select * from t1
 where a = any (select 1 union values (1));
@@ -1137,23 +1145,24 @@ explain extended select * from t1
 where a = any (select 1 union values (1));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-4	DEPENDENT UNION	<derived3>	ref	key0	key0	4	func	2	100.00	
-3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived2>	ref	key0	key0	4	test.t1.a	1	100.00	FirstMatch(t1)
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select 1 having <cache>("test"."t1"."a") = <ref_null_helper>(1) union /* select#4 */ select "tvc_0"."1" from (values (1)) "tvc_0" where <cache>("test"."t1"."a") = "tvc_0"."1")))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" semi join ((/* select#2 */ select 1 AS "1" union values (1)) "__4") where "__4"."1" = "test"."t1"."a"
 explain extended select * from t1
 where a = any (select 1 union 
 select * from (values (1)) as tvc_0);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	6	100.00	Using where
-2	DEPENDENT SUBQUERY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	DEPENDENT UNION	<derived4>	ref	key0	key0	4	func	2	100.00	
+1	PRIMARY	<derived2>	ref	key0	key0	4	test.t1.a	1	100.00	FirstMatch(t1)
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	<derived4>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 4	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" where <expr_cache><"test"."t1"."a">(<in_optimizer>("test"."t1"."a",<exists>(/* select#2 */ select 1 having <cache>("test"."t1"."a") = <ref_null_helper>(1) union /* select#3 */ select "tvc_0"."1" from (values (1)) "tvc_0" where <cache>("test"."t1"."a") = "tvc_0"."1")))
+Note	1003	/* select#1 */ select "test"."t1"."a" AS "a","test"."t1"."b" AS "b" from "test"."t1" semi join ((/* select#2 */ select 1 AS "1" union /* select#3 */ select "tvc_0"."1" AS "1" from (values (1)) "tvc_0") "__5") where "__5"."1" = "test"."t1"."a"
 # prepare statement that uses VALUES structure(s): single VALUES structure
 prepare stmt1 from '
 values (1,2);
@@ -1321,132 +1330,183 @@ select 1,2
 union
 values (1,2),(3,4);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	
-explain
-values (1,2),(3,4)
-union
-select 1,2;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	
-explain
-values (5,6)
-union
-values (1,2),(3,4);
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	
-explain format=json
-select 1,2
-union
-values (1,2),(3,4);
-EXPLAIN
-{
-  "query_block": {
-    "union_result": {
-      "table_name": "<union1,2>",
-      "access_type": "ALL",
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        }
-      ]
-    }
-  }
-}
-explain format=json
-values (1,2),(3,4)
-union
-select 1,2;
-EXPLAIN
-{
-  "query_block": {
-    "union_result": {
-      "table_name": "<union1,2>",
-      "access_type": "ALL",
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        }
-      ]
-    }
-  }
-}
-explain format=json
-values (5,6)
-union
-values (1,2),(3,4);
-EXPLAIN
-{
-  "query_block": {
-    "union_result": {
-      "table_name": "<union1,2>",
-      "access_type": "ALL",
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        }
-      ]
-    }
-  }
-}
-explain
-select 1,2
-union
-values (3,4)
-union
-values (1,2);
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+explain
+values (1,2),(3,4)
+union
+select 1,2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+explain
+values (5,6)
+union
+values (1,2),(3,4);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	3	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+explain format=json
+select 1,2
+union
+values (1,2),(3,4);
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "rows": 2,
+          "filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+explain format=json
+values (1,2),(3,4)
+union
+select 1,2;
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "rows": 2,
+          "filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+explain format=json
+values (5,6)
+union
+values (1,2),(3,4);
+EXPLAIN
+{
+  "query_block": {
+    "select_id": 1,
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "rows": 3,
+          "filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+explain
+select 1,2
+union
+values (3,4)
+union
+values (1,2);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	<derived4>	ALL	NULL	NULL	NULL	NULL	3	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+5	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union4,5>	ALL	NULL	NULL	NULL	NULL	NULL	
 explain format=json
 select 1,2
 union
@@ -1456,38 +1516,78 @@ values (1,2);
 EXPLAIN
 {
   "query_block": {
-    "union_result": {
-      "table_name": "<union1,2,3>",
-      "access_type": "ALL",
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 3,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
+    "select_id": 1,
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived4>",
+          "access_type": "ALL",
+          "rows": 3,
+          "filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union4,5>",
+                "access_type": "ALL",
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 4,
+                      "nested_loop": [
+                        {
+                          "table": {
+                            "table_name": "<derived2>",
+                            "access_type": "ALL",
+                            "rows": 2,
+                            "filtered": 100,
+                            "materialized": {
+                              "query_block": {
+                                "union_result": {
+                                  "table_name": "<union2,3>",
+                                  "access_type": "ALL",
+                                  "query_specifications": [
+                                    {
+                                      "query_block": {
+                                        "select_id": 2,
+                                        "table": {
+                                          "message": "No tables used"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "query_block": {
+                                        "select_id": 3,
+                                        "operation": "UNION",
+                                        "table": {
+                                          "message": "No tables used"
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 5,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
             }
           }
         }
-      ]
-    }
+      }
+    ]
   }
 }
 # explain query that uses VALUES structure(s): UNION ALL with VALUES structure(s)
@@ -1496,23 +1596,26 @@ select 1,2
 union
 values (1,2),(3,4);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
 explain
 values (1,2),(3,4)
 union all
 select 1,2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 explain
 values (1,2)
 union all
 values (1,2),(3,4);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	3	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 explain format=json
 values (1,2),(3,4)
 union all
@@ -1520,27 +1623,42 @@ select 1,2;
 EXPLAIN
 {
   "query_block": {
-    "union_result": {
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
+    "select_id": 1,
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "rows": 2,
+          "filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
             }
           }
         }
-      ]
-    }
+      }
+    ]
   }
 }
 explain format=json
@@ -1550,29 +1668,44 @@ values (1,2),(3,4);
 EXPLAIN
 {
   "query_block": {
-    "union_result": {
-      "table_name": "<union1,2>",
-      "access_type": "ALL",
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
+    "select_id": 1,
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "rows": 2,
+          "filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
             }
           }
         }
-      ]
-    }
+      }
+    ]
   }
 }
 explain format=json
@@ -1582,27 +1715,42 @@ values (1,2),(3,4);
 EXPLAIN
 {
   "query_block": {
-    "union_result": {
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
+    "select_id": 1,
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "rows": 3,
+          "filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
             }
           }
         }
-      ]
-    }
+      }
+    ]
   }
 }
 explain
@@ -1612,9 +1760,11 @@ values (3,4)
 union all
 values (1,2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+1	PRIMARY	<derived4>	ALL	NULL	NULL	NULL	NULL	3	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+5	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 explain format=json
 select 1,2
 union all
@@ -1624,36 +1774,74 @@ values (1,2);
 EXPLAIN
 {
   "query_block": {
-    "union_result": {
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 3,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
+    "select_id": 1,
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived4>",
+          "access_type": "ALL",
+          "rows": 3,
+          "filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 4,
+                      "nested_loop": [
+                        {
+                          "table": {
+                            "table_name": "<derived2>",
+                            "access_type": "ALL",
+                            "rows": 2,
+                            "filtered": 100,
+                            "materialized": {
+                              "query_block": {
+                                "union_result": {
+                                  "query_specifications": [
+                                    {
+                                      "query_block": {
+                                        "select_id": 2,
+                                        "table": {
+                                          "message": "No tables used"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "query_block": {
+                                        "select_id": 3,
+                                        "operation": "UNION",
+                                        "table": {
+                                          "message": "No tables used"
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 5,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
             }
           }
         }
-      ]
-    }
+      }
+    ]
   }
 }
 # analyze query that uses VALUES structure(s): single VALUES structure
@@ -1689,147 +1877,219 @@ select 1,2
 union
 values (1,2),(3,4);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	2.00	NULL	NULL	
-analyze
-values (1,2),(3,4)
-union
-select 1,2;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	2.00	NULL	NULL	
-analyze
-values (5,6)
-union
-values (1,2),(3,4);
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	3.00	NULL	NULL	
-analyze format=json
-select 1,2
-union
-values (1,2),(3,4);
-ANALYZE
-{
-  "query_optimization": {
-    "r_total_time_ms": "REPLACED"
-  },
-  "query_block": {
-    "union_result": {
-      "table_name": "<union1,2>",
-      "access_type": "ALL",
-      "r_loops": 1,
-      "r_rows": 2,
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        }
-      ]
-    }
-  }
-}
-analyze format=json
-values (1,2),(3,4)
-union
-select 1,2;
-ANALYZE
-{
-  "query_optimization": {
-    "r_total_time_ms": "REPLACED"
-  },
-  "query_block": {
-    "union_result": {
-      "table_name": "<union1,2>",
-      "access_type": "ALL",
-      "r_loops": 1,
-      "r_rows": 2,
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        }
-      ]
-    }
-  }
-}
-analyze format=json
-values (5,6)
-union
-values (1,2),(3,4);
-ANALYZE
-{
-  "query_optimization": {
-    "r_total_time_ms": "REPLACED"
-  },
-  "query_block": {
-    "union_result": {
-      "table_name": "<union1,2>",
-      "access_type": "ALL",
-      "r_loops": 1,
-      "r_rows": 3,
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        }
-      ]
-    }
-  }
-}
-analyze
-select 1,2
-union
-values (3,4)
-union
-values (1,2);
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	3	2.00	100.00	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2,3>	ALL	NULL	NULL	NULL	NULL	NULL	2.00	NULL	NULL	
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	2.00	NULL	NULL	
+analyze
+values (1,2),(3,4)
+union
+select 1,2;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	3	2.00	100.00	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	2.00	NULL	NULL	
+analyze
+values (5,6)
+union
+values (1,2),(3,4);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	3	3.00	100.00	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	3.00	NULL	NULL	
+analyze format=json
+select 1,2
+union
+values (1,2),(3,4);
+ANALYZE
+{
+  "query_optimization": {
+    "r_total_time_ms": "REPLACED"
+  },
+  "query_block": {
+    "select_id": 1,
+    "r_loops": 1,
+    "r_total_time_ms": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "r_loops": 1,
+          "rows": 3,
+          "r_rows": 2,
+          "r_table_time_ms": "REPLACED",
+          "r_other_time_ms": "REPLACED",
+          "filtered": 100,
+          "r_filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "r_loops": 1,
+                "r_rows": 2,
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+analyze format=json
+values (1,2),(3,4)
+union
+select 1,2;
+ANALYZE
+{
+  "query_optimization": {
+    "r_total_time_ms": "REPLACED"
+  },
+  "query_block": {
+    "select_id": 1,
+    "r_loops": 1,
+    "r_total_time_ms": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "r_loops": 1,
+          "rows": 3,
+          "r_rows": 2,
+          "r_table_time_ms": "REPLACED",
+          "r_other_time_ms": "REPLACED",
+          "filtered": 100,
+          "r_filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "r_loops": 1,
+                "r_rows": 2,
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+analyze format=json
+values (5,6)
+union
+values (1,2),(3,4);
+ANALYZE
+{
+  "query_optimization": {
+    "r_total_time_ms": "REPLACED"
+  },
+  "query_block": {
+    "select_id": 1,
+    "r_loops": 1,
+    "r_total_time_ms": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "r_loops": 1,
+          "rows": 3,
+          "r_rows": 3,
+          "r_table_time_ms": "REPLACED",
+          "r_other_time_ms": "REPLACED",
+          "filtered": 100,
+          "r_filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "r_loops": 1,
+                "r_rows": 3,
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    ]
+  }
+}
+analyze
+select 1,2
+union
+values (3,4)
+union
+values (1,2);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
+1	PRIMARY	<derived4>	ALL	NULL	NULL	NULL	NULL	3	2.00	100.00	100.00	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	2	2.00	100.00	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	2.00	NULL	NULL	
+5	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union4,5>	ALL	NULL	NULL	NULL	NULL	NULL	2.00	NULL	NULL	
 analyze format=json
 select 1,2
 union
@@ -1842,40 +2102,96 @@ ANALYZE
     "r_total_time_ms": "REPLACED"
   },
   "query_block": {
-    "union_result": {
-      "table_name": "<union1,2,3>",
-      "access_type": "ALL",
-      "r_loops": 1,
-      "r_rows": 2,
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 3,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
+    "select_id": 1,
+    "r_loops": 1,
+    "r_total_time_ms": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived4>",
+          "access_type": "ALL",
+          "r_loops": 1,
+          "rows": 3,
+          "r_rows": 2,
+          "r_table_time_ms": "REPLACED",
+          "r_other_time_ms": "REPLACED",
+          "filtered": 100,
+          "r_filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union4,5>",
+                "access_type": "ALL",
+                "r_loops": 1,
+                "r_rows": 2,
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 4,
+                      "r_loops": 1,
+                      "r_total_time_ms": "REPLACED",
+                      "nested_loop": [
+                        {
+                          "table": {
+                            "table_name": "<derived2>",
+                            "access_type": "ALL",
+                            "r_loops": 1,
+                            "rows": 2,
+                            "r_rows": 2,
+                            "r_table_time_ms": "REPLACED",
+                            "r_other_time_ms": "REPLACED",
+                            "filtered": 100,
+                            "r_filtered": 100,
+                            "materialized": {
+                              "query_block": {
+                                "union_result": {
+                                  "table_name": "<union2,3>",
+                                  "access_type": "ALL",
+                                  "r_loops": 1,
+                                  "r_rows": 2,
+                                  "query_specifications": [
+                                    {
+                                      "query_block": {
+                                        "select_id": 2,
+                                        "table": {
+                                          "message": "No tables used"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "query_block": {
+                                        "select_id": 3,
+                                        "operation": "UNION",
+                                        "table": {
+                                          "message": "No tables used"
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 5,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
             }
           }
         }
-      ]
-    }
+      }
+    ]
   }
 }
 # analyze query that uses VALUES structure(s): UNION ALL with VALUES structure(s)
@@ -1884,23 +2200,26 @@ select 1,2
 union
 values (1,2),(3,4);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	2.00	NULL	NULL	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	3	2.00	100.00	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	2.00	NULL	NULL	
 analyze
 values (1,2),(3,4)
 union all
 select 1,2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	3	3.00	100.00	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 analyze
 values (1,2)
 union all
 values (1,2),(3,4);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	3	3.00	100.00	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 analyze format=json
 values (1,2),(3,4)
 union all
@@ -1911,27 +2230,49 @@ ANALYZE
     "r_total_time_ms": "REPLACED"
   },
   "query_block": {
-    "union_result": {
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
+    "select_id": 1,
+    "r_loops": 1,
+    "r_total_time_ms": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "r_loops": 1,
+          "rows": 3,
+          "r_rows": 3,
+          "r_table_time_ms": "REPLACED",
+          "r_other_time_ms": "REPLACED",
+          "filtered": 100,
+          "r_filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
             }
           }
         }
-      ]
-    }
+      }
+    ]
   }
 }
 analyze format=json
@@ -1944,31 +2285,53 @@ ANALYZE
     "r_total_time_ms": "REPLACED"
   },
   "query_block": {
-    "union_result": {
-      "table_name": "<union1,2>",
-      "access_type": "ALL",
-      "r_loops": 1,
-      "r_rows": 2,
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
+    "select_id": 1,
+    "r_loops": 1,
+    "r_total_time_ms": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "r_loops": 1,
+          "rows": 3,
+          "r_rows": 2,
+          "r_table_time_ms": "REPLACED",
+          "r_other_time_ms": "REPLACED",
+          "filtered": 100,
+          "r_filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "table_name": "<union2,3>",
+                "access_type": "ALL",
+                "r_loops": 1,
+                "r_rows": 2,
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
             }
           }
         }
-      ]
-    }
+      }
+    ]
   }
 }
 analyze format=json
@@ -1981,27 +2344,49 @@ ANALYZE
     "r_total_time_ms": "REPLACED"
   },
   "query_block": {
-    "union_result": {
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
+    "select_id": 1,
+    "r_loops": 1,
+    "r_total_time_ms": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived2>",
+          "access_type": "ALL",
+          "r_loops": 1,
+          "rows": 3,
+          "r_rows": 3,
+          "r_table_time_ms": "REPLACED",
+          "r_other_time_ms": "REPLACED",
+          "filtered": 100,
+          "r_filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 2,
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 3,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
             }
           }
         }
-      ]
-    }
+      }
+    ]
   }
 }
 analyze
@@ -2011,9 +2396,11 @@ values (3,4)
 union all
 values (1,2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	r_rows	filtered	r_filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+1	PRIMARY	<derived4>	ALL	NULL	NULL	NULL	NULL	3	3.00	100.00	100.00	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	2	2.00	100.00	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+5	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 analyze format=json
 select 1,2
 union all
@@ -2026,36 +2413,88 @@ ANALYZE
     "r_total_time_ms": "REPLACED"
   },
   "query_block": {
-    "union_result": {
-      "query_specifications": [
-        {
-          "query_block": {
-            "select_id": 1,
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 2,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
-            }
-          }
-        },
-        {
-          "query_block": {
-            "select_id": 3,
-            "operation": "UNION",
-            "table": {
-              "message": "No tables used"
+    "select_id": 1,
+    "r_loops": 1,
+    "r_total_time_ms": "REPLACED",
+    "nested_loop": [
+      {
+        "table": {
+          "table_name": "<derived4>",
+          "access_type": "ALL",
+          "r_loops": 1,
+          "rows": 3,
+          "r_rows": 3,
+          "r_table_time_ms": "REPLACED",
+          "r_other_time_ms": "REPLACED",
+          "filtered": 100,
+          "r_filtered": 100,
+          "materialized": {
+            "query_block": {
+              "union_result": {
+                "query_specifications": [
+                  {
+                    "query_block": {
+                      "select_id": 4,
+                      "r_loops": 1,
+                      "r_total_time_ms": "REPLACED",
+                      "nested_loop": [
+                        {
+                          "table": {
+                            "table_name": "<derived2>",
+                            "access_type": "ALL",
+                            "r_loops": 1,
+                            "rows": 2,
+                            "r_rows": 2,
+                            "r_table_time_ms": "REPLACED",
+                            "r_other_time_ms": "REPLACED",
+                            "filtered": 100,
+                            "r_filtered": 100,
+                            "materialized": {
+                              "query_block": {
+                                "union_result": {
+                                  "query_specifications": [
+                                    {
+                                      "query_block": {
+                                        "select_id": 2,
+                                        "table": {
+                                          "message": "No tables used"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "query_block": {
+                                        "select_id": 3,
+                                        "operation": "UNION",
+                                        "table": {
+                                          "message": "No tables used"
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "query_block": {
+                      "select_id": 5,
+                      "operation": "UNION",
+                      "table": {
+                        "message": "No tables used"
+                      }
+                    }
+                  }
+                ]
+              }
             }
           }
         }
-      ]
-    }
+      }
+    ]
   }
 }
 # different number of values in TVC
@@ -2260,11 +2699,12 @@ select 2 union (values (5), (7), (1), (3), (4) limit 2);
 7
 explain extended select 2 union (values (5), (7), (1), (3), (4) limit 2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select 2 AS "2" union (values (5),(7),(1),(3),(4) limit 2)
+Note	1003	/* select#1 */ select "__3"."2" AS "2" from (/* select#2 */ select 2 AS "2" union (values (5),(7),(1),(3),(4) limit 2)) "__3"
 select 2 union (values (5), (7), (1), (3), (4) limit 2 offset 1);
 2
 2
@@ -2272,11 +2712,12 @@ select 2 union (values (5), (7), (1), (3), (4) limit 2 offset 1);
 1
 explain extended select 2 union (values (5), (7), (1), (3), (4) limit 2 offset 1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select 2 AS "2" union (values (5),(7),(1),(3),(4) limit 1,2)
+Note	1003	/* select#1 */ select "__3"."2" AS "2" from (/* select#2 */ select 2 AS "2" union (values (5),(7),(1),(3),(4) limit 1,2)) "__3"
 select 2 union (values (5), (7), (1), (3), (4) order by 1 limit 2);
 2
 2
@@ -2284,12 +2725,13 @@ select 2 union (values (5), (7), (1), (3), (4) order by 1 limit 2);
 3
 explain extended select 2 union (values (5), (7), (1), (3), (4) order by 1 limit 2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	UNION	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+4	UNION	<derived3>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select 2 AS "2" union (/* select#3 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 2)
+Note	1003	/* select#1 */ select "__3"."2" AS "2" from (/* select#2 */ select 2 AS "2" union (/* select#4 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 2)) "__3"
 select 2 union (values (5), (7), (1), (3), (4) order by 1 limit 2 offset 1);
 2
 2
@@ -2297,12 +2739,13 @@ select 2 union (values (5), (7), (1), (3), (4) order by 1 limit 2 offset 1);
 4
 explain extended select 2 union (values (5), (7), (1), (3), (4) order by 1 limit 2 offset 1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	UNION	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	3	100.00	
 2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+4	UNION	<derived3>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select 2 AS "2" union (/* select#3 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 1,2)
+Note	1003	/* select#1 */ select "__3"."2" AS "2" from (/* select#2 */ select 2 AS "2" union (/* select#4 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 1,2)) "__3"
 (values (5), (7), (1), (3), (4) limit 2) union select 2;
 5
 5
@@ -2310,11 +2753,12 @@ Note	1003	/* select#1 */ select 2 AS "2" union (/* select#3 */ select "tvc_0"."5
 2
 explain extended (values (5), (7), (1), (3), (4) limit 2) union select 2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	(values (5),(7),(1),(3),(4) limit 2) union /* select#2 */ select 2 AS "2"
+Note	1003	/* select#1 */ select "__3"."5" AS "5" from ((values (5),(7),(1),(3),(4) limit 2) union /* select#3 */ select 2 AS "2") "__3"
 (values (5), (7), (1), (3), (4) limit 2 offset 1) union select 2;
 5
 7
@@ -2322,11 +2766,12 @@ Note	1003	(values (5),(7),(1),(3),(4) limit 2) union /* select#2 */ select 2 AS
 2
 explain extended (values (5), (7), (1), (3), (4) limit 2 offset 1) union select 2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	(values (5),(7),(1),(3),(4) limit 1,2) union /* select#2 */ select 2 AS "2"
+Note	1003	/* select#1 */ select "__3"."5" AS "5" from ((values (5),(7),(1),(3),(4) limit 1,2) union /* select#3 */ select 2 AS "2") "__3"
 (values (5), (7), (1), (3), (4) order by 1 limit 2) union select 2;
 5
 1
@@ -2334,12 +2779,13 @@ Note	1003	(values (5),(7),(1),(3),(4) limit 1,2) union /* select#2 */ select 2 A
 2
 explain extended (values (5), (7), (1), (3), (4) order by 1 limit 2) union select 2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	<derived3>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
-3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union4,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	(/* select#1 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 2) union /* select#2 */ select 2 AS "2"
+Note	1003	/* select#1 */ select "__3"."5" AS "5" from ((/* select#4 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 2) union /* select#3 */ select 2 AS "2") "__3"
 (values (5), (7), (1), (3), (4) order by 1 limit 2 offset 1) union select 2;
 5
 3
@@ -2347,12 +2793,13 @@ Note	1003	(/* select#1 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3)
 2
 explain extended (values (5), (7), (1), (3), (4) order by 1 limit 2 offset 1) union select 2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	<derived3>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
-3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	3	100.00	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union4,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	(/* select#1 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 1,2) union /* select#2 */ select 2 AS "2"
+Note	1003	/* select#1 */ select "__3"."5" AS "5" from ((/* select#4 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 1,2) union /* select#3 */ select 2 AS "2") "__3"
 select 3 union all (values (5), (7), (1), (3), (4) limit 2 offset 3);
 3
 3
@@ -2360,10 +2807,11 @@ select 3 union all (values (5), (7), (1), (3), (4) limit 2 offset 3);
 4
 explain extended select 3 union all (values (5), (7), (1), (3), (4) limit 2 offset 3);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	/* select#1 */ select 3 AS "3" union all (values (5),(7),(1),(3),(4) limit 3,2)
+Note	1003	/* select#1 */ select "__3"."3" AS "3" from (/* select#2 */ select 3 AS "3" union all (values (5),(7),(1),(3),(4) limit 3,2)) "__3"
 (values (5), (7), (1), (3), (4) limit 2 offset 3) union all select 3;
 5
 3
@@ -2371,10 +2819,11 @@ Note	1003	/* select#1 */ select 3 AS "3" union all (values (5),(7),(1),(3),(4) l
 3
 explain extended (values (5), (7), (1), (3), (4) limit 2 offset 3) union all select 3;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	(values (5),(7),(1),(3),(4) limit 3,2) union all /* select#2 */ select 3 AS "3"
+Note	1003	/* select#1 */ select "__3"."5" AS "5" from ((values (5),(7),(1),(3),(4) limit 3,2) union all /* select#3 */ select 3 AS "3") "__3"
 select 3 union all (values (5), (7), (1), (3), (4) order by 1 limit 2);
 3
 3
@@ -2382,12 +2831,13 @@ select 3 union all (values (5), (7), (1), (3), (4) order by 1 limit 2);
 3
 explain extended select 3 union all (values (5), (7), (1), (3), (4) order by 1 limit 2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	UNION	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
 2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+4	UNION	<derived3>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	/* select#1 */ select 3 AS "3" union all (/* select#3 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 2)
+Note	1003	/* select#1 */ select "__3"."3" AS "3" from (/* select#2 */ select 3 AS "3" union all (/* select#4 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 2)) "__3"
 (values (5), (7), (1), (3), (4) order by 1 limit 2) union all select 3;
 5
 1
@@ -2395,29 +2845,31 @@ Note	1003	/* select#1 */ select 3 AS "3" union all (/* select#3 */ select "tvc_0
 3
 explain extended (values (5), (7), (1), (3), (4) order by 1 limit 2) union all select 3;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	<derived3>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	2	100.00	
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union4,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+Warnings:
+Note	1003	/* select#1 */ select "__3"."5" AS "5" from ((/* select#4 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 2) union all /* select#3 */ select 3 AS "3") "__3"
+( values (5), (7), (1), (3), (4) limit 2 offset 1 )
+union
+( values (5), (7), (1), (3), (4) order by 1 limit 2 );
+5
+7
+1
+3
+explain extended ( values (5), (7), (1), (3), (4) limit 2 offset 1 )
+union
+( values (5), (7), (1), (3), (4) order by 1 limit 2 );
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	7	100.00	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+4	UNION	<derived3>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
 3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	(/* select#1 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 2) union all /* select#2 */ select 3 AS "3"
-( values (5), (7), (1), (3), (4) limit 2 offset 1 )
-union
-( values (5), (7), (1), (3), (4) order by 1 limit 2 );
-5
-7
-1
-3
-explain extended ( values (5), (7), (1), (3), (4) limit 2 offset 1 )
-union
-( values (5), (7), (1), (3), (4) order by 1 limit 2 );
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	UNION	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
-2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
-Warnings:
-Note	1003	(values (5),(7),(1),(3),(4) limit 1,2) union (/* select#3 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 2)
+Note	1003	/* select#1 */ select "__3"."5" AS "5" from ((values (5),(7),(1),(3),(4) limit 1,2) union (/* select#4 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 2)) "__3"
 ( values (5), (7), (1), (3), (4) limit 2 offset 1 )
 union all
 ( values (5), (7), (1), (3), (4) order by 1 limit 2 );
@@ -2430,12 +2882,13 @@ explain extended ( values (5), (7), (1), (3), (4) limit 2 offset 1 )
 union all
 ( values (5), (7), (1), (3), (4) order by 1 limit 2 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-3	UNION	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	7	100.00	
 2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
+4	UNION	<derived3>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union2,4>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	(values (5),(7),(1),(3),(4) limit 1,2) union all (/* select#3 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 2)
+Note	1003	/* select#1 */ select "__3"."5" AS "5" from ((values (5),(7),(1),(3),(4) limit 1,2) union all (/* select#4 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 2)) "__3"
 (values (5), (7), (1), (3), (4) limit 2 offset 3) union all select 3 order by 1;
 5
 3
@@ -2443,11 +2896,11 @@ Note	1003	(values (5),(7),(1),(3),(4) limit 1,2) union all (/* select#3 */ selec
 4
 explain extended (values (5), (7), (1), (3), (4) limit 2 offset 3) union all select 3 order by 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using filesort
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
-Note	1003	(values (5),(7),(1),(3),(4) limit 3,2) union all /* select#2 */ select 3 AS "3" order by 1
+Note	1003	/* select#1 */ select "__3"."5" AS "5" from ((values (5),(7),(1),(3),(4) limit 3,2) union all /* select#3 */ select 3 AS "3") "__3" order by 1
 (values (5), (7), (1), (3), (4) order by 1 limit 3 offset 1) union all select 3 order by 1;
 5
 3
@@ -2456,12 +2909,13 @@ Note	1003	(values (5),(7),(1),(3),(4) limit 3,2) union all /* select#2 */ select
 5
 explain extended (values (5), (7), (1), (3), (4) order by 1 limit 3 offset 1) union all select 3 order by 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	<derived3>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
-3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using filesort
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	100.00	Using filesort
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union4,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	(/* select#1 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 1,3) union all /* select#2 */ select 3 AS "3" order by 1
+Note	1003	/* select#1 */ select "__3"."5" AS "5" from ((/* select#4 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 1,3) union all /* select#3 */ select 3 AS "3") "__3" order by 1
 (values (5), (7), (1), (3), (4) order by 1 limit 3 offset 1) union all select 3
 order by 1 limit 2 offset 1;
 5
@@ -2470,12 +2924,13 @@ order by 1 limit 2 offset 1;
 explain extended (values (5), (7), (1), (3), (4) order by 1 limit 3 offset 1) union all select 3
 order by 1 limit 2 offset 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	PRIMARY	<derived3>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
-3	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-2	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
-NULL	UNION RESULT	<union1,2>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	Using filesort
+1	PRIMARY	<derived2>	ALL	NULL	NULL	NULL	NULL	4	100.00	Using filesort
+4	DERIVED	<derived2>	ALL	NULL	NULL	NULL	NULL	5	100.00	Using filesort
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNION RESULT	<union4,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL	
 Warnings:
-Note	1003	(/* select#1 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 1,3) union all /* select#2 */ select 3 AS "3" order by 1 limit 1,2
+Note	1003	/* select#1 */ select "__3"."5" AS "5" from ((/* select#4 */ select "tvc_0"."5" AS "5" from (values (5),(7),(1),(3),(4)) "tvc_0" order by 1 limit 1,3) union all /* select#3 */ select 3 AS "3") "__3" order by 1 limit 1,2
 values (5,90), (7,20), (1,70), (3,50), (4,10) order by 3;
 ERROR 42S22: Unknown column '3' in 'ORDER BY'
 create view v1 as values (5), (7), (1), (3), (4) order by 1 limit 2;
@@ -2493,7 +2948,7 @@ union
 ( values (5), (7), (1), (3), (4) order by 1 limit 2 );
 show create view v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE VIEW "v1" AS (values (5),(7),(1),(3),(4) limit 1,2) union (values (5),(7),(1),(3),(4) order by 1 limit 2)	latin1	latin1_swedish_ci
+v1	CREATE VIEW "v1" AS select "__4"."5" AS "5" from (select "__5"."5" AS "5" from ((values (5),(7),(1),(3),(4) limit 1,2) union (values (5),(7),(1),(3),(4) order by 1 limit 2)) "__5") "__4"	latin1	latin1_swedish_ci
 select * from v1;
 5
 7
diff --git a/mysql-test/suite/compat/oracle/t/table_value_constr.test b/mysql-test/suite/compat/oracle/t/table_value_constr.test
index ca3c40bb7f9..8e19a10d434 100644
--- a/mysql-test/suite/compat/oracle/t/table_value_constr.test
+++ b/mysql-test/suite/compat/oracle/t/table_value_constr.test
@@ -1171,21 +1171,25 @@ eval explain extended $q;
 
 let $q=
 select 2 union (values (5), (7), (1), (3), (4) limit 2);
+--replace_result * 2
 eval $q;
 eval explain extended $q;
 
 let $q=
 select 2 union (values (5), (7), (1), (3), (4) limit 2 offset 1);
+--replace_result * 2
 eval $q;
 eval explain extended $q;
 
 let $q=
 select 2 union (values (5), (7), (1), (3), (4) order by 1 limit 2);
+--replace_result * 2
 eval $q;
 eval explain extended $q;
 
 let $q=
 select 2 union (values (5), (7), (1), (3), (4) order by 1 limit 2 offset 1);
+--replace_result * 2
 eval $q;
 eval explain extended $q;
 
@@ -1193,6 +1197,7 @@ eval explain extended $q;
 let $q=
 (values (5), (7), (1), (3), (4) limit 2) union select 2;
 eval $q;
+--replace_result derived4 derived2
 eval explain extended $q;
 
 let $q=
@@ -1203,16 +1208,19 @@ eval explain extended $q;
 let $q=
 (values (5), (7), (1), (3), (4) order by 1 limit 2) union select 2;
 eval $q;
+--replace_result derived4 derived2
 eval explain extended $q;
 
 let $q=
 (values (5), (7), (1), (3), (4) order by 1 limit 2 offset 1) union select 2;
 eval $q;
+--replace_result derived4 derived2
 eval explain extended $q;
 
 
 let $q=
 select 3 union all (values (5), (7), (1), (3), (4) limit 2 offset 3);
+--replace_result * 3
 eval $q;
 eval explain extended $q;
 
@@ -1223,12 +1231,14 @@ eval explain extended $q;
 
 let $q=
 select 3 union all (values (5), (7), (1), (3), (4) order by 1 limit 2);
+--replace_result * 3
 eval $q;
 eval explain extended $q;
 
 let $q=
 (values (5), (7), (1), (3), (4) order by 1 limit 2) union all select 3;
 eval $q;
+--replace_result derived4 derived2
 eval explain extended $q;
 
 let $q=
@@ -1253,12 +1263,14 @@ eval explain extended $q;
 let $q=
 (values (5), (7), (1), (3), (4) order by 1 limit 3 offset 1) union all select 3 order by 1;
 eval $q;
+--replace_result derived4 derived2
 eval explain extended $q;
 
 let $q=
 (values (5), (7), (1), (3), (4) order by 1 limit 3 offset 1) union all select 3
  order by 1 limit 2 offset 1;
 eval $q;
+--replace_result derived4 derived2
 eval explain extended $q;
 
 --error ER_BAD_FIELD_ERROR
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 119a036fd98..42a8567ea5a 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -194,6 +194,8 @@ enum enum_binlog_row_image {
 #define MODE_TIME_ROUND_FRACTIONAL      (1ULL << 34)
 /* The following modes are specific to MySQL */
 #define MODE_MYSQL80_TIME_TRUNCATE_FRACTIONAL (1ULL << 32)
+#define WAS_ORACLE                      (1ULL << 35)
+#define IS_OR_WAS_ORACLE                (MODE_ORACLE | WAS_ORACLE)
 
 
 /* Bits for different old style modes */
@@ -7833,7 +7835,7 @@ class Sql_mode_save
   Sql_mode_save(THD *thd) : thd(thd), old_mode(thd->variables.sql_mode) {}
   ~Sql_mode_save() { thd->variables.sql_mode = old_mode; }
 
- private:
+ protected:
   THD *thd;
   sql_mode_t old_mode; // SQL mode saved at construction time.
 };
@@ -7850,6 +7852,9 @@ public:
   Sql_mode_save_for_frm_handling(THD *thd)
    :Sql_mode_save(thd)
   {
+    if (thd->variables.sql_mode & MODE_ORACLE)
+      thd->variables.sql_mode|= IS_OR_WAS_ORACLE;
+
     /*
       - MODE_REAL_AS_FLOAT            affect only CREATE TABLE parsing
       + MODE_PIPES_AS_CONCAT          affect expression parsing
@@ -7879,6 +7884,12 @@ public:
                                 MODE_IGNORE_SPACE | MODE_NO_BACKSLASH_ESCAPES |
                                 MODE_ORACLE | MODE_EMPTY_STRING_IS_NULL);
   };
+
+  ~Sql_mode_save_for_frm_handling()
+  {
+    if (thd->variables.sql_mode & IS_OR_WAS_ORACLE)
+      thd->variables.sql_mode&= ~IS_OR_WAS_ORACLE;
+  }
 };
 
 
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index f2f1dca8de5..15391c37e6b 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -6303,6 +6303,7 @@ LEX::create_unit(SELECT_LEX *first_sel)
     DBUG_RETURN(NULL);
 
   unit->register_select_chain(first_sel);
+  /* TODO: Why this condition? Explain in comment */
   if (first_sel->next_select())
   {
     unit->reset_distinct();
@@ -6485,22 +6486,29 @@ Name_resolution_context *LEX::pop_context()
 }
 
 
-SELECT_LEX *LEX::create_priority_nest(SELECT_LEX *first_in_nest)
+SELECT_LEX *LEX::create_priority_nest(SELECT_LEX *first_in_nest, SELECT_LEX *attach_to)
 {
   DBUG_ENTER("LEX::create_priority_nest");
   DBUG_ASSERT(first_in_nest->first_nested);
   enum sub_select_type wr_unit_type= first_in_nest->get_linkage();
   bool wr_distinct= first_in_nest->distinct;
-  SELECT_LEX *attach_to= first_in_nest->first_nested;
-  attach_to->cut_next();
+  if (attach_to)
+    attach_to->cut_next();
   SELECT_LEX *wrapper= wrap_select_chain_into_derived(first_in_nest);
   if (wrapper)
   {
     first_in_nest->first_nested= NULL;
     wrapper->set_linkage_and_distinct(wr_unit_type, wr_distinct);
-    wrapper->first_nested= attach_to->first_nested;
-    wrapper->set_master_unit(attach_to->master_unit());
-    attach_to->link_neighbour(wrapper);
+    if (attach_to)
+    {
+      wrapper->first_nested= attach_to->first_nested;
+      wrapper->set_master_unit(attach_to->master_unit());
+      attach_to->link_neighbour(wrapper);
+    }
+    else
+    {
+      wrapper->first_nested= wrapper;
+    }
   }
   DBUG_RETURN(wrapper);
 }
@@ -10412,11 +10420,30 @@ SELECT_LEX_UNIT *LEX::parsed_select_expr_start(SELECT_LEX *s1, SELECT_LEX *s2,
   sel1->link_neighbour(sel2);
   sel2->set_linkage_and_distinct(unit_type, distinct);
   sel2->first_nested= sel1->first_nested= sel1;
+  const bool oracle= (thd->variables.sql_mode & IS_OR_WAS_ORACLE);
+  if (oracle &&
+      /*
+         Recursive CTE must have anchor defined as non-recursive set attached
+         via UNION, such anchor would be lost in wrapping. But in recursive CTE
+         all set operations either distinct or non-distinct
+         (see ER_NOT_SUPPORTED_YET limitation in st_select_lex_unit::prepare()),
+         so explicit prioritization via wrapping is not required.
+
+         Test: compat/oracle.func_concat
+      */
+      !(curr_with_clause && curr_with_clause->with_recursive) &&
+      !(sel1= create_priority_nest(sel1, NULL)))
+  {
+      return NULL;
+  }
   res= create_unit(sel1);
   if (res == NULL)
     return NULL;
   res->pre_last_parse= sel1;
-  push_select(res->fake_select_lex);
+  if (oracle)
+    push_select(sel1);
+  else
+    push_select(res->fake_select_lex);
   return res;
 }
 
@@ -10446,7 +10473,8 @@ SELECT_LEX_UNIT *LEX::parsed_select_expr_cont(SELECT_LEX_UNIT *unit,
     if (first_in_nest->first_nested != first_in_nest)
     {
       /* There is a priority jump starting from first_in_nest */
-      if ((last= create_priority_nest(first_in_nest)) == NULL)
+      if ((last= create_priority_nest(first_in_nest,
+                                      first_in_nest->first_nested)) == NULL)
         return NULL;
       unit->fix_distinct();
     }
@@ -10496,7 +10524,7 @@ LEX::add_primary_to_query_expression_body(SELECT_LEX_UNIT *unit,
 {
   return
     add_primary_to_query_expression_body(unit, sel, unit_type, distinct,
-                                         thd->variables.sql_mode & MODE_ORACLE);
+                                         thd->variables.sql_mode & IS_OR_WAS_ORACLE);
 }
 
 /**
@@ -10543,7 +10571,7 @@ bool LEX::parsed_multi_operand_query_expression_body(SELECT_LEX_UNIT *unit)
   if (first_in_nest->first_nested != first_in_nest)
   {
     /* There is a priority jump starting from first_in_nest */
-    if (create_priority_nest(first_in_nest) == NULL)
+    if (create_priority_nest(first_in_nest, first_in_nest->first_nested) == NULL)
       return true;
     unit->fix_distinct();
   }
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 4055e074f1d..490ba9df6ce 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -1683,7 +1683,8 @@ public:
     DBUG_ENTER("SELECT_LEX::set_linkage_and_distinct");
     DBUG_PRINT("info", ("select: %p  distinct %d", this, d));
     set_linkage(l);
-    DBUG_ASSERT(l == UNION_TYPE ||
+    DBUG_ASSERT(l == UNSPECIFIED_TYPE ||
+                l == UNION_TYPE ||
                 l == INTERSECT_TYPE ||
                 l == EXCEPT_TYPE);
     if (d && master_unit() && master_unit()->union_distinct != this)
@@ -3794,6 +3795,7 @@ public:
                          select_stack_head()->select_number :
                          0),
                         select_lex, select_lex->select_number));
+    DBUG_ASSERT(select_lex);
     if (unlikely(select_stack_top > MAX_SELECT_NESTING))
     {
       my_error(ER_TOO_HIGH_LEVEL_OF_NESTING_FOR_SELECT, MYF(0));
@@ -4785,7 +4787,7 @@ public:
   }
   bool main_select_push(bool service= false);
   bool insert_select_hack(SELECT_LEX *sel);
-  SELECT_LEX *create_priority_nest(SELECT_LEX *first_in_nest);
+  SELECT_LEX *create_priority_nest(SELECT_LEX *first_in_nest, SELECT_LEX *attach_to);
 
   bool set_main_unit(st_select_lex_unit *u)
   {
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 1a5c729859e..e0503f9b0a8 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -479,8 +479,8 @@ int select_unit::update_counter(Field* counter, longlong value)
 */
 
 bool select_unit_ext::disable_index_if_needed(SELECT_LEX *curr_sl)
-{ 
-  const bool oracle_mode= thd->variables.sql_mode & MODE_ORACLE;
+{
+  const bool oracle_mode= (thd->variables.sql_mode & IS_OR_WAS_ORACLE);
   if (is_index_enabled && 
       ((!oracle_mode &&
         curr_sl == curr_sl->master_unit()->union_distinct) ||
@@ -497,7 +497,7 @@ bool select_unit_ext::disable_index_if_needed(SELECT_LEX *curr_sl)
     table->no_keyread=1;
     /* In case of Oracle mode we unfold at the last operator */
     DBUG_ASSERT(!oracle_mode || !curr_sl->next_select());
-    return oracle_mode || !curr_sl->distinct;
+    return !curr_sl->distinct;
   }
   return false;
 }
@@ -1928,7 +1928,7 @@ void st_select_lex_unit::optimize_bag_operation(bool is_outer_distinct)
       PREPARE ... FROM
       recursive
   */
-  if ((thd->variables.sql_mode & MODE_ORACLE) ||
+  if ((thd->variables.sql_mode & IS_OR_WAS_ORACLE) ||
     (thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW) ||
     (fake_select_lex != NULL && thd->stmt_arena->is_stmt_prepare()) ||
     (with_element && with_element->is_recursive ))

From ca63e2c6276e5ea121d456524446f4f22b5b7e56 Mon Sep 17 00:00:00 2001
From: Rucha Deodhar <rucha.deodhar@mariadb.com>
Date: Thu, 4 Dec 2025 18:35:50 +0530
Subject: [PATCH 100/119] MDEV-37950: INSERT ... RETURNING exposes columns for
 which the user lacks SELECT privilege

Analysis:
When setup_fields() is called, the want_privilege is set to NO_ACL, so
correct priveleges are not checked.
Fix:
Since RETURNING requires SELECT_ACL privelige, when we are setting up
the returning fields for the given query, set want_privilege to SELECT_ACL.
Reset to original value of want_privilege once done.
---
 mysql-test/main/insert_notembedded.result | 43 +++++++++++++++++
 mysql-test/main/insert_notembedded.test   | 57 +++++++++++++++++++++++
 sql/sql_base.cc                           | 19 ++++++--
 3 files changed, 115 insertions(+), 4 deletions(-)

diff --git a/mysql-test/main/insert_notembedded.result b/mysql-test/main/insert_notembedded.result
index 5df69cc8ffe..6c5e8057500 100644
--- a/mysql-test/main/insert_notembedded.result
+++ b/mysql-test/main/insert_notembedded.result
@@ -121,3 +121,46 @@ connection default;
 DROP DATABASE meow;
 set local sql_mode=default;
 set global sql_mode=default;
+#
+# MDEV-37950: INSERT ... RETURNING exposes columns for which
+# the user lacks SELECT privilege
+#
+CREATE USER regular;
+GRANT INSERT ON *.* TO regular;
+GRANT DELETE ON *.* TO regular;
+CREATE DATABASE test1;
+DROP TABLE IF EXISTS test1.t_trigger_test1;
+Warnings:
+Note	1051	Unknown table 'test1.t_trigger_test1'
+CREATE TABLE test1.t_trigger_test1 (
+id INT AUTO_INCREMENT PRIMARY KEY,
+name VARCHAR(50),
+note VARCHAR(100)
+);
+CREATE TRIGGER test1.trg_before_insert
+BEFORE INSERT ON test1.t_trigger_test1
+FOR EACH ROW
+BEGIN
+SET NEW.name = CONCAT('BEFORE_', NEW.name);
+END |
+INSERT INTO test1.t_trigger_test1 (name) VALUES ('Alice') RETURNING *;
+ERROR 42000: SELECT command denied to user 'regular'@'localhost' for column 'id' in table 't_trigger_test1'
+INSERT INTO test1.t_trigger_test1 (name) VALUES ('Alice') RETURNING id, name, note;
+ERROR 42000: SELECT command denied to user 'regular'@'localhost' for column 'id' in table 't_trigger_test1'
+# same for DELETE because delete with "WHERE" still requires to
+# read from the table, which basically means having select privileges
+DELETE FROM test1.t_trigger_test1 WHERE id=1;
+ERROR 42000: SELECT command denied to user 'regular'@'localhost' for column 'id' in table 't_trigger_test1'
+DELETE FROM test1.t_trigger_test1 WHERE id=1 RETURNING id;
+ERROR 42000: SELECT command denied to user 'regular'@'localhost' for column 'id' in table 't_trigger_test1'
+DELETE FROM test1.t_trigger_test1 WHERE id=1 RETURNING *;
+ERROR 42000: SELECT command denied to user 'regular'@'localhost' for column 'id' in table 't_trigger_test1'
+DELETE FROM test1.t_trigger_test1 RETURNING *;
+ERROR 42000: SELECT command denied to user 'regular'@'localhost' for column 'id' in table 't_trigger_test1'
+DELETE FROM test1.t_trigger_test1 RETURNING id;
+ERROR 42000: SELECT command denied to user 'regular'@'localhost' for column 'id' in table 't_trigger_test1'
+DELETE FROM test1.t_trigger_test1;
+DROP TRIGGER test1.trg_before_insert;
+DROP TABLE test1.t_trigger_test1;
+DROP USER regular;
+DROP DATABASE test1;
diff --git a/mysql-test/main/insert_notembedded.test b/mysql-test/main/insert_notembedded.test
index 2769aee8d8a..09f5b18531d 100644
--- a/mysql-test/main/insert_notembedded.test
+++ b/mysql-test/main/insert_notembedded.test
@@ -158,3 +158,60 @@ DROP DATABASE meow;
 
 set local sql_mode=default;
 set global sql_mode=default;
+
+--echo #
+--echo # MDEV-37950: INSERT ... RETURNING exposes columns for which
+--echo # the user lacks SELECT privilege
+--echo #
+CREATE USER regular;
+GRANT INSERT ON *.* TO regular;
+GRANT DELETE ON *.* TO regular;
+
+CREATE DATABASE test1;
+DROP TABLE IF EXISTS test1.t_trigger_test1;
+CREATE TABLE test1.t_trigger_test1 (
+  id INT AUTO_INCREMENT PRIMARY KEY,
+  name VARCHAR(50),
+  note VARCHAR(100)
+);
+DELIMITER |;
+CREATE TRIGGER test1.trg_before_insert
+BEFORE INSERT ON test1.t_trigger_test1
+FOR EACH ROW
+BEGIN
+  SET NEW.name = CONCAT('BEFORE_', NEW.name);
+END |
+DELIMITER ;|
+
+change_user regular;
+
+--error ER_COLUMNACCESS_DENIED_ERROR
+INSERT INTO test1.t_trigger_test1 (name) VALUES ('Alice') RETURNING *;
+--error ER_COLUMNACCESS_DENIED_ERROR
+INSERT INTO test1.t_trigger_test1 (name) VALUES ('Alice') RETURNING id, name, note;
+
+--echo # same for DELETE because delete with "WHERE" still requires to
+--echo # read from the table, which basically means having select privileges
+
+--error ER_COLUMNACCESS_DENIED_ERROR
+DELETE FROM test1.t_trigger_test1 WHERE id=1;
+
+--error ER_COLUMNACCESS_DENIED_ERROR
+DELETE FROM test1.t_trigger_test1 WHERE id=1 RETURNING id;
+
+--error ER_COLUMNACCESS_DENIED_ERROR
+DELETE FROM test1.t_trigger_test1 WHERE id=1 RETURNING *;
+
+--error ER_COLUMNACCESS_DENIED_ERROR
+DELETE FROM test1.t_trigger_test1 RETURNING *;
+
+--error ER_COLUMNACCESS_DENIED_ERROR
+DELETE FROM test1.t_trigger_test1 RETURNING id;
+
+DELETE FROM test1.t_trigger_test1;
+
+change_user root;
+DROP TRIGGER test1.trg_before_insert;
+DROP TABLE test1.t_trigger_test1;
+DROP USER regular;
+DROP DATABASE test1;
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index aeb829c60e5..00a2fb90c58 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -7909,12 +7909,23 @@ bool setup_fields(THD *thd, Ref_ptr_array ref_pointer_array,
 
 int setup_returning_fields(THD* thd, TABLE_LIST* table_list)
 {
+  GRANT_INFO *saved_grant;
+  int res= 0;
+
   if (!thd->lex->has_returning())
     return 0;
-  return setup_wild(thd, table_list, thd->lex->returning()->item_list, NULL,
-                    thd->lex->returning(), true)
-      || setup_fields(thd, Ref_ptr_array(), thd->lex->returning()->item_list,
-                      MARK_COLUMNS_READ, NULL, NULL, 0, THD_WHERE::RETURNING);
+
+  saved_grant= &table_list->table->grant;
+  table_list->table->grant.want_privilege|= SELECT_ACL;
+
+  res= setup_wild(thd, table_list, thd->lex->returning()->item_list, NULL,
+                     thd->lex->returning(), true)
+       || setup_fields(thd, Ref_ptr_array(), thd->lex->returning()->item_list,
+                       MARK_COLUMNS_READ, NULL, NULL, 0, THD_WHERE::RETURNING);
+
+  table_list->table->grant= *saved_grant;
+
+  return res;
 }
 
 

From 0cd55ca5a575f41c84959067d84162608d268794 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Wed, 3 Dec 2025 17:10:26 +0100
Subject: [PATCH 101/119] MDEV-38242 crash when first COM_STMT_EXECUTE doesn't
 send types

all params are initialized to use Type_handler_null.
NULL params do not have a value to read from the packet buffer,
so their Item_param_set_param_func() should do nothing.

Type_handler_null inherits from Type_handler_string_result,
that is, Type_handler_null *must* override parent's
Item_param_set_param_func().
---
 sql/sql_type.cc           |  6 ++++++
 sql/sql_type.h            |  2 ++
 tests/mysql_client_test.c | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/sql/sql_type.cc b/sql/sql_type.cc
index 49fd38ec33f..0783e25d0e2 100644
--- a/sql/sql_type.cc
+++ b/sql/sql_type.cc
@@ -8080,6 +8080,12 @@ void Type_handler_string_result::Item_param_set_param_func(Item_param *param,
 }
 
 
+void Type_handler_null::Item_param_set_param_func(Item_param *param,
+                                                  uchar **pos, ulong len) const
+{
+}
+
+
 void Type_handler_time_common::Item_param_set_param_func(Item_param *param,
                                                          uchar **pos,
                                                          ulong len) const
diff --git a/sql/sql_type.h b/sql/sql_type.h
index f334bc02534..e9ba2d04261 100644
--- a/sql/sql_type.h
+++ b/sql/sql_type.h
@@ -6998,6 +6998,8 @@ public:
                                    const Bit_addr &bit,
                                    const Column_definition_attributes *attr,
                                    uint32 flags) const override;
+  void Item_param_set_param_func(Item_param *param,
+                                 uchar **pos, ulong len) const override;
 };
 
 
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 48f8410e1e8..dc6b8308b5b 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -22956,6 +22956,39 @@ static void test_cache_metadata()
   mysql_stmt_close(stmt);
 }
 
+static void test_mdev_38242()
+{
+  MYSQL_STMT *stmt;
+  int        rc;
+  MYSQL_BIND param[2];
+  int val1=117440769, val2;
+  my_bool null1=0, null2=1;
+
+  myheader("test_mdev_38242");
+
+  stmt= mysql_stmt_init(mysql);
+  check_stmt(stmt);
+
+  rc= mysql_stmt_prepare(stmt, STRING_WITH_LEN("SELECT 1 WHERE ?=0 AND ?=0"));
+  check_execute(stmt, rc);
+
+  bzero(param, sizeof(param));
+
+  param[0].buffer= &val1;
+  param[0].buffer_type= MYSQL_TYPE_LONG;
+  param[0].is_null= &null1;
+  param[1].buffer= &val2;
+  param[1].buffer_type= MYSQL_TYPE_LONG;
+  param[1].is_null= &null2;
+
+  rc= mysql_stmt_bind_param(stmt, param);
+  check_execute(stmt, rc);
+
+  stmt->send_types_to_server= 0;
+  rc= mysql_stmt_execute(stmt);
+  check_execute_r(stmt, rc);
+  mysql_stmt_close(stmt);
+}
 
 static struct my_tests_st my_tests[]= {
   { "test_mdev_20516", test_mdev_20516 },
@@ -23266,6 +23299,7 @@ static struct my_tests_st my_tests[]= {
   { "test_connect_autocommit", test_connect_autocommit},
   { "test_execute_direct", test_execute_direct },
   { "test_cache_metadata", test_cache_metadata},
+  { "test_mdev_38242", test_mdev_38242 },
 #ifndef EMBEDDED_LIBRARY
   { "test_mdev_24411", test_mdev_24411},
   { "test_mdev_34718_bu", test_mdev_34718_bu },

From 64c9efbfa5748b6ff419ebd00e60decc6bdf9639 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 18 Dec 2025 11:01:29 +0100
Subject: [PATCH 102/119] MDEV-38368 Spider crash on fake loop detection
 variables

use my_safe_alloca() when the size might be large
---
 .../spider/include/have_group_by_handler.inc  |  1 +
 .../spider/include/have_group_by_handler.opt  |  1 +
 .../spider/r/loop_check_long_var.result       | 28 +++++++++++++++
 .../spider/t/loop_check_long_var.test         | 36 +++++++++++++++++++
 storage/spider/spd_conn.cc                    | 14 ++++----
 5 files changed, 73 insertions(+), 7 deletions(-)
 create mode 100644 storage/spider/mysql-test/spider/include/have_group_by_handler.inc
 create mode 100644 storage/spider/mysql-test/spider/include/have_group_by_handler.opt
 create mode 100644 storage/spider/mysql-test/spider/r/loop_check_long_var.result
 create mode 100644 storage/spider/mysql-test/spider/t/loop_check_long_var.test

diff --git a/storage/spider/mysql-test/spider/include/have_group_by_handler.inc b/storage/spider/mysql-test/spider/include/have_group_by_handler.inc
new file mode 100644
index 00000000000..b9e467a836f
--- /dev/null
+++ b/storage/spider/mysql-test/spider/include/have_group_by_handler.inc
@@ -0,0 +1 @@
+# see .opt file
diff --git a/storage/spider/mysql-test/spider/include/have_group_by_handler.opt b/storage/spider/mysql-test/spider/include/have_group_by_handler.opt
new file mode 100644
index 00000000000..fdce7f08d6a
--- /dev/null
+++ b/storage/spider/mysql-test/spider/include/have_group_by_handler.opt
@@ -0,0 +1 @@
+--loose_spider_disable_group_by_handler=0
diff --git a/storage/spider/mysql-test/spider/r/loop_check_long_var.result b/storage/spider/mysql-test/spider/r/loop_check_long_var.result
new file mode 100644
index 00000000000..3fc277bc0bc
--- /dev/null
+++ b/storage/spider/mysql-test/spider/r/loop_check_long_var.result
@@ -0,0 +1,28 @@
+install plugin spider soname 'ha_spider';
+#
+# MDEV-38368 Spider crash on fake loop detection variables
+#
+set global spider_same_server_link=1;
+create server srv1
+foreign data wrapper mysql
+options (
+host 'localhost',
+user 'root',
+socket '$MASTER_1_MYSOCK'
+  );
+create table t1 (id int primary key, data varchar(255));
+insert into t1 values (1, 'test'), (2, 'data');
+create table st1 (id int primary key, data varchar(255)) engine=spider
+comment='wrapper "mysql", srv "srv1", table "t1"';
+set @`spider_lc_./test/st1` = concat('-', repeat('x', 900000), '-pid-tbl-');
+select * from st1 limit 1;
+id	data
+1	test
+drop table st1, t1;
+drop server srv1;
+uninstall plugin spider;
+Warnings:
+Warning	1620	Plugin is busy and will be uninstalled on shutdown
+drop tables mysql.spider_link_failed_log, mysql.spider_link_mon_servers, mysql.spider_tables, mysql.spider_table_crd, mysql.spider_table_position_for_recovery, mysql.spider_table_sts, mysql.spider_xa, mysql.spider_xa_failed_log, mysql.spider_xa_member;
+truncate mysql.func;
+# End of 10.6 tests
diff --git a/storage/spider/mysql-test/spider/t/loop_check_long_var.test b/storage/spider/mysql-test/spider/t/loop_check_long_var.test
new file mode 100644
index 00000000000..426c52243fb
--- /dev/null
+++ b/storage/spider/mysql-test/spider/t/loop_check_long_var.test
@@ -0,0 +1,36 @@
+# group by hander doesn't matter here, let's not run this test twice
+source include/have_group_by_handler.inc;
+
+install plugin spider soname 'ha_spider';
+
+--echo #
+--echo # MDEV-38368 Spider crash on fake loop detection variables
+--echo #
+
+set global spider_same_server_link=1;
+
+evalp create server srv1
+  foreign data wrapper mysql
+  options (
+    host 'localhost',
+    user 'root',
+    socket '$MASTER_1_MYSOCK'
+  );
+
+create table t1 (id int primary key, data varchar(255));
+insert into t1 values (1, 'test'), (2, 'data');
+
+create table st1 (id int primary key, data varchar(255)) engine=spider
+comment='wrapper "mysql", srv "srv1", table "t1"';
+
+set @`spider_lc_./test/st1` = concat('-', repeat('x', 900000), '-pid-tbl-');
+select * from st1 limit 1;
+
+drop table st1, t1;
+drop server srv1;
+
+uninstall plugin spider;
+drop tables mysql.spider_link_failed_log, mysql.spider_link_mon_servers, mysql.spider_tables, mysql.spider_table_crd, mysql.spider_table_position_for_recovery, mysql.spider_table_sts, mysql.spider_xa, mysql.spider_xa_failed_log, mysql.spider_xa_member;
+truncate mysql.func;
+
+--echo # End of 10.6 tests
diff --git a/storage/spider/spd_conn.cc b/storage/spider/spd_conn.cc
index 951fb497a9a..631e6c3f4a9 100644
--- a/storage/spider/spd_conn.cc
+++ b/storage/spider/spd_conn.cc
@@ -1242,7 +1242,7 @@ int spider_conn_queue_loop_check(
   */
   lex_str.length = top_share->path.length + SPIDER_SQL_LOP_CHK_PRM_PRF_LEN;
   buf_sz = lex_str.length + 2;
-  loop_check_buf = (char *) my_alloca(buf_sz);
+  loop_check_buf = (char *) my_safe_alloca(buf_sz);
   if (unlikely(!loop_check_buf))
   {
     DBUG_RETURN(HA_ERR_OUT_OF_MEM);
@@ -1309,7 +1309,7 @@ int spider_conn_queue_loop_check(
       from_str.length = tmp_name - lex_str.str + 1;
     }
   }
-  my_afree(loop_check_buf);
+  my_safe_afree(loop_check_buf, buf_sz);
   /*
     construct loop_check_buf as <from_str>-<cur>-<to_str> e.g.
     "-<mac>-<pid>-./test/t0--./test/t1-./test/t2", later used as
@@ -1325,7 +1325,7 @@ int spider_conn_queue_loop_check(
   to_str.str = path;
   DBUG_PRINT("info", ("spider to=%s", to_str.str));
   buf_sz = from_str.length + top_share->path.length + to_str.length + 3;
-  loop_check_buf = (char *) my_alloca(buf_sz);
+  loop_check_buf = (char *) my_safe_alloca(buf_sz);
   if (unlikely(!loop_check_buf))
   {
     DBUG_RETURN(HA_ERR_OUT_OF_MEM);
@@ -1376,7 +1376,7 @@ int spider_conn_queue_loop_check(
         lex_str.length + 2),
       NullS)
     )) {
-      my_afree(loop_check_buf);
+      my_safe_afree(loop_check_buf, buf_sz);
       goto error_alloc_loop_check;
     }
     lcptr->flag = 0;
@@ -1401,7 +1401,7 @@ int spider_conn_queue_loop_check(
       (uchar *) to_str.str, to_str.length);
     if (unlikely(my_hash_insert(&conn->loop_checked, (uchar *) lcptr)))
     {
-      my_afree(loop_check_buf);
+      my_safe_afree(loop_check_buf, buf_sz);
       goto error_hash_insert;
     }
   } else {
@@ -1412,11 +1412,11 @@ int spider_conn_queue_loop_check(
       lcptr->flag |= SPIDER_LOP_CHK_IGNORED;
     }
     pthread_mutex_unlock(&conn->loop_check_mutex);
-    my_afree(loop_check_buf);
+    my_safe_afree(loop_check_buf, buf_sz);
     DBUG_PRINT("info", ("spider be sent or queued already"));
     DBUG_RETURN(0);
   }
-  my_afree(loop_check_buf);
+  my_safe_afree(loop_check_buf, buf_sz);
 
   if ((error_num = spider_conn_queue_and_merge_loop_check(conn, lcptr)))
   {

From 9fc46b885763a87d0e33264e0c2e6d12f81e7f3f Mon Sep 17 00:00:00 2001
From: Alexey Botchkov <holyfoot@askmonty.org>
Date: Tue, 23 Dec 2025 01:26:19 +0400
Subject: [PATCH 103/119] MDEV-38372 ASAN error in InnoDB on malformed WKB

Geometry::is_binary_valid() method added, and
used to check WKB before storing in the engine.
---
 mysql-test/suite/funcs_1/r/storedproc.result |  6 ++----
 mysql-test/suite/innodb_gis/r/0.result       | 12 +++++++++++
 mysql-test/suite/innodb_gis/t/0.test         | 13 ++++++++++++
 sql/spatial.h                                | 13 ++++++++++++
 sql/sql_type_geom.cc                         | 21 ++++++++++----------
 5 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result
index 45bcc882f3c..8b1cb5e8b47 100644
--- a/mysql-test/suite/funcs_1/r/storedproc.result
+++ b/mysql-test/suite/funcs_1/r/storedproc.result
@@ -17283,8 +17283,7 @@ set f1 = f1;
 return f1;
 END//
 SELECT fn104('\0\0\0\0
\0\0\0\0\0\0\0\0\0\0\0\0?\0\0\0\0\0\0?\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@');
-fn104('\0\0\0\0
\0\0\0\0\0\0\0\0\0\0\0\0?\0\0\0\0\0\0?\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@')
-
??@@@@
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 DROP FUNCTION IF EXISTS fn105;
 CREATE FUNCTION fn105( f1 point) returns point
 BEGIN
@@ -18418,8 +18417,7 @@ set f1 = f1;
 SELECT f1;
 END//
 CALL sp104('\0\0\0\0
\0\0\0\0\0\0\0\0\0\0\0\0?\0\0\0\0\0\0?\0\0\0\0\0\0\0@\0\0\0\0\0\0\0@\0\0\0\0\0\0@\0\0\0\0\0\0@');
-f1
-
??@@@@
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 DROP PROCEDURE IF EXISTS sp105;
 CREATE PROCEDURE sp105( f1 point)
 BEGIN
diff --git a/mysql-test/suite/innodb_gis/r/0.result b/mysql-test/suite/innodb_gis/r/0.result
index c9864fad830..9d4773b0b9b 100644
--- a/mysql-test/suite/innodb_gis/r/0.result
+++ b/mysql-test/suite/innodb_gis/r/0.result
@@ -617,3 +617,15 @@ commit;
 disconnect a;
 connection default;
 drop table t1;
+#
+# MDEV-38372 ASAN error in InnoDB on malformed WKB
+#
+create table t1 (
+id int auto_increment primary key,
+geom geometry not null,
+spatial index (geom)
+) engine=innodb;
+insert t1 (geom) values (X'000000000107000000FF000000');
+ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
+drop table t1;
+# End of 10.6 tests
diff --git a/mysql-test/suite/innodb_gis/t/0.test b/mysql-test/suite/innodb_gis/t/0.test
index c482d881732..39feb8eb087 100644
--- a/mysql-test/suite/innodb_gis/t/0.test
+++ b/mysql-test/suite/innodb_gis/t/0.test
@@ -40,5 +40,18 @@ disconnect a;
 connection default;
 drop table t1;
 
+--echo #
+--echo # MDEV-38372 ASAN error in InnoDB on malformed WKB
+--echo #
+create table t1 (
+    id int auto_increment primary key,
+    geom geometry not null,
+    spatial index (geom)
+) engine=innodb;
 
+--error ER_CANT_CREATE_GEOMETRY_OBJECT
+insert t1 (geom) values (X'000000000107000000FF000000');
+drop table t1;
+
+--echo # End of 10.6 tests
 
diff --git a/sql/spatial.h b/sql/spatial.h
index d775e14aea4..c215003b321 100644
--- a/sql/spatial.h
+++ b/sql/spatial.h
@@ -269,6 +269,19 @@ public:
 
   virtual const Class_info *get_class_info() const=0;
   virtual uint32 get_data_size() const=0;
+
+  /*
+    The 'binary_valid' spatial object can be stored in the database
+    and be the correct argument to the spatial functions.
+    It can still be not valid by the OPENGIS standard like
+    having self-intersecting borders.
+  */
+  bool is_binary_valid() const
+  {
+    uint32 data_size= get_data_size();
+
+    return (data_size == GET_SIZE_ERROR) ? false : !no_data(m_data, data_size);
+  }
   virtual bool init_from_wkt(Gis_read_stream *trs, String *wkb)=0;
   /* returns the length of the wkb that was read */
   virtual uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo,
diff --git a/sql/sql_type_geom.cc b/sql/sql_type_geom.cc
index 74d17fd21eb..45a7e752c85 100644
--- a/sql/sql_type_geom.cc
+++ b/sql/sql_type_geom.cc
@@ -854,6 +854,12 @@ int Field_geom::store(const char *from, size_t length, CHARSET_INFO *cs)
 	wkb_type > (uint32) Geometry::wkb_last)
       goto err;
 
+    const char *dummy;
+    Geometry_buffer buffer;
+    Geometry *geom= Geometry::construct(&buffer, from, uint32(length));
+    if (!geom || !geom->is_binary_valid())
+      goto err;
+
     if (m_type_handler->geometry_type() != Type_handler_geometry::GEOM_GEOMETRY &&
         m_type_handler->geometry_type() != Type_handler_geometry::GEOM_GEOMETRYCOLLECTION &&
         (uint32) m_type_handler->geometry_type() != wkb_type)
@@ -866,21 +872,14 @@ int Field_geom::store(const char *from, size_t length, CHARSET_INFO *cs)
       if (!tab_name)
         tab_name= "";
 
-      Geometry_buffer buffer;
-      Geometry *geom= NULL;
-      String wkt;
-      const char *dummy;
-      wkt.set_charset(&my_charset_latin1);
-      if (!(geom= Geometry::construct(&buffer, from, uint32(length))) ||
-          geom->as_wkt(&wkt, &dummy))
+      StringBuffer<STRING_BUFFER_USUAL_SIZE> wkt(&my_charset_latin1);
+      if (geom->as_wkt(&wkt, &dummy))
         goto err;
 
       my_error(ER_TRUNCATED_WRONG_VALUE_FOR_FIELD, MYF(0),
                Geometry::ci_collection[m_type_handler->geometry_type()]->m_name.str,
-	       wkt.c_ptr_safe(),
-               db, tab_name, field_name.str,
-               (ulong) table->in_use->get_stmt_da()->
-               current_row_for_warning());
+               wkt.c_ptr_safe(), db, tab_name, field_name.str,
+               (ulong) table->in_use->get_stmt_da()->current_row_for_warning());
       goto err_exit;
     }
 

From 2dcd3cefe1f50366ab9f4cce5325483b43e5efcc Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 18 Dec 2025 16:14:26 +0100
Subject: [PATCH 104/119] MDEV-38374 nonsense code in
 wsrep_store_key_val_for_row()

fix copy-paste error. See the code for MYSQL_TYPE_VARCHAR
---
 .../suite/galera/r/galera_blob_key.result       | 14 ++++++++++++++
 mysql-test/suite/galera/t/galera_blob_key.test  | 17 +++++++++++++++++
 storage/innobase/handler/ha_innodb.cc           |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 mysql-test/suite/galera/r/galera_blob_key.result
 create mode 100644 mysql-test/suite/galera/t/galera_blob_key.test

diff --git a/mysql-test/suite/galera/r/galera_blob_key.result b/mysql-test/suite/galera/r/galera_blob_key.result
new file mode 100644
index 00000000000..e0e2aa1013a
--- /dev/null
+++ b/mysql-test/suite/galera/r/galera_blob_key.result
@@ -0,0 +1,14 @@
+connection node_2;
+connection node_1;
+#
+# MDEV-38374 nonsense code in wsrep_store_key_val_for_row()
+#
+create table t1 (
+id int auto_increment primary key,
+blob_data longblob not null,
+unique key idx_blob_prefix (blob_data(3072))
+) engine=innodb;
+insert into t1 (blob_data) values ('a');
+update t1 set blob_data = repeat('x', 4000) where id = 1;
+drop table t1;
+# End of 10.6 tests
diff --git a/mysql-test/suite/galera/t/galera_blob_key.test b/mysql-test/suite/galera/t/galera_blob_key.test
new file mode 100644
index 00000000000..1c83120a062
--- /dev/null
+++ b/mysql-test/suite/galera/t/galera_blob_key.test
@@ -0,0 +1,17 @@
+source include/galera_cluster.inc;
+source include/have_innodb.inc;
+
+--echo #
+--echo # MDEV-38374 nonsense code in wsrep_store_key_val_for_row()
+--echo #
+
+create table t1 (
+    id int auto_increment primary key,
+    blob_data longblob not null,
+    unique key idx_blob_prefix (blob_data(3072))
+) engine=innodb;
+insert into t1 (blob_data) values ('a');
+update t1 set blob_data = repeat('x', 4000) where id = 1;
+drop table t1;
+
+--echo # End of 10.6 tests
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 7ce5b4983fc..50cfc5570d2 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -6918,12 +6918,12 @@ wsrep_store_key_val_for_row(
 						 wsrep_thd_query(thd));
 					true_len = buff_space;
 				}
+				memcpy(buff, sorted, true_len);
 				buff       += true_len;
 				buff_space -= true_len;
 			} else {
 				buff += key_len;
 			}
-			memcpy(buff, sorted, true_len);
 		} else {
 			/* Here we handle all other data types except the
 			true VARCHAR, BLOB and TEXT. Note that the column

From 635559a2ad68a5a6d1a354e8209c58323dba0261 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 18 Dec 2025 16:52:17 +0100
Subject: [PATCH 105/119] MDEV-38375 audit plugin implements its own (simple)
 SQL parser

remove the parser, use thd_sql_command(thd)
---
 .../suite/plugins/r/server_audit.result       |   2 -
 .../plugins/r/thread_pool_server_audit.result |   2 -
 plugin/server_audit/server_audit.c            | 417 ++++--------------
 sql/sql_cmd.h                                 |  99 +----
 sql/sql_command.h                             | 112 +++++
 5 files changed, 205 insertions(+), 427 deletions(-)
 create mode 100644 sql/sql_command.h

diff --git a/mysql-test/suite/plugins/r/server_audit.result b/mysql-test/suite/plugins/r/server_audit.result
index 6c9a9e0ff2e..588563b1b0e 100644
--- a/mysql-test/suite/plugins/r/server_audit.result
+++ b/mysql-test/suite/plugins/r/server_audit.result
@@ -443,8 +443,6 @@ TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*! select 2*/',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*comment*/ select 2',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0
-TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD \n# comment\nFOR u1 = PASSWORD(*****)',0
-TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1=<secret>',ID
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'insert into t1 values (1), (2)',0
diff --git a/mysql-test/suite/plugins/r/thread_pool_server_audit.result b/mysql-test/suite/plugins/r/thread_pool_server_audit.result
index 8c6ece53227..19a3163d209 100644
--- a/mysql-test/suite/plugins/r/thread_pool_server_audit.result
+++ b/mysql-test/suite/plugins/r/thread_pool_server_audit.result
@@ -361,8 +361,6 @@ TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*! select 2*/',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'/*comment*/ select 2',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u1 IDENTIFIED BY *****',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'GRANT ALL ON sa_db TO u2 IDENTIFIED BY *****',0
-TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD\n# comment\nFOR u1 = PASSWORD(*****)',0
-TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'SET PASSWORD FOR u1=<secret>',ID
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'CREATE USER u3 IDENTIFIED BY *****',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'drop user u1, u2, u3',0
 TIME,HOSTNAME,root,localhost,ID,ID,QUERY,sa_db,'set global server_audit_events=\'\'',0
diff --git a/plugin/server_audit/server_audit.c b/plugin/server_audit/server_audit.c
index fee20a1a543..7175239be82 100644
--- a/plugin/server_audit/server_audit.c
+++ b/plugin/server_audit/server_audit.c
@@ -22,6 +22,7 @@
 
 #include <my_config.h>
 #include <assert.h>
+#include "sql_command.h"
 
 #ifndef _WIN32
 #define DO_SYSLOG
@@ -811,189 +812,6 @@ static int user_coll_fill(struct user_coll *c, char *users,
 }
 
 
-enum sa_keywords
-{
-  SQLCOM_NOTHING=0,
-  SQLCOM_DDL,
-  SQLCOM_DML,
-  SQLCOM_GRANT,
-  SQLCOM_CREATE_USER,
-  SQLCOM_ALTER_USER,
-  SQLCOM_CHANGE_MASTER,
-  SQLCOM_CREATE_SERVER,
-  SQLCOM_SET_OPTION,
-  SQLCOM_ALTER_SERVER,
-  SQLCOM_TRUNCATE,
-  SQLCOM_QUERY_ADMIN,
-  SQLCOM_DCL,
-  SQLCOM_FOUND=-1,
-};
-
-struct sa_keyword
-{
-  int length;
-  const char *wd;
-  struct sa_keyword *next;
-  enum sa_keywords type;
-};
-
-
-struct sa_keyword xml_word[]=
-{
-  {3, "XML", 0, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-struct sa_keyword user_word[]=
-{
-  {4, "USER", 0, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-struct sa_keyword data_word[]=
-{
-  {4, "DATA", 0, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-struct sa_keyword server_word[]=
-{
-  {6, "SERVER", 0, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-struct sa_keyword master_word[]=
-{
-  {6, "MASTER", 0, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-struct sa_keyword password_word[]=
-{
-  {8, "PASSWORD", 0, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-struct sa_keyword function_word[]=
-{
-  {8, "FUNCTION", 0, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-struct sa_keyword statement_word[]=
-{
-  {9, "STATEMENT", 0, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-struct sa_keyword procedure_word[]=
-{
-  {9, "PROCEDURE", 0, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-struct sa_keyword replace_user_word[]=
-{
-  {7, "REPLACE", user_word, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-struct sa_keyword or_replace_user_word[]=
-{
-  {2, "OR", replace_user_word, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-struct sa_keyword replace_server_word[]=
-{
-  {7, "REPLACE", server_word, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-struct sa_keyword or_replace_server_word[]=
-{
-  {2, "OR", replace_server_word, SQLCOM_FOUND},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-
-
-struct sa_keyword keywords_to_skip[]=
-{
-  {3, "SET", statement_word, SQLCOM_QUERY_ADMIN},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-
-
-struct sa_keyword not_ddl_keywords[]=
-{
-  {4, "DROP", user_word, SQLCOM_DCL},
-  {6, "CREATE", user_word, SQLCOM_DCL},
-  {6, "CREATE", or_replace_user_word, SQLCOM_DCL},
-  {6, "RENAME", user_word, SQLCOM_DCL},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-
-
-struct sa_keyword ddl_keywords[]=
-{
-  {4, "DROP", 0, SQLCOM_DDL},
-  {5, "ALTER", 0, SQLCOM_DDL},
-  {6, "CREATE", 0, SQLCOM_DDL},
-  {6, "RENAME", 0, SQLCOM_DDL},
-  {8, "TRUNCATE", 0, SQLCOM_DDL},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-
-
-struct sa_keyword dml_keywords[]=
-{
-  {2, "DO", 0, SQLCOM_DML},
-  {4, "CALL", 0, SQLCOM_DML},
-  {4, "LOAD", data_word, SQLCOM_DML},
-  {4, "LOAD", xml_word, SQLCOM_DML},
-  {6, "DELETE", 0, SQLCOM_DML},
-  {6, "INSERT", 0, SQLCOM_DML},
-  {6, "SELECT", 0, SQLCOM_DML},
-  {6, "UPDATE", 0, SQLCOM_DML},
-  {7, "HANDLER", 0, SQLCOM_DML},
-  {7, "REPLACE", 0, SQLCOM_DML},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-
-
-struct sa_keyword dml_no_select_keywords[]=
-{
-  {2, "DO", 0, SQLCOM_DML},
-  {4, "CALL", 0, SQLCOM_DML},
-  {4, "LOAD", data_word, SQLCOM_DML},
-  {4, "LOAD", xml_word, SQLCOM_DML},
-  {6, "DELETE", 0, SQLCOM_DML},
-  {6, "INSERT", 0, SQLCOM_DML},
-  {6, "UPDATE", 0, SQLCOM_DML},
-  {7, "HANDLER", 0, SQLCOM_DML},
-  {7, "REPLACE", 0, SQLCOM_DML},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-
-
-struct sa_keyword dcl_keywords[]=
-{
-  {6, "CREATE", user_word, SQLCOM_DCL},
-  {6, "CREATE", or_replace_user_word, SQLCOM_DCL},
-  {4, "DROP", user_word, SQLCOM_DCL},
-  {6, "RENAME", user_word, SQLCOM_DCL},
-  {5, "GRANT", 0, SQLCOM_DCL},
-  {6, "REVOKE", 0, SQLCOM_DCL},
-  {3, "SET", password_word, SQLCOM_DCL},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-
-
-struct sa_keyword passwd_keywords[]=
-{
-  {3, "SET", password_word, SQLCOM_SET_OPTION},
-  {5, "ALTER", server_word, SQLCOM_ALTER_SERVER},
-  {5, "ALTER", user_word, SQLCOM_ALTER_USER},
-  {5, "GRANT", 0, SQLCOM_GRANT},
-  {6, "CREATE", user_word, SQLCOM_CREATE_USER},
-  {6, "CREATE", or_replace_user_word, SQLCOM_CREATE_USER},
-  {6, "CREATE", server_word, SQLCOM_CREATE_SERVER},
-  {6, "CREATE", or_replace_server_word, SQLCOM_CREATE_SERVER},
-  {6, "CHANGE", master_word, SQLCOM_CHANGE_MASTER},
-  {0, NULL, 0, SQLCOM_NOTHING}
-};
-
-#define MAX_KEYWORD 9
-
-
 static void error_header()
 {
   struct tm tm_time;
@@ -1107,6 +925,78 @@ static int get_user_host(const char *uh_line, unsigned int uh_len,
   return 0;
 }
 
+
+static int sql_command_to_cmdtype(int sql_command)
+{
+  switch (sql_command)
+  {
+    case SQLCOM_ALTER_DB:
+    case SQLCOM_ALTER_DB_UPGRADE:
+    case SQLCOM_ALTER_FUNCTION:
+    case SQLCOM_ALTER_PROCEDURE:
+    case SQLCOM_ALTER_SEQUENCE:
+    case SQLCOM_ALTER_TABLE:
+    case SQLCOM_CREATE_DB:
+    case SQLCOM_CREATE_INDEX:
+    case SQLCOM_CREATE_PACKAGE:
+    case SQLCOM_CREATE_PACKAGE_BODY:
+    case SQLCOM_CREATE_PROCEDURE:
+    case SQLCOM_CREATE_SEQUENCE:
+    case SQLCOM_CREATE_SPFUNCTION:
+    case SQLCOM_CREATE_TABLE:
+    case SQLCOM_CREATE_TRIGGER:
+    case SQLCOM_CREATE_VIEW:
+    case SQLCOM_DROP_DB:
+    case SQLCOM_DROP_FUNCTION:
+    case SQLCOM_DROP_INDEX:
+    case SQLCOM_DROP_PACKAGE:
+    case SQLCOM_DROP_PACKAGE_BODY:
+    case SQLCOM_DROP_PROCEDURE:
+    case SQLCOM_DROP_SEQUENCE:
+    case SQLCOM_DROP_TABLE:
+    case SQLCOM_DROP_TRIGGER:
+    case SQLCOM_DROP_VIEW:
+    case SQLCOM_RENAME_TABLE:
+    case SQLCOM_TRUNCATE:
+      return EVENT_QUERY_DDL;
+
+    case SQLCOM_DO:
+    case SQLCOM_CALL:
+    case SQLCOM_LOAD:
+    case SQLCOM_DELETE:
+    case SQLCOM_DELETE_MULTI:
+    case SQLCOM_INSERT:
+    case SQLCOM_INSERT_SELECT:
+    case SQLCOM_UPDATE:
+    case SQLCOM_UPDATE_MULTI:
+    case SQLCOM_HA_OPEN:
+    case SQLCOM_HA_READ:
+    case SQLCOM_HA_CLOSE:
+    case SQLCOM_REPLACE:
+    case SQLCOM_REPLACE_SELECT:
+      return EVENT_QUERY_DML | EVENT_QUERY_DML_NO_SELECT;
+
+    case SQLCOM_SELECT:
+      return EVENT_QUERY_DML;
+
+    case SQLCOM_CREATE_USER:
+    case SQLCOM_CREATE_ROLE:
+    case SQLCOM_DROP_ROLE:
+    case SQLCOM_DROP_USER:
+    case SQLCOM_RENAME_USER:
+    case SQLCOM_GRANT:
+    case SQLCOM_GRANT_ROLE:
+    case SQLCOM_REVOKE:
+    case SQLCOM_REVOKE_ROLE:
+    case SQLCOM_REVOKE_ALL:
+      return EVENT_QUERY_DCL;
+
+    default:
+      return EVENT_QUERY_ALL;
+  };
+}
+
+
 #if defined(_WIN32) && !defined(S_ISDIR)
 #define S_ISDIR(x) ((x) & _S_IFDIR)
 #endif /*_WIN32 && !S_ISDIR*/
@@ -1755,118 +1645,8 @@ static int do_log_user(const char *name, int len,
 }
 
 
-static int get_next_word(const char *query, char *word)
-{
-  int len= 0;
-  char c;
-  while ((c= query[len]))
-  {
-    if (c >= 'a' && c <= 'z')
-      word[len]= 'A' + (c-'a');
-    else if (c >= 'A' && c <= 'Z')
-      word[len]= c;
-    else
-      break;
-
-    if (len++ == MAX_KEYWORD)
-      return 0;
-  }
-  word[len]= 0;
-  return len;
-}
-
-
-static int filter_query_type(const char *query, struct sa_keyword *kwd)
-{
-  int qwe_in_list;
-  char fword[MAX_KEYWORD + 1], nword[MAX_KEYWORD + 1];
-  int len, nlen= 0;
-  const struct sa_keyword *l_keywords;
-  if (!query)
-    return SQLCOM_NOTHING;
-
-  while (*query && (is_space(*query) || *query == '(' || *query == '/'))
-  {
-    /* comment handling */
-    if (*query == '/' && query[1] == '*')
-    {
-      if (query[2] == '!')
-      {
-        query+= 3;
-        while (*query >= '0' && *query <= '9')
-          query++;
-        continue;
-      }
-      query+= 2;
-      while (*query)
-      {
-        if (*query=='*' && query[1] == '/')
-        {
-          query+= 2;
-          break;
-        }
-        query++;
-      }
-      continue;
-    }
-    query++;
-  }
-
-  qwe_in_list= SQLCOM_NOTHING;
-  if (!(len= get_next_word(query, fword)))
-    goto not_in_list;
-  query+= len+1;
-
-  l_keywords= kwd;
-  while (l_keywords->length)
-  {
-    if (l_keywords->length == len && strncmp(l_keywords->wd, fword, len) == 0)
-    {
-      if (l_keywords->next)
-      {
-        if (nlen == 0)
-        {
-          while (*query && is_space(*query))
-            query++;
-          nlen= get_next_word(query, nword);
-        }
-        if (filter_query_type(query, l_keywords->next) == SQLCOM_NOTHING)
-          goto do_loop;
-      }
-
-      qwe_in_list= l_keywords->type;
-      break;
-    };
-do_loop:
-    l_keywords++;
-  }
-
-not_in_list:
-  return qwe_in_list;
-}
-
-static const char *skip_set_statement(const char *query)
-{
-    if (filter_query_type(query, keywords_to_skip))
-    {
-      char fword[MAX_KEYWORD + 1];
-      int len;
-      do
-      {
-        len= get_next_word(query, fword);
-        query+= len ? len : 1;
-        if (len == 3 && strncmp(fword, "FOR", 3) == 0)
-          break;
-      } while (*query);
-
-      if (*query == 0)
-        return 0;
-    }
-    return query;
-}
-
 static int log_statement_ex(const struct connection_info *cn,
-                            time_t ev_time, unsigned long thd_id,
+                            time_t ev_time, unsigned long thd_id, int sql_cmd,
                             const char *query, unsigned int query_len,
                             int error_code, const char *type, int take_lock)
 {
@@ -1881,6 +1661,7 @@ static int log_statement_ex(const struct connection_info *cn,
   long long query_id;
   int result;
   char *big_buffer= NULL;
+  int cmdtype= sql_command_to_cmdtype(sql_cmd);
 
   if ((db= cn->db))
     db_length= cn->db_length;
@@ -1907,30 +1688,14 @@ static int log_statement_ex(const struct connection_info *cn,
   {
     const char *orig_query= query;
 
-    if ((query= skip_set_statement(query)) == SQLCOM_NOTHING)
-      return 0;
-
-    if (events & EVENT_QUERY_DDL)
-    {
-      if (!filter_query_type(query, not_ddl_keywords) &&
-          filter_query_type(query, ddl_keywords))
-        goto do_log_query;
-    }
-    if (events & EVENT_QUERY_DML)
-    {
-      if (filter_query_type(query, dml_keywords))
-        goto do_log_query;
-    }
-    if (events & EVENT_QUERY_DML_NO_SELECT)
-    {
-      if (filter_query_type(query, dml_no_select_keywords))
-        goto do_log_query;
-    }
-    if (events & EVENT_QUERY_DCL)
-    {
-      if (filter_query_type(query, dcl_keywords))
-        goto do_log_query;
-    }
+    if (events & EVENT_QUERY_DDL && cmdtype & EVENT_QUERY_DDL)
+      goto do_log_query;
+    if (events & EVENT_QUERY_DML && cmdtype & EVENT_QUERY_DML)
+      goto do_log_query;
+    if (events & EVENT_QUERY_DML_NO_SELECT && cmdtype & EVENT_QUERY_DML_NO_SELECT)
+      goto do_log_query;
+    if (events & EVENT_QUERY_DCL && cmdtype & EVENT_QUERY_DCL)
+      goto do_log_query;
 
     return 0;
 do_log_query:
@@ -1964,7 +1729,7 @@ do_log_query:
   if (query_log_limit > 0 && uh_buffer_size > query_log_limit+2)
     uh_buffer_size= query_log_limit+2;
 
-  switch (filter_query_type(skip_set_statement(query), passwd_keywords))
+  switch (sql_cmd)
   {
     case SQLCOM_GRANT:
     case SQLCOM_CREATE_USER:
@@ -1990,8 +1755,8 @@ do_log_query:
     case SQLCOM_SET_OPTION:
       csize+= escape_string_hide_passwords(query, query_len,
                                            uh_buffer, uh_buffer_size,
-                                           NULL, 0, NULL, 0,
-                                           "=", 1, 0);
+                                           "PASSWORD", 8, "=", 1,
+                                           "PASSWORD", 8, '(');
       break;
     default:
       csize+= escape_string(query, query_len,
@@ -2011,10 +1776,11 @@ do_log_query:
 
 static int log_statement(const struct connection_info *cn,
                          const struct mysql_event_general *event,
-                         const char *type)
+                         const char *type, int sql_command)
 {
   return log_statement_ex(cn, event->general_time, event->general_thread_id,
-                          event->general_query, event->general_query_length,
+                          sql_command, event->general_query,
+                          event->general_query_length,
                           event->general_error_code, type, 1);
 }
 
@@ -2305,7 +2071,7 @@ void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev)
     if (event->event_subclass == MYSQL_AUDIT_GENERAL_STATUS &&
         event_query_command(event))
     {
-      log_statement(cn, event, "QUERY");
+      log_statement(cn, event, "QUERY", thd_sql_command(thd));
       cn->query_length= 0; /* So the log_current_query() won't log this again. */
       cn->log_always= 0;
     }
@@ -2843,7 +2609,8 @@ static void log_current_query(MYSQL_THD thd)
   {
     cn->log_always= 1;
     log_statement_ex(cn, cn->query_time, thd_get_thread_id(thd),
-		     cn->query, cn->query_length, 0, "QUERY", 0);
+                     thd_sql_command(thd), cn->query, cn->query_length, 0,
+                     "QUERY", 0);
     cn->log_always= 0;
   }
 }
diff --git a/sql/sql_cmd.h b/sql/sql_cmd.h
index e1ce96efb29..f94ffee2f9f 100644
--- a/sql/sql_cmd.h
+++ b/sql/sql_cmd.h
@@ -20,104 +20,7 @@
 #ifndef SQL_CMD_INCLUDED
 #define SQL_CMD_INCLUDED
 
-/*
-  When a command is added here, be sure it's also added in mysqld.cc
-  in "struct show_var_st status_vars[]= {" ...
-
-  If the command returns a result set or is not allowed in stored
-  functions or triggers, please also make sure that
-  sp_get_flags_for_command (sp_head.cc) returns proper flags for the
-  added SQLCOM_.
-*/
-
-enum enum_sql_command {
-  SQLCOM_SELECT, SQLCOM_CREATE_TABLE, SQLCOM_CREATE_INDEX, SQLCOM_ALTER_TABLE,
-  SQLCOM_UPDATE, SQLCOM_INSERT, SQLCOM_INSERT_SELECT,
-  SQLCOM_DELETE, SQLCOM_TRUNCATE, SQLCOM_DROP_TABLE, SQLCOM_DROP_INDEX,
-
-  SQLCOM_SHOW_DATABASES, SQLCOM_SHOW_TABLES, SQLCOM_SHOW_FIELDS,
-  SQLCOM_SHOW_KEYS, SQLCOM_SHOW_VARIABLES, SQLCOM_SHOW_STATUS,
-  SQLCOM_SHOW_ENGINE_LOGS, SQLCOM_SHOW_ENGINE_STATUS, SQLCOM_SHOW_ENGINE_MUTEX,
-  SQLCOM_SHOW_PROCESSLIST, SQLCOM_SHOW_BINLOG_STAT, SQLCOM_SHOW_SLAVE_STAT,
-  SQLCOM_SHOW_GRANTS, SQLCOM_SHOW_CREATE, SQLCOM_SHOW_CHARSETS,
-  SQLCOM_SHOW_COLLATIONS, SQLCOM_SHOW_CREATE_DB, SQLCOM_SHOW_TABLE_STATUS,
-  SQLCOM_SHOW_TRIGGERS,
-
-  SQLCOM_LOAD,SQLCOM_SET_OPTION,SQLCOM_LOCK_TABLES,SQLCOM_UNLOCK_TABLES,
-  SQLCOM_GRANT,
-  SQLCOM_CHANGE_DB, SQLCOM_CREATE_DB, SQLCOM_DROP_DB, SQLCOM_ALTER_DB,
-  SQLCOM_REPAIR, SQLCOM_REPLACE, SQLCOM_REPLACE_SELECT,
-  SQLCOM_CREATE_FUNCTION, SQLCOM_DROP_FUNCTION,
-  SQLCOM_REVOKE,SQLCOM_OPTIMIZE, SQLCOM_CHECK,
-  SQLCOM_ASSIGN_TO_KEYCACHE, SQLCOM_PRELOAD_KEYS,
-  SQLCOM_FLUSH, SQLCOM_KILL, SQLCOM_ANALYZE,
-  SQLCOM_ROLLBACK, SQLCOM_ROLLBACK_TO_SAVEPOINT,
-  SQLCOM_COMMIT, SQLCOM_SAVEPOINT, SQLCOM_RELEASE_SAVEPOINT,
-  SQLCOM_SLAVE_START, SQLCOM_SLAVE_STOP,
-  SQLCOM_BEGIN, SQLCOM_CHANGE_MASTER,
-  SQLCOM_RENAME_TABLE,  
-  SQLCOM_RESET, SQLCOM_PURGE, SQLCOM_PURGE_BEFORE, SQLCOM_SHOW_BINLOGS,
-  SQLCOM_SHOW_OPEN_TABLES,
-  SQLCOM_HA_OPEN, SQLCOM_HA_CLOSE, SQLCOM_HA_READ,
-  SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_DELETE_MULTI, SQLCOM_UPDATE_MULTI,
-  SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_DO,
-  SQLCOM_SHOW_WARNS, SQLCOM_EMPTY_QUERY, SQLCOM_SHOW_ERRORS,
-  SQLCOM_SHOW_STORAGE_ENGINES, SQLCOM_SHOW_PRIVILEGES,
-  SQLCOM_HELP, SQLCOM_CREATE_USER, SQLCOM_DROP_USER, SQLCOM_RENAME_USER,
-  SQLCOM_REVOKE_ALL, SQLCOM_CHECKSUM,
-  SQLCOM_CREATE_PROCEDURE, SQLCOM_CREATE_SPFUNCTION, SQLCOM_CALL,
-  SQLCOM_DROP_PROCEDURE, SQLCOM_ALTER_PROCEDURE,SQLCOM_ALTER_FUNCTION,
-  SQLCOM_SHOW_CREATE_PROC, SQLCOM_SHOW_CREATE_FUNC,
-  SQLCOM_SHOW_STATUS_PROC, SQLCOM_SHOW_STATUS_FUNC,
-  SQLCOM_PREPARE, SQLCOM_EXECUTE, SQLCOM_DEALLOCATE_PREPARE,
-  SQLCOM_CREATE_VIEW, SQLCOM_DROP_VIEW,
-  SQLCOM_CREATE_TRIGGER, SQLCOM_DROP_TRIGGER,
-  SQLCOM_XA_START, SQLCOM_XA_END, SQLCOM_XA_PREPARE,
-  SQLCOM_XA_COMMIT, SQLCOM_XA_ROLLBACK, SQLCOM_XA_RECOVER,
-  SQLCOM_SHOW_PROC_CODE, SQLCOM_SHOW_FUNC_CODE,
-  SQLCOM_ALTER_TABLESPACE,
-  SQLCOM_INSTALL_PLUGIN, SQLCOM_UNINSTALL_PLUGIN,
-  SQLCOM_SHOW_AUTHORS, SQLCOM_BINLOG_BASE64_EVENT,
-  SQLCOM_SHOW_PLUGINS, SQLCOM_SHOW_CONTRIBUTORS,
-  SQLCOM_CREATE_SERVER, SQLCOM_DROP_SERVER, SQLCOM_ALTER_SERVER,
-  SQLCOM_CREATE_EVENT, SQLCOM_ALTER_EVENT, SQLCOM_DROP_EVENT,
-  SQLCOM_SHOW_CREATE_EVENT, SQLCOM_SHOW_EVENTS,
-  SQLCOM_SHOW_CREATE_TRIGGER,
-  SQLCOM_ALTER_DB_UPGRADE,
-  SQLCOM_SHOW_PROFILE, SQLCOM_SHOW_PROFILES,
-  SQLCOM_SIGNAL, SQLCOM_RESIGNAL,
-  SQLCOM_SHOW_RELAYLOG_EVENTS,
-  SQLCOM_GET_DIAGNOSTICS,
-  SQLCOM_SLAVE_ALL_START, SQLCOM_SLAVE_ALL_STOP,
-  SQLCOM_SHOW_EXPLAIN, SQLCOM_SHUTDOWN,
-  SQLCOM_CREATE_ROLE, SQLCOM_DROP_ROLE, SQLCOM_GRANT_ROLE, SQLCOM_REVOKE_ROLE,
-  SQLCOM_COMPOUND,
-  SQLCOM_SHOW_GENERIC,
-  SQLCOM_ALTER_USER,
-  SQLCOM_SHOW_CREATE_USER,
-  SQLCOM_EXECUTE_IMMEDIATE,
-  SQLCOM_CREATE_SEQUENCE,
-  SQLCOM_DROP_SEQUENCE,
-  SQLCOM_ALTER_SEQUENCE,
-  SQLCOM_CREATE_PACKAGE,
-  SQLCOM_DROP_PACKAGE,
-  SQLCOM_CREATE_PACKAGE_BODY,
-  SQLCOM_DROP_PACKAGE_BODY,
-  SQLCOM_SHOW_CREATE_PACKAGE,
-  SQLCOM_SHOW_CREATE_PACKAGE_BODY,
-  SQLCOM_SHOW_STATUS_PACKAGE,
-  SQLCOM_SHOW_STATUS_PACKAGE_BODY,
-  SQLCOM_SHOW_PACKAGE_BODY_CODE,
-  SQLCOM_BACKUP, SQLCOM_BACKUP_LOCK,
-
-  /*
-    When a command is added here, be sure it's also added in mysqld.cc
-    in "struct show_var_st com_status_vars[]= {" ...
-  */
-  /* This should be the last !!! */
-  SQLCOM_END
-};
-
+#include "sql_command.h"
 
 class Storage_engine_name
 {
diff --git a/sql/sql_command.h b/sql/sql_command.h
new file mode 100644
index 00000000000..a8accca1a7c
--- /dev/null
+++ b/sql/sql_command.h
@@ -0,0 +1,112 @@
+/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+
+   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
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335  USA */
+
+/*
+  When a command is added here, be sure it's also added in mysqld.cc
+  in "struct show_var_st status_vars[]= {" ...
+
+  If the command returns a result set or is not allowed in stored
+  functions or triggers, please also make sure that
+  sp_get_flags_for_command (sp_head.cc) returns proper flags for the
+  added SQLCOM_.
+*/
+
+enum enum_sql_command {
+  SQLCOM_SELECT, SQLCOM_CREATE_TABLE, SQLCOM_CREATE_INDEX, SQLCOM_ALTER_TABLE,
+  SQLCOM_UPDATE, SQLCOM_INSERT, SQLCOM_INSERT_SELECT,
+  SQLCOM_DELETE, SQLCOM_TRUNCATE, SQLCOM_DROP_TABLE, SQLCOM_DROP_INDEX,
+
+  SQLCOM_SHOW_DATABASES, SQLCOM_SHOW_TABLES, SQLCOM_SHOW_FIELDS,
+  SQLCOM_SHOW_KEYS, SQLCOM_SHOW_VARIABLES, SQLCOM_SHOW_STATUS,
+  SQLCOM_SHOW_ENGINE_LOGS, SQLCOM_SHOW_ENGINE_STATUS, SQLCOM_SHOW_ENGINE_MUTEX,
+  SQLCOM_SHOW_PROCESSLIST, SQLCOM_SHOW_BINLOG_STAT, SQLCOM_SHOW_SLAVE_STAT,
+  SQLCOM_SHOW_GRANTS, SQLCOM_SHOW_CREATE, SQLCOM_SHOW_CHARSETS,
+  SQLCOM_SHOW_COLLATIONS, SQLCOM_SHOW_CREATE_DB, SQLCOM_SHOW_TABLE_STATUS,
+  SQLCOM_SHOW_TRIGGERS,
+
+  SQLCOM_LOAD,SQLCOM_SET_OPTION,SQLCOM_LOCK_TABLES,SQLCOM_UNLOCK_TABLES,
+  SQLCOM_GRANT,
+  SQLCOM_CHANGE_DB, SQLCOM_CREATE_DB, SQLCOM_DROP_DB, SQLCOM_ALTER_DB,
+  SQLCOM_REPAIR, SQLCOM_REPLACE, SQLCOM_REPLACE_SELECT,
+  SQLCOM_CREATE_FUNCTION, SQLCOM_DROP_FUNCTION,
+  SQLCOM_REVOKE,SQLCOM_OPTIMIZE, SQLCOM_CHECK,
+  SQLCOM_ASSIGN_TO_KEYCACHE, SQLCOM_PRELOAD_KEYS,
+  SQLCOM_FLUSH, SQLCOM_KILL, SQLCOM_ANALYZE,
+  SQLCOM_ROLLBACK, SQLCOM_ROLLBACK_TO_SAVEPOINT,
+  SQLCOM_COMMIT, SQLCOM_SAVEPOINT, SQLCOM_RELEASE_SAVEPOINT,
+  SQLCOM_SLAVE_START, SQLCOM_SLAVE_STOP,
+  SQLCOM_BEGIN, SQLCOM_CHANGE_MASTER,
+  SQLCOM_RENAME_TABLE,  
+  SQLCOM_RESET, SQLCOM_PURGE, SQLCOM_PURGE_BEFORE, SQLCOM_SHOW_BINLOGS,
+  SQLCOM_SHOW_OPEN_TABLES,
+  SQLCOM_HA_OPEN, SQLCOM_HA_CLOSE, SQLCOM_HA_READ,
+  SQLCOM_SHOW_SLAVE_HOSTS, SQLCOM_DELETE_MULTI, SQLCOM_UPDATE_MULTI,
+  SQLCOM_SHOW_BINLOG_EVENTS, SQLCOM_DO,
+  SQLCOM_SHOW_WARNS, SQLCOM_EMPTY_QUERY, SQLCOM_SHOW_ERRORS,
+  SQLCOM_SHOW_STORAGE_ENGINES, SQLCOM_SHOW_PRIVILEGES,
+  SQLCOM_HELP, SQLCOM_CREATE_USER, SQLCOM_DROP_USER, SQLCOM_RENAME_USER,
+  SQLCOM_REVOKE_ALL, SQLCOM_CHECKSUM,
+  SQLCOM_CREATE_PROCEDURE, SQLCOM_CREATE_SPFUNCTION, SQLCOM_CALL,
+  SQLCOM_DROP_PROCEDURE, SQLCOM_ALTER_PROCEDURE,SQLCOM_ALTER_FUNCTION,
+  SQLCOM_SHOW_CREATE_PROC, SQLCOM_SHOW_CREATE_FUNC,
+  SQLCOM_SHOW_STATUS_PROC, SQLCOM_SHOW_STATUS_FUNC,
+  SQLCOM_PREPARE, SQLCOM_EXECUTE, SQLCOM_DEALLOCATE_PREPARE,
+  SQLCOM_CREATE_VIEW, SQLCOM_DROP_VIEW,
+  SQLCOM_CREATE_TRIGGER, SQLCOM_DROP_TRIGGER,
+  SQLCOM_XA_START, SQLCOM_XA_END, SQLCOM_XA_PREPARE,
+  SQLCOM_XA_COMMIT, SQLCOM_XA_ROLLBACK, SQLCOM_XA_RECOVER,
+  SQLCOM_SHOW_PROC_CODE, SQLCOM_SHOW_FUNC_CODE,
+  SQLCOM_ALTER_TABLESPACE,
+  SQLCOM_INSTALL_PLUGIN, SQLCOM_UNINSTALL_PLUGIN,
+  SQLCOM_SHOW_AUTHORS, SQLCOM_BINLOG_BASE64_EVENT,
+  SQLCOM_SHOW_PLUGINS, SQLCOM_SHOW_CONTRIBUTORS,
+  SQLCOM_CREATE_SERVER, SQLCOM_DROP_SERVER, SQLCOM_ALTER_SERVER,
+  SQLCOM_CREATE_EVENT, SQLCOM_ALTER_EVENT, SQLCOM_DROP_EVENT,
+  SQLCOM_SHOW_CREATE_EVENT, SQLCOM_SHOW_EVENTS,
+  SQLCOM_SHOW_CREATE_TRIGGER,
+  SQLCOM_ALTER_DB_UPGRADE,
+  SQLCOM_SHOW_PROFILE, SQLCOM_SHOW_PROFILES,
+  SQLCOM_SIGNAL, SQLCOM_RESIGNAL,
+  SQLCOM_SHOW_RELAYLOG_EVENTS,
+  SQLCOM_GET_DIAGNOSTICS,
+  SQLCOM_SLAVE_ALL_START, SQLCOM_SLAVE_ALL_STOP,
+  SQLCOM_SHOW_EXPLAIN, SQLCOM_SHUTDOWN,
+  SQLCOM_CREATE_ROLE, SQLCOM_DROP_ROLE, SQLCOM_GRANT_ROLE, SQLCOM_REVOKE_ROLE,
+  SQLCOM_COMPOUND,
+  SQLCOM_SHOW_GENERIC,
+  SQLCOM_ALTER_USER,
+  SQLCOM_SHOW_CREATE_USER,
+  SQLCOM_EXECUTE_IMMEDIATE,
+  SQLCOM_CREATE_SEQUENCE,
+  SQLCOM_DROP_SEQUENCE,
+  SQLCOM_ALTER_SEQUENCE,
+  SQLCOM_CREATE_PACKAGE,
+  SQLCOM_DROP_PACKAGE,
+  SQLCOM_CREATE_PACKAGE_BODY,
+  SQLCOM_DROP_PACKAGE_BODY,
+  SQLCOM_SHOW_CREATE_PACKAGE,
+  SQLCOM_SHOW_CREATE_PACKAGE_BODY,
+  SQLCOM_SHOW_STATUS_PACKAGE,
+  SQLCOM_SHOW_STATUS_PACKAGE_BODY,
+  SQLCOM_SHOW_PACKAGE_BODY_CODE,
+  SQLCOM_BACKUP, SQLCOM_BACKUP_LOCK,
+
+  /*
+    When a command is added here, be sure it's also added in mysqld.cc
+    in "struct show_var_st com_status_vars[]= {" ...
+  */
+  /* This should be the last !!! */
+  SQLCOM_END
+};

From 317fb109153b45091003f0b1380b5d68522fce29 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Sat, 27 Dec 2025 11:35:01 +0100
Subject: [PATCH 106/119] MDEV-38375 do MYSQL_AUDIT_GENERAL_STATUS on ps
 execute too

just like slow logging, MYSQL_AUDIT_GENERAL_STATUS
should be done inside Prepared_statement::execute()
---
 sql/sql_parse.cc   | 23 ++++++++++++-----------
 sql/sql_prepare.cc |  5 +++++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index f5cbce26031..9c0af6ef115 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1594,6 +1594,7 @@ dispatch_command_return dispatch_command(enum enum_server_command command, THD *
   NET *net= &thd->net;
   bool error= 0;
   bool do_end_of_statement= true;
+  bool log_slow_done= false;
   DBUG_ENTER("dispatch_command");
   DBUG_PRINT("info", ("command: %d %s", command,
                       (command_name[command].str != 0 ?
@@ -1820,6 +1821,7 @@ dispatch_command_return dispatch_command(enum enum_server_command command, THD *
   case COM_STMT_BULK_EXECUTE:
   {
     mysqld_stmt_bulk_execute(thd, packet, packet_length);
+    log_slow_done= true;
 #ifdef WITH_WSREP
     if (WSREP(thd))
     {
@@ -1831,6 +1833,7 @@ dispatch_command_return dispatch_command(enum enum_server_command command, THD *
   case COM_STMT_EXECUTE:
   {
     mysqld_stmt_execute(thd, packet, packet_length);
+    log_slow_done= true;
 #ifdef WITH_WSREP
     if (WSREP(thd))
     {
@@ -2007,6 +2010,7 @@ dispatch_command_return dispatch_command(enum enum_server_command command, THD *
       mysql_parse(thd, beginning_of_next_stmt, length, &parser_state);
 
     }
+    log_slow_done= thd->lex->sql_command == SQLCOM_EXECUTE;
 
     DBUG_PRINT("info",("query ready"));
     break;
@@ -2460,22 +2464,19 @@ resume:
   if (likely(!thd->is_error() && !thd->killed_errno()))
     mysql_audit_general(thd, MYSQL_AUDIT_GENERAL_RESULT, 0, 0);
 
-  mysql_audit_general(thd, MYSQL_AUDIT_GENERAL_STATUS,
-                      thd->get_stmt_da()->is_error() ?
-                      thd->get_stmt_da()->sql_errno() : 0,
-                      command_name[command].str);
+  if (!log_slow_done)
+    mysql_audit_general(thd, MYSQL_AUDIT_GENERAL_STATUS,
+                        thd->get_stmt_da()->is_error() ?
+                        thd->get_stmt_da()->sql_errno() : 0,
+                        command_name[command].str);
 
   thd->update_all_stats();
 
   /*
-    Write to slow query log only those statements that received via the text
-    protocol except the EXECUTE statement. The reason we do that way is
-    that for statements received via binary protocol and for the EXECUTE
-    statement, the slow statements have been already written to slow query log
-    inside the method Prepared_statement::execute().
+    for backward compatibility we only log COM_QUERY here,
+    as if COM_STMT_PREPARE or COM_FIELD_LIST couldn't be slow.
   */
-  if(command == COM_QUERY &&
-     thd->lex->sql_command != SQLCOM_EXECUTE)
+  if (command == COM_QUERY && !log_slow_done)
     log_slow_statement(thd);
   else
     delete_explain_query(thd->lex);
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index b2bcf03820c..9a666b4754c 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -5316,6 +5316,11 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
     */
     cleanup_stmt(false);
 
+  mysql_audit_general(thd, MYSQL_AUDIT_GENERAL_STATUS,
+                      thd->get_stmt_da()->is_error() ?
+                      thd->get_stmt_da()->sql_errno() : 0,
+                      command_name[thd->get_command()].str);
+
   /*
     Log the statement to slow query log if it passes filtering.
     We do it here for prepared statements despite of the fact that the function

From 2ce3f0d76cb6ae0dc6df1f257f28a4b7b1a00244 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <sergey@mariadb.com>
Date: Wed, 3 Dec 2025 15:46:11 +0200
Subject: [PATCH 107/119] MDEV-38240: Selectivity sampling not performed when
 the table has no indexed conditions

Don't skip range analysis step in such cases.
---
 mysql-test/main/selectivity.result        | 28 +++++++++++++++++++++++
 mysql-test/main/selectivity.test          | 21 +++++++++++++++++
 mysql-test/main/selectivity_innodb.result | 28 +++++++++++++++++++++++
 sql/sql_select.cc                         | 22 +++++++++++-------
 4 files changed, 91 insertions(+), 8 deletions(-)

diff --git a/mysql-test/main/selectivity.result b/mysql-test/main/selectivity.result
index dc20c610639..069abfea93d 100644
--- a/mysql-test/main/selectivity.result
+++ b/mysql-test/main/selectivity.result
@@ -2114,4 +2114,32 @@ a	b	c	d	e
 2	NULL	NULL	NULL	NULL
 set join_cache_level= default;
 DROP TABLE t1, t2, t3;
+#
+# MDEV-38240: Selectivity sampling not performed when the table has no indexed conditions
+#
+set use_stat_tables=PREFERABLY;
+create table t1 (a varchar(100), b int);
+insert into t1 select seq, seq from seq_1_to_1000;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	OK
+set optimizer_use_condition_selectivity=5;
+# Must produce filtered=1% or so:
+explain extended
+select * from t1 where a like '%99%';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	1.00	Using where
+Warnings:
+Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`a` like '%99%'
+# Must have same filtered as above
+explain extended
+select * from t1 where a like '%99%' and (b is null or b is not null);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	1.00	Using where
+Warnings:
+Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`a` like '%99%' and (`test`.`t1`.`b` is null or `test`.`t1`.`b` is not null)
+drop table t1;
+set optimizer_use_condition_selectivity= @save_optimizer_use_condition_selectivity;
+set use_stat_tables= @save_use_stat_tables;
 ALTER DATABASE test CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci;
diff --git a/mysql-test/main/selectivity.test b/mysql-test/main/selectivity.test
index 9853d7138d4..158976d6b43 100644
--- a/mysql-test/main/selectivity.test
+++ b/mysql-test/main/selectivity.test
@@ -1456,4 +1456,25 @@ SELECT * FROM t1 LEFT JOIN (t2 JOIN t3 ON t2.b = t3.e) ON t2.c = 1;
 set join_cache_level= default;
 DROP TABLE t1, t2, t3;
 
+--echo #
+--echo # MDEV-38240: Selectivity sampling not performed when the table has no indexed conditions
+--echo #
+set use_stat_tables=PREFERABLY;
+create table t1 (a varchar(100), b int);
+insert into t1 select seq, seq from seq_1_to_1000;
+analyze table t1;
+
+set optimizer_use_condition_selectivity=5;
+--echo # Must produce filtered=1% or so:
+explain extended
+select * from t1 where a like '%99%';
+
+--echo # Must have same filtered as above
+explain extended
+select * from t1 where a like '%99%' and (b is null or b is not null);
+drop table t1;
+
+set optimizer_use_condition_selectivity= @save_optimizer_use_condition_selectivity;
+set use_stat_tables= @save_use_stat_tables;
+
 --source include/test_db_charset_restore.inc
diff --git a/mysql-test/main/selectivity_innodb.result b/mysql-test/main/selectivity_innodb.result
index 9434c5a6446..638966341f1 100644
--- a/mysql-test/main/selectivity_innodb.result
+++ b/mysql-test/main/selectivity_innodb.result
@@ -2121,6 +2121,34 @@ a	b	c	d	e
 2	NULL	NULL	NULL	NULL
 set join_cache_level= default;
 DROP TABLE t1, t2, t3;
+#
+# MDEV-38240: Selectivity sampling not performed when the table has no indexed conditions
+#
+set use_stat_tables=PREFERABLY;
+create table t1 (a varchar(100), b int);
+insert into t1 select seq, seq from seq_1_to_1000;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	OK
+set optimizer_use_condition_selectivity=5;
+# Must produce filtered=1% or so:
+explain extended
+select * from t1 where a like '%99%';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	1.00	Using where
+Warnings:
+Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`a` like '%99%'
+# Must have same filtered as above
+explain extended
+select * from t1 where a like '%99%' and (b is null or b is not null);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	1.00	Using where
+Warnings:
+Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`a` like '%99%' and (`test`.`t1`.`b` is null or `test`.`t1`.`b` is not null)
+drop table t1;
+set optimizer_use_condition_selectivity= @save_optimizer_use_condition_selectivity;
+set use_stat_tables= @save_use_stat_tables;
 ALTER DATABASE test CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci;
 set optimizer_switch=@save_optimizer_switch_for_selectivity_test;
 set @tmp_ust= @@use_stat_tables;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 719a8b10cb0..1f31e9cc5c3 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -6220,15 +6220,21 @@ make_join_statistics(JOIN *join, List<TABLE_LIST> &tables_list,
                   s->table->opt_range_condition_rows /
                   s->table->used_stat_records);
       /*
-        Perform range analysis if there are keys it could use (1).
-        Don't do range analysis for materialized subqueries (2).
-        Don't do range analysis for materialized derived tables/views (3)
+        Perform range analysis if we could infer something from it.
+        (1) There are indexes for which we have range conditions,
+        (2) Or there are sargable conditions on the table's columns that we
+            could use for selectivity estimation,
+        (3) Or selectivity estimation via sampling is enabled.
+
+        (4) Don't do range analysis for materialized subqueries.
+        (5) Don't do range analysis for materialized derived tables/views.
       */
-      if ((!s->const_keys.is_clear_all() ||
-           !bitmap_is_clear_all(&s->table->cond_set)) &&              // (1)
-          !s->table->is_filled_at_execution() &&                      // (2)
-          !(s->table->pos_in_table_list->derived &&                   // (3)
-            s->table->pos_in_table_list->is_materialized_derived()))  // (3)
+      if ((!s->const_keys.is_clear_all() ||                            // (1)
+           !bitmap_is_clear_all(&s->table->cond_set) ||                // (2)
+           thd->variables.optimizer_use_condition_selectivity >= 5) && // (3)
+          !s->table->is_filled_at_execution() &&                       // (4)
+          !(s->table->pos_in_table_list->derived &&                    // (5)
+            s->table->pos_in_table_list->is_materialized_derived()))   // (5)
       {
         bool impossible_range= FALSE;
         ha_rows records= HA_ROWS_MAX;

From 4da80ba8413ec866e614a3e612e649fc13736825 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <sergey@mariadb.com>
Date: Wed, 3 Dec 2025 15:46:11 +0200
Subject: [PATCH 108/119] MDEV-38240: Selectivity sampling not performed when
 the table has no indexed conditions

Don't skip range analysis step in such cases.

(Backport to 11.4, cherry picked from 2ce3f0d76cb6ae0dc6df1f257f28a4b7b1a00244)
---
 mysql-test/main/selectivity.result        | 28 +++++++++++++++++++++++
 mysql-test/main/selectivity.test          | 22 +++++++++++++++++-
 mysql-test/main/selectivity_innodb.result | 28 +++++++++++++++++++++++
 sql/sql_select.cc                         | 22 +++++++++++-------
 4 files changed, 91 insertions(+), 9 deletions(-)

diff --git a/mysql-test/main/selectivity.result b/mysql-test/main/selectivity.result
index 923967766e5..ef2d2e85b86 100644
--- a/mysql-test/main/selectivity.result
+++ b/mysql-test/main/selectivity.result
@@ -2113,3 +2113,31 @@ a	b	c	d	e
 2	NULL	NULL	NULL	NULL
 set join_cache_level= default;
 DROP TABLE t1, t2, t3;
+#
+# MDEV-38240: Selectivity sampling not performed when the table has no indexed conditions
+#
+set use_stat_tables=PREFERABLY;
+create table t1 (a varchar(100), b int);
+insert into t1 select seq, seq from seq_1_to_1000;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	OK
+set optimizer_use_condition_selectivity=5;
+# Must produce filtered=1% or so:
+explain extended
+select * from t1 where a like '%99%';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	1.00	Using where
+Warnings:
+Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`a` like '%99%'
+# Must have same filtered as above
+explain extended
+select * from t1 where a like '%99%' and (b is null or b is not null);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	1.00	Using where
+Warnings:
+Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`a` like '%99%' and (`test`.`t1`.`b` is null or `test`.`t1`.`b` is not null)
+drop table t1;
+set optimizer_use_condition_selectivity= @save_optimizer_use_condition_selectivity;
+set use_stat_tables= @save_use_stat_tables;
diff --git a/mysql-test/main/selectivity.test b/mysql-test/main/selectivity.test
index 9c68dbe5061..7caa2503a33 100644
--- a/mysql-test/main/selectivity.test
+++ b/mysql-test/main/selectivity.test
@@ -1453,4 +1453,24 @@ explain SELECT * FROM t1 LEFT JOIN (t2 JOIN t3 ON t2.b = t3.e) ON t2.c = 1;
 SELECT * FROM t1 LEFT JOIN (t2 JOIN t3 ON t2.b = t3.e) ON t2.c = 1;
 
 set join_cache_level= default;
-DROP TABLE t1, t2, t3;
\ No newline at end of file
+DROP TABLE t1, t2, t3;
+--echo #
+--echo # MDEV-38240: Selectivity sampling not performed when the table has no indexed conditions
+--echo #
+set use_stat_tables=PREFERABLY;
+create table t1 (a varchar(100), b int);
+insert into t1 select seq, seq from seq_1_to_1000;
+analyze table t1;
+
+set optimizer_use_condition_selectivity=5;
+--echo # Must produce filtered=1% or so:
+explain extended
+select * from t1 where a like '%99%';
+
+--echo # Must have same filtered as above
+explain extended
+select * from t1 where a like '%99%' and (b is null or b is not null);
+drop table t1;
+
+set optimizer_use_condition_selectivity= @save_optimizer_use_condition_selectivity;
+set use_stat_tables= @save_use_stat_tables;
diff --git a/mysql-test/main/selectivity_innodb.result b/mysql-test/main/selectivity_innodb.result
index 5c3c88c9dd5..66bef413c3a 100644
--- a/mysql-test/main/selectivity_innodb.result
+++ b/mysql-test/main/selectivity_innodb.result
@@ -2120,6 +2120,34 @@ a	b	c	d	e
 2	NULL	NULL	NULL	NULL
 set join_cache_level= default;
 DROP TABLE t1, t2, t3;
+#
+# MDEV-38240: Selectivity sampling not performed when the table has no indexed conditions
+#
+set use_stat_tables=PREFERABLY;
+create table t1 (a varchar(100), b int);
+insert into t1 select seq, seq from seq_1_to_1000;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	OK
+set optimizer_use_condition_selectivity=5;
+# Must produce filtered=1% or so:
+explain extended
+select * from t1 where a like '%99%';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	1.00	Using where
+Warnings:
+Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`a` like '%99%'
+# Must have same filtered as above
+explain extended
+select * from t1 where a like '%99%' and (b is null or b is not null);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1000	1.00	Using where
+Warnings:
+Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where `test`.`t1`.`a` like '%99%' and (`test`.`t1`.`b` is null or `test`.`t1`.`b` is not null)
+drop table t1;
+set optimizer_use_condition_selectivity= @save_optimizer_use_condition_selectivity;
+set use_stat_tables= @save_use_stat_tables;
 set optimizer_switch=@save_optimizer_switch_for_selectivity_test;
 set @tmp_ust= @@use_stat_tables;
 set @tmp_oucs= @@optimizer_use_condition_selectivity;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 8e693ea1734..c8dc944817e 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -6227,15 +6227,21 @@ make_join_statistics(JOIN *join, List<TABLE_LIST> &tables_list,
                   s->table->opt_range_condition_rows /
                   s->table->used_stat_records);
       /*
-        Perform range analysis if there are keys it could use (1).
-        Don't do range analysis for materialized subqueries (2).
-        Don't do range analysis for materialized derived tables/views (3)
+        Perform range analysis if we could infer something from it.
+        (1) There are indexes for which we have range conditions,
+        (2) Or there are sargable conditions on the table's columns that we
+            could use for selectivity estimation,
+        (3) Or selectivity estimation via sampling is enabled.
+
+        (4) Don't do range analysis for materialized subqueries.
+        (5) Don't do range analysis for materialized derived tables/views.
       */
-      if ((!s->const_keys.is_clear_all() ||
-           !bitmap_is_clear_all(&s->table->cond_set)) &&              // (1)
-          !s->table->is_filled_at_execution() &&                      // (2)
-          !(s->table->pos_in_table_list->derived &&                   // (3)
-            s->table->pos_in_table_list->is_materialized_derived()))  // (3)
+      if ((!s->const_keys.is_clear_all() ||                            // (1)
+           !bitmap_is_clear_all(&s->table->cond_set) ||                // (2)
+           thd->variables.optimizer_use_condition_selectivity >= 5) && // (3)
+          !s->table->is_filled_at_execution() &&                       // (4)
+          !(s->table->pos_in_table_list->derived &&                    // (5)
+            s->table->pos_in_table_list->is_materialized_derived()))   // (5)
       {
         bool impossible_range= FALSE;
         ha_rows records= HA_ROWS_MAX;

From 224efb91b4fc6c0df59abe6516a4931e08096d16 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <sergey@mariadb.com>
Date: Sat, 27 Dec 2025 15:43:39 +0200
Subject: [PATCH 109/119] MDEV-38426: Clustered PK not used for Loose Index
 Scan optimization

Loose Index Scan optimization can only be used when the index it is
uses covers all columns used by the query. So, it would not be
attempted for indexes that are not present in table->covering_keys.

Before commit ed0a72356691 (pushed to 11.0), Clustered PK would be
present in table->covering_keys if primary key columns are covering.

However, that commit gave Clustered PKs special treatment: they are
no longer present in table->covering_keys. This caused Loose Scan not
to be considered for Clustered PKs.

Fixed this by making the check in get_best_group_min_max() to allow
Loose Scan if all fields used by the query are parts of the Clustered PK.

Also made changes:
- The logic in JOIN_TAB::save_explain_data() assumed that Loose Scan
  could only be used for index-only scans. This is not the case for
  clustered PKs.
- One query in group_min_max_innodb started to use Loose Scan. It did so
  in 10.11, too.
---
 mysql-test/main/group_min_max_innodb.result | 39 ++++++++++++++++++++-
 mysql-test/main/group_min_max_innodb.test   | 34 ++++++++++++++++++
 sql/opt_range.cc                            | 35 +++++++++++++++++-
 sql/sql_select.cc                           | 23 +++++++-----
 4 files changed, 120 insertions(+), 11 deletions(-)

diff --git a/mysql-test/main/group_min_max_innodb.result b/mysql-test/main/group_min_max_innodb.result
index c14fed88666..44905a80811 100644
--- a/mysql-test/main/group_min_max_innodb.result
+++ b/mysql-test/main/group_min_max_innodb.result
@@ -180,7 +180,7 @@ F	17
 EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
 GROUP BY c1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	k1	k1	5	NULL	2	Using where
+1	SIMPLE	t1	range	k1	k1	5	NULL	2	Using where; Using index for group-by
 SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
 GROUP BY c1;
 c1	max(i2)
@@ -438,6 +438,43 @@ disconnect con1;
 connection default;
 DROP TABLE t1;
 SET GLOBAL innodb_lru_scan_depth= @lru_depth.save;
+#
+# MDEV-38426: Clustered PK not used for Loose Index Scan optimization
+#
+create table t1 (
+col1 int not null,
+col2 int not null,
+col3 int,
+primary key(col1, col2)
+) engine=innodb;
+insert into t1 select
+A.seq,
+B.seq,
+A.seq
+from
+seq_1_to_10 A,
+seq_1_to_1000 B;
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	OK
+# This must use Loose Scan:
+explain select distinct col1 from t1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	NULL	PRIMARY	4	NULL	11	Using index for group-by
+# This must use Loose Scan:
+explain select col1 from t1 group by col1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	NULL	PRIMARY	4	NULL	11	Using index for group-by
+# This must use Loose Scan:
+explain select col1, min(col2) from t1 group by col1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	NULL	PRIMARY	4	NULL	11	Using index for group-by
+# This will not use Loose Index Scan as col3 is not in PK:
+explain select col1, min(col2), col3 from t1 group by col1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	index	NULL	PRIMARY	8	NULL	10000	
+drop table t1;
 set global innodb_stats_persistent= @innodb_stats_persistent_save;
 set global innodb_stats_persistent_sample_pages=
 @innodb_stats_persistent_sample_pages_save;
diff --git a/mysql-test/main/group_min_max_innodb.test b/mysql-test/main/group_min_max_innodb.test
index 419c53dbd18..6d2389d22c8 100644
--- a/mysql-test/main/group_min_max_innodb.test
+++ b/mysql-test/main/group_min_max_innodb.test
@@ -323,6 +323,40 @@ while ($run)
 DROP TABLE t1;
 SET GLOBAL innodb_lru_scan_depth= @lru_depth.save;
 
+--echo #
+--echo # MDEV-38426: Clustered PK not used for Loose Index Scan optimization
+--echo #
+--source include/have_sequence.inc
+
+create table t1 (
+  col1 int not null,
+  col2 int not null,
+  col3 int,
+  primary key(col1, col2)
+) engine=innodb;
+insert into t1 select
+  A.seq,
+  B.seq,
+  A.seq
+from
+  seq_1_to_10 A,
+  seq_1_to_1000 B;
+analyze table t1;
+
+--echo # This must use Loose Scan:
+explain select distinct col1 from t1;
+
+--echo # This must use Loose Scan:
+explain select col1 from t1 group by col1;
+
+--echo # This must use Loose Scan:
+explain select col1, min(col2) from t1 group by col1;
+
+--echo # This will not use Loose Index Scan as col3 is not in PK:
+explain select col1, min(col2), col3 from t1 group by col1;
+
+drop table t1;
+
 set global innodb_stats_persistent= @innodb_stats_persistent_save;
 set global innodb_stats_persistent_sample_pages=
              @innodb_stats_persistent_sample_pages_save;
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index fa58bc13c04..15035f94e4d 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -14091,6 +14091,38 @@ cost_group_min_max(TABLE* table, KEY *index_info, uint used_key_parts,
                    double *read_cost, ha_rows *records);
 
 
+/*
+  @brief
+    Check if index keynr is clustered and the query only uses its explicitly
+    defined parts.
+
+  @detail
+    Clustered PK indexes are not present in table->covering_keys (one can say
+    a clustered index is always covering as it has all table's fields in it).
+    This function checks if the set of columns in the index definition
+    PRIMARY KEY(col1, ... colN) is covering for the quey.
+*/
+
+static bool index_is_clustered_covering(const TABLE *table, uint keynr)
+{
+  if (!table->file->is_clustering_key(keynr))
+    return false;
+
+  /*
+    Check that all fields used by the query are explicitly present
+    in the index.
+  */
+  for (uint i= bitmap_get_first_set(table->read_set);
+       i != MY_BIT_NONE;
+       i= bitmap_get_next_set(table->read_set, i))
+  {
+    if (!table->field[i]->part_of_key.is_set(keynr))
+      return false;
+  }
+  return true;
+}
+
+
 /**
   Test if this access method is applicable to a GROUP query with MIN/MAX
   functions, and if so, construct a new TRP object.
@@ -14446,7 +14478,8 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree, double read_time)
       (was also: "Exclude UNIQUE indexes ..." but this was removed because 
       there are cases Loose Scan over a multi-part index is useful).
     */
-    if (!table->covering_keys.is_set(cur_index) ||
+    if ((!table->covering_keys.is_set(cur_index) &&
+         !index_is_clustered_covering(table, cur_index)) ||
         !table->keys_in_use_for_group_by.is_set(cur_index))
     {
       cause= "not covering";
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index c8dc944817e..470414f1c6f 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -31089,16 +31089,21 @@ bool JOIN_TAB::save_explain_data(Explain_table_access *eta,
       else
         eta->push_extra(ET_SCANNED_ALL_DATABASES);
     }
-    if (key_read)
+
+    if (quick_type == QUICK_SELECT_I::QS_TYPE_GROUP_MIN_MAX)
     {
-      if (quick_type == QUICK_SELECT_I::QS_TYPE_GROUP_MIN_MAX)
-      {
-        QUICK_GROUP_MIN_MAX_SELECT *qgs= 
-          (QUICK_GROUP_MIN_MAX_SELECT *) tab_select->quick;
-        eta->push_extra(ET_USING_INDEX_FOR_GROUP_BY);
-        eta->loose_scan_is_scanning= qgs->loose_scan_is_scanning();
-      }
-      else
+      QUICK_GROUP_MIN_MAX_SELECT *qgs=
+        (QUICK_GROUP_MIN_MAX_SELECT *) tab_select->quick;
+      eta->push_extra(ET_USING_INDEX_FOR_GROUP_BY);
+      eta->loose_scan_is_scanning= qgs->loose_scan_is_scanning();
+    }
+    else
+    {
+      /*
+        Print "Using index" if we haven't already printed "Using index for
+        group by".
+      */
+      if (key_read)
         eta->push_extra(ET_USING_INDEX);
     }
     if (table->reginfo.not_exists_optimize)

From c7313daf8c32c3ab8fe180aa0e813fde6f208692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Fri, 2 Jan 2026 09:25:46 +0200
Subject: [PATCH 110/119] MDEV-38419: Fix some clang-21 -fsanitize=memory
 failures

fil_space_t::free_page(): Turn a parameter into a template parameter,
and remove some duplicated code. This fixes an error that was flagged
by clang++-21 -fsanitize=memory in buf_page_create().

fseg_create(): Merge the parameter reserved_extent to n_reserved.
This fixes an error about n_reserved being uninitialized.

fseg_alloc_free_page_low(): Simplify a debug assertion.

flst_add_last(), flst_remove(): Reduce the scope of a conditionally
initialized variable.

Reviewed by: Thirunarayanan Balathandayuthapani
---
 storage/innobase/buf/buf0buf.cc    |  2 +-
 storage/innobase/fsp/fsp0fsp.cc    | 14 ++++++------
 storage/innobase/fut/fut0lst.cc    | 36 ++++++++++++++++++------------
 storage/innobase/include/fil0fil.h | 17 ++++++--------
 storage/innobase/log/log0recv.cc   |  6 +++--
 5 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
index c053970b090..67bac28ce3f 100644
--- a/storage/innobase/buf/buf0buf.cc
+++ b/storage/innobase/buf/buf0buf.cc
@@ -3474,7 +3474,7 @@ buf_block_t*
 buf_page_create(fil_space_t *space, uint32_t offset,
                 ulint zip_size, mtr_t *mtr, buf_block_t *free_block) noexcept
 {
-  space->free_page(offset, false);
+  space->free_page<false>(offset);
   return buf_page_create_low({space->id, offset}, zip_size, mtr, free_block);
 }
 
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc
index 40bfca1388c..a36143c3bcc 100644
--- a/storage/innobase/fsp/fsp0fsp.cc
+++ b/storage/innobase/fsp/fsp0fsp.cc
@@ -1683,8 +1683,7 @@ fseg_create(fil_space_t *space, ulint byte_offset, mtr_t *mtr, dberr_t *err,
 {
 	fseg_inode_t*	inode;
 	ib_id_t		seg_id;
-	uint32_t	n_reserved;
-	bool		reserved_extent = false;
+	uint32_t	n_reserved = 0;
 
 	DBUG_ENTER("fseg_create");
 
@@ -1712,16 +1711,16 @@ inode_alloc:
 	if (!inode) {
 		block = nullptr;
 reserve_extent:
-		if (!has_done_reservation && !reserved_extent) {
+		if (!has_done_reservation && !n_reserved) {
 			*err = fsp_reserve_free_extents(&n_reserved, space, 2,
 							FSP_NORMAL, mtr);
 			if (UNIV_UNLIKELY(*err != DB_SUCCESS)) {
 				DBUG_RETURN(nullptr);
 			}
 
+			ut_ad(n_reserved > 0);
 			/* Extents reserved successfully. So
 			try allocating the page or inode */
-			reserved_extent = true;
 			if (inode) {
 				goto page_alloc;
 			}
@@ -1791,7 +1790,8 @@ page_alloc:
 				       + block->page.frame, space->id);
 
 funct_exit:
-	if (!has_done_reservation && reserved_extent) {
+	if (n_reserved) {
+		ut_ad(!has_done_reservation);
 		space->release_free_extents(n_reserved);
 	}
 
@@ -2173,8 +2173,6 @@ take_hinted_page:
 		buf_block_t* block = fsp_alloc_free_page(
 			space, hint, mtr, init_mtr, err);
 
-		ut_ad(block || !has_done_reservation || *err);
-
 		if (block) {
 			/* Put the page in the fragment page array of the
 			segment */
@@ -2187,6 +2185,8 @@ take_hinted_page:
 			fseg_set_nth_frag_page_no(
 				seg_inode, iblock, n,
 				block->page.id().page_no(), mtr);
+		} else {
+			ut_ad(*err != DB_SUCCESS);
 		}
 
 		/* fsp_alloc_free_page() invoked fsp_init_file_page()
diff --git a/storage/innobase/fut/fut0lst.cc b/storage/innobase/fut/fut0lst.cc
index 8fe21e74b73..c421d070b66 100644
--- a/storage/innobase/fut/fut0lst.cc
+++ b/storage/innobase/fut/fut0lst.cc
@@ -281,12 +281,15 @@ dberr_t flst_add_last(buf_block_t *base, uint16_t boffset,
       return DB_CORRUPTION;
 
     buf_block_t *cur= add;
-    dberr_t err;
-    if (addr.page != add->page.id().page_no() &&
-        !(cur= buf_page_get_gen(page_id_t{add->page.id().space(), addr.page},
-                                add->zip_size(), RW_SX_LATCH, nullptr,
-                                BUF_GET_POSSIBLY_FREED, mtr, &err)))
-      return err;
+    if (addr.page != add->page.id().page_no())
+    {
+      dberr_t err;
+      cur= buf_page_get_gen(page_id_t{add->page.id().space(), addr.page},
+                            add->zip_size(), RW_SX_LATCH, nullptr,
+                            BUF_GET_POSSIBLY_FREED, mtr, &err);
+      if (!cur)
+        return err;
+    }
     return flst_insert_after(base, boffset, cur, addr.boffset,
                              add, aoffset, limit, mtr);
   }
@@ -382,16 +385,21 @@ dberr_t flst_remove(buf_block_t *base, uint16_t boffset,
                     prev_addr.page, prev_addr.boffset, mtr);
   else
   {
-    dberr_t err2;
-    if (next_addr.page == cur->page.id().page_no() ||
-        (cur= buf_page_get_gen(page_id_t(cur->page.id().space(),
-                                         next_addr.page),
-                               cur->zip_size(), RW_SX_LATCH, nullptr,
-                               BUF_GET_POSSIBLY_FREED, mtr, &err2)))
+    if (next_addr.page == cur->page.id().page_no())
+    write_addr:
       flst_write_addr(*cur, cur->page.frame + next_addr.boffset + FLST_PREV,
                       prev_addr.page, prev_addr.boffset, mtr);
-    else if (err == DB_SUCCESS)
-      err= err2;
+    else
+    {
+      dberr_t err2;
+      cur= buf_page_get_gen(page_id_t(cur->page.id().space(), next_addr.page),
+                            cur->zip_size(), RW_SX_LATCH, nullptr,
+                            BUF_GET_POSSIBLY_FREED, mtr, &err2);
+      if (cur)
+        goto write_addr;
+      if (err == DB_SUCCESS)
+        err= err2;
+    }
   }
 
   byte *len= &base->page.frame[boffset + FLST_LEN];
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index e757231a64e..8c957e64cbb 100644
--- a/storage/innobase/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
@@ -995,19 +995,16 @@ public:
   @retval nullptr if the tablespace is missing or inaccessible */
   static fil_space_t *get_for_write(ulint id) noexcept;
 
-  /** Add/remove the free page in the freed ranges list.
-  @param[in] offset     page number to be added
-  @param[in] free       true if page to be freed */
-  void free_page(uint32_t offset, bool add=true)
+  /** Add/remove a page in freed_ranges.
+  @tparam add   true=add, false=remove
+  @param offset page number */
+  template<bool add=true> void free_page(uint32_t offset) noexcept
   {
     std::lock_guard<std::mutex> freed_lock(freed_range_mutex);
     if (add)
-      return freed_ranges.add_value(offset);
-
-    if (freed_ranges.empty())
-      return;
-
-    return freed_ranges.remove_value(offset);
+      freed_ranges.add_value(offset);
+    else
+      freed_ranges.remove_value(offset);
   }
 
   /** Add the range of freed pages */
diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
index 52a5a0a457c..effb3ced673 100644
--- a/storage/innobase/log/log0recv.cc
+++ b/storage/innobase/log/log0recv.cc
@@ -2358,8 +2358,10 @@ static void store_freed_or_init_rec(page_id_t page_id, bool freed)
       space= fil_system.sys_space;
     else
       space= fil_space_get(space_id);
-
-    space->free_page(page_no, freed);
+    if (freed)
+      space->free_page<true>(page_no);
+    else
+      space->free_page<false>(page_no);
     return;
   }
 

From 37dce6b547decb7f21c80b00c8552ddb3f900b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Fri, 2 Jan 2026 10:25:13 +0200
Subject: [PATCH 111/119] MDEV-38463: subtraction of unsigned offset ...
 overflowed

row_log_table_apply_ops(), row_log_apply_ops(): When switching
buffers, do not subtract addresses of unrelated buffers, but
simply set mrec_end relative to mrec. This makes the code more
readable and will avoid a runtime error from clang -fsanitize=undefined
depending on what kind of addresses are being returned by
row_log_block_allocate().
---
 storage/innobase/row/row0log.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/storage/innobase/row/row0log.cc b/storage/innobase/row/row0log.cc
index daa2036ee39..4598a62c9af 100644
--- a/storage/innobase/row/row0log.cc
+++ b/storage/innobase/row/row0log.cc
@@ -2806,10 +2806,10 @@ process_next_block:
 			ut_ad(0);
 			goto unexpected_eof;
 		} else {
-			memcpy(index->online_log->head.buf, mrec,
-			       ulint(mrec_end - mrec));
-			mrec_end -= ulint(mrec - index->online_log->head.buf);
+			const size_t s = size_t(mrec_end - mrec);
+			memcpy(index->online_log->head.buf, mrec, s);
 			mrec = index->online_log->head.buf;
+			mrec_end = mrec + s;
 			goto process_next_block;
 		}
 	}
@@ -3698,10 +3698,10 @@ process_next_block:
 			ut_ad(0);
 			goto unexpected_eof;
 		} else {
-			memcpy(index->online_log->head.buf, mrec,
-			       ulint(mrec_end - mrec));
-			mrec_end -= ulint(mrec - index->online_log->head.buf);
+			const size_t s = size_t(mrec_end - mrec);
+			memcpy(index->online_log->head.buf, mrec, s);
 			mrec = index->online_log->head.buf;
+			mrec_end = mrec + s;
 			goto process_next_block;
 		}
 	}

From 3b2169f0d1e116bf3f648b7f961bb5b5bde9133c Mon Sep 17 00:00:00 2001
From: Kristian Nielsen <knielsen@knielsen-hq.org>
Date: Thu, 1 Jan 2026 13:10:39 +0100
Subject: [PATCH 112/119] MDEV-37862: innodb.gap_locks test failure: 0 lock
 structs, 0 row locks

The test fails sporadically due to an insufficient --replace_regex.
The output of SHOW ENGINE INNODB STATUS can have some "not started"
transactions in additional to the "ACTIVE" transaction the test wants to
display, and the --replace_regex would wrongly pick one of the "not started"
transactions to show if it occured after the "ACTIVE" one in the output.

Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
---
 mysql-test/suite/innodb/t/gap_locks.test | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/mysql-test/suite/innodb/t/gap_locks.test b/mysql-test/suite/innodb/t/gap_locks.test
index 77ce2c842b1..e0af735ef67 100644
--- a/mysql-test/suite/innodb/t/gap_locks.test
+++ b/mysql-test/suite/innodb/t/gap_locks.test
@@ -18,7 +18,23 @@ ELSE 'SERIALIZABLE' END`;
 eval SET TRANSACTION ISOLATION LEVEL $tx_isolation;
 BEGIN;
 DELETE FROM t1 WHERE b='2' AND c=2;
---replace_regex /.*(\d+ lock struct...), heap size \d+(, \d+ row lock...).*/\1\2/
+# The SHOW ENGINE INNODB STATUS looks like this:
+#
+# ...
+# +LIST OF TRANSACTIONS FOR EACH SESSION:
+# +---TRANSACTION (0x7f1e08168300), not started
+# +0 lock struct(s), heap size 1144, 0 row lock(s)
+# +---TRANSACTION (0x7f1e08167780), not started
+# +0 lock struct(s), heap size 1144, 0 row lock(s)
+# +---TRANSACTION 25, ACTIVE 0 sec
+# +2 lock struct(s), heap size 1144, 1 row lock(s)
+# ...
+#
+# We want the lock struct(s) and row lock(s) of the ACTIVE transaction, but
+# not of any inactive ones. Note the use of non-greedy match ".*?", so that
+# we get the values for the ACTIVE transaction, not the last values in the
+# list.
+--replace_regex /.*---TRANSACTION \d+, ACTIVE.*?(\d+ lock struct...), heap size \d+(, \d+ row lock...).*/\1\2/
 SHOW ENGINE INNODB STATUS;
 ROLLBACK;
 

From b64db51ad89d78e6a6f8bc238dd2e208b5f7aa92 Mon Sep 17 00:00:00 2001
From: Kristian Nielsen <knielsen@knielsen-hq.org>
Date: Fri, 2 Jan 2026 11:37:37 +0100
Subject: [PATCH 113/119] Fix leaving system table as InnoDB engine

Fix the test case main.servers to restore the table mysql.servers back to Aria
engine, not leave it changed to InnoDB. This was causing the test case
innodb.innodb_stats to fail sporadically if it was run after main.servers.

Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
---
 mysql-test/main/servers.result | 1 +
 mysql-test/main/servers.test   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/mysql-test/main/servers.result b/mysql-test/main/servers.result
index a02c3d6ac74..2e3697b6a2c 100644
--- a/mysql-test/main/servers.result
+++ b/mysql-test/main/servers.result
@@ -50,3 +50,4 @@ CREATE SERVER s1 FOREIGN DATA WRAPPER mysql OPTIONS (HOST '127.0.0.1');
 ALTER TABLE mysql.servers ENGINE=innodb;
 FLUSH PRIVILEGES;
 drop server s1;
+ALTER TABLE mysql.servers ENGINE=Aria;
diff --git a/mysql-test/main/servers.test b/mysql-test/main/servers.test
index f46041bb21c..f83a28ff33a 100644
--- a/mysql-test/main/servers.test
+++ b/mysql-test/main/servers.test
@@ -50,3 +50,5 @@ CREATE SERVER s1 FOREIGN DATA WRAPPER mysql OPTIONS (HOST '127.0.0.1');
 ALTER TABLE mysql.servers ENGINE=innodb;
 FLUSH PRIVILEGES;
 drop server s1;
+# Restore the table back to original engine, to not disrupt following tests.
+ALTER TABLE mysql.servers ENGINE=Aria;

From 037a0aa96f7ac0389b4e78fa3b482a08d83dce2a Mon Sep 17 00:00:00 2001
From: Sergey Vojtovich <svojtovich@gmail.com>
Date: Tue, 25 Nov 2025 00:07:07 +0400
Subject: [PATCH 114/119] MDEV-38182 - main.xa fails sporadically

Test was affected by incompletely closed preceding connections
such that count_sessions.inc records value larger than 1 (for
the default connection). This causes subsequent
wait_until_count_sessions.inc not to wait for connections it was
supposed to wait for.

Replaced count_sessions.inc with hardcoded 1.
---
 mysql-test/main/xa.test | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mysql-test/main/xa.test b/mysql-test/main/xa.test
index 104509b6cc6..289f8e7d47c 100644
--- a/mysql-test/main/xa.test
+++ b/mysql-test/main/xa.test
@@ -5,7 +5,7 @@
 --source include/not_embedded.inc
 
 # Save the initial number of concurrent sessions
---source include/count_sessions.inc
+let $count_sessions=1;
 
 call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
 --disable_query_log
@@ -694,7 +694,6 @@ xa rollback 'test1';
 xa recover;
 drop table asd;
 disconnect con_tmp;
---source include/wait_until_disconnected.inc
 connection default;
 
 --echo # MDEV-30978: a read-only server should still allow the commit of
@@ -718,7 +717,6 @@ xa rollback '2';
 
 --echo # Read-only disconnect case
 
---source include/count_sessions.inc
 connect (con1_ro,localhost,root,,);
 xa start '3';
 select 0;
@@ -732,7 +730,6 @@ xa recover;
 --error ER_XA_RBROLLBACK
 xa commit '3';
 
---source include/count_sessions.inc
 connect (con2_ro,localhost,root,,);
 xa start '4';
 select 0;
@@ -781,6 +778,7 @@ xa end 'r:foo';
 xa prepare 'r:foo';
 disconnect con1;
 connection default;
+--source include/wait_until_count_sessions.inc
 xa recover;
 
 xa start 'r:bar';

From faf1a76516626fb3393cb6501f319bc146f44d97 Mon Sep 17 00:00:00 2001
From: Sergey Vojtovich <svojtovich@gmail.com>
Date: Sat, 27 Dec 2025 23:57:32 +0400
Subject: [PATCH 115/119] MDEV-38437 - main.ssl fails sporadically

Test was affected by incompletely closed preceding connections.

Make test agnostic to concurrent connections by querying
performance_schema.status_by_thread only for connections that it
uses.
---
 mysql-test/main/ssl.result | 2 +-
 mysql-test/main/ssl.test   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mysql-test/main/ssl.result b/mysql-test/main/ssl.result
index c402f02b859..c1d2ee54c0f 100644
--- a/mysql-test/main/ssl.result
+++ b/mysql-test/main/ssl.result
@@ -1,5 +1,5 @@
 connect  ssl_con,localhost,root,,,,,SSL;
-select variable_name from performance_schema.status_by_thread where VARIABLE_NAME LIKE 'Ssl%';
+select variable_name from performance_schema.status_by_thread where VARIABLE_NAME LIKE 'Ssl%' and thread_id in($default_id, $ssl_con_id);
 variable_name
 Ssl_cipher
 Ssl_cipher_list
diff --git a/mysql-test/main/ssl.test b/mysql-test/main/ssl.test
index 53d93ff1593..83bae7bde04 100644
--- a/mysql-test/main/ssl.test
+++ b/mysql-test/main/ssl.test
@@ -12,9 +12,12 @@
 --source include/default_charset.inc
 --source include/have_perfschema.inc
 
+let $default_id=`select thread_id from performance_schema.threads where processlist_id=connection_id()`;
+
 connect (ssl_con,localhost,root,,,,,SSL);
 
-select variable_name from performance_schema.status_by_thread where VARIABLE_NAME LIKE 'Ssl%';
+let $ssl_con_id=`select thread_id from performance_schema.threads where processlist_id=connection_id()`;
+evalp select variable_name from performance_schema.status_by_thread where VARIABLE_NAME LIKE 'Ssl%' and thread_id in($default_id, $ssl_con_id);
 
 # Check ssl turned on
 SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';

From afbad3b02bdcb0ed98789311632c7f87268322ed Mon Sep 17 00:00:00 2001
From: Dearsh Oberoi <oberoidearsh@gmail.com>
Date: Wed, 3 Dec 2025 07:45:49 +0530
Subject: [PATCH 116/119] MDEV-38194 Correct classification of
 MASTER_SSL_VERIFY_SERVER_CERT

This patch removes MASTER_SSL_VERIFY_SERVER_CERT from the list
reserved_keyword_udt_not_param_type and adds it to
keyword_func_sp_var_and_label in the parser. All other MASTER_SSL_* keywords
are in this list.

This allows MASTER_SSL_VERIFY_SERVER_CERT to be used unquoted when directly
accessed via INFORMATION_SCHEMA.slave_status, as well as opens it up to be
used as names in other places, e.g. stored procedures.

Reviewed-by: Brandon Nesterenko <brandon.nesterenko@mariadb.com>
---
 mysql-test/suite/funcs_1/r/storedproc.result  | 36 ---------
 mysql-test/suite/funcs_1/t/storedproc.test    | 41 ----------
 .../suite/rpl/r/rpl_is_slave_status.result    | 41 ++++++++++
 .../suite/rpl/t/rpl_is_slave_status.test      | 79 +++++++++++++++++++
 sql/sql_yacc.yy                               |  2 +-
 5 files changed, 121 insertions(+), 78 deletions(-)
 create mode 100644 mysql-test/suite/rpl/r/rpl_is_slave_status.result
 create mode 100644 mysql-test/suite/rpl/t/rpl_is_slave_status.test

diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result
index 9afadb4b326..8671d408a66 100644
--- a/mysql-test/suite/funcs_1/r/storedproc.result
+++ b/mysql-test/suite/funcs_1/r/storedproc.result
@@ -2434,10 +2434,6 @@ CREATE PROCEDURE low_priority()
 SELECT * from t1 where f2=f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'low_priority()
 SELECT * from t1 where f2=f1' at line 1
-CREATE PROCEDURE master_ssl_verify_server_cert()
-SELECT * from t1 where f2=f1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'master_ssl_verify_server_cert()
-SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE match()
 SELECT * from t1 where f2=f1;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match()
@@ -4918,13 +4914,6 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
-master_ssl_verify_server_cert:BEGIN
-SELECT @x;
-END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'master_ssl_verify_server_cert:BEGIN
-SELECT @x;
-END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 match:BEGIN
@@ -8454,12 +8443,6 @@ END//
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'low_priority char;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
-CREATE PROCEDURE sp1()
-BEGIN
-declare master_ssl_verify_server_cert char;
-END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'master_ssl_verify_server_cert char;
-END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -10620,16 +10603,6 @@ Warnings:
 Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare master_ssl_verify_server_cert condition for sqlstate '02000';
-declare exit handler for int set @var2 = 1;
-END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'master_ssl_verify_server_cert condition for sqlstate '02000';
-declare exit ha...' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE db_storedproc.sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare match condition for sqlstate '02000';
 declare exit handler for match set @var2 = 1;
 END//
@@ -12818,15 +12791,6 @@ Warnings:
 Note	1305	PROCEDURE db_storedproc.sp1 does not exist
 CREATE PROCEDURE sp1( )
 BEGIN
-declare master_ssl_verify_server_cert handler for sqlstate '02000' set @var2 = 1;
-END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'master_ssl_verify_server_cert handler for sqlstate '02000' set @var2 = 1;
-END' at line 3
-DROP PROCEDURE IF EXISTS sp1;
-Warnings:
-Note	1305	PROCEDURE db_storedproc.sp1 does not exist
-CREATE PROCEDURE sp1( )
-BEGIN
 declare match handler for sqlstate '02000' set @var2 = 1;
 END//
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'match handler for sqlstate '02000' set @var2 = 1;
diff --git a/mysql-test/suite/funcs_1/t/storedproc.test b/mysql-test/suite/funcs_1/t/storedproc.test
index 621a4cc7f75..90d6bb5373f 100644
--- a/mysql-test/suite/funcs_1/t/storedproc.test
+++ b/mysql-test/suite/funcs_1/t/storedproc.test
@@ -1454,10 +1454,6 @@ CREATE PROCEDURE loop()
 CREATE PROCEDURE low_priority()
    SELECT * from t1 where f2=f1;
 
---error ER_PARSE_ERROR
-CREATE PROCEDURE master_ssl_verify_server_cert()
-   SELECT * from t1 where f2=f1;
-
 --error ER_PARSE_ERROR
 CREATE PROCEDURE match()
    SELECT * from t1 where f2=f1;
@@ -4555,14 +4551,6 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
-delimiter //;
---error ER_PARSE_ERROR
-CREATE PROCEDURE sp1()
-  master_ssl_verify_server_cert:BEGIN
-    SELECT @x;
-END//
-delimiter ;//
-
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
@@ -10051,14 +10039,6 @@ delimiter ;//
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
 
-delimiter //;
---error ER_PARSE_ERROR
-CREATE PROCEDURE sp1()
-BEGIN
-    declare master_ssl_verify_server_cert char;
-END//
-delimiter ;//
-
 --disable_warnings
 DROP PROCEDURE IF EXISTS sp1;
 --enable_warnings
@@ -12692,17 +12672,6 @@ delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
-delimiter //;
---error ER_PARSE_ERROR
-CREATE PROCEDURE sp1( )
-BEGIN
-    declare master_ssl_verify_server_cert condition for sqlstate '02000';
-    declare exit handler for int set @var2 = 1;
-END//
-delimiter ;//
-
-DROP PROCEDURE IF EXISTS sp1;
-
 delimiter //;
 --error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
@@ -15204,16 +15173,6 @@ delimiter ;//
 
 DROP PROCEDURE IF EXISTS sp1;
 
-delimiter //;
---error ER_PARSE_ERROR
-CREATE PROCEDURE sp1( )
-BEGIN
-    declare master_ssl_verify_server_cert handler for sqlstate '02000' set @var2 = 1;
-END//
-delimiter ;//
-
-DROP PROCEDURE IF EXISTS sp1;
-
 delimiter //;
 --error ER_PARSE_ERROR
 CREATE PROCEDURE sp1( )
diff --git a/mysql-test/suite/rpl/r/rpl_is_slave_status.result b/mysql-test/suite/rpl/r/rpl_is_slave_status.result
new file mode 100644
index 00000000000..9e498698117
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_is_slave_status.result
@@ -0,0 +1,41 @@
+SELECT Master_SSL_Verify_Server_Cert FROM information_schema.slave_status LIMIT 1;
+Master_SSL_Verify_Server_Cert
+SELECT `Master_SSL_Verify_Server_Cert` FROM information_schema.slave_status LIMIT 1;
+Master_SSL_Verify_Server_Cert
+CREATE DATABASE db_is_slave_status;
+USE db_is_slave_status;
+CREATE TABLE t1 (
+Master_SSL_Verify_Server_Cert INT
+);
+INSERT INTO t1 VALUES (123);
+SELECT Master_SSL_Verify_Server_Cert FROM t1;
+Master_SSL_Verify_Server_Cert
+123
+DROP TABLE t1;
+CREATE PROCEDURE master_ssl_verify_server_cert()
+BEGIN
+SELECT 1;
+END//
+DROP PROCEDURE IF EXISTS master_ssl_verify_server_cert;
+CREATE FUNCTION master_ssl_verify_server_cert()
+RETURNS INT
+RETURN 1;
+DROP FUNCTION IF EXISTS master_ssl_verify_server_cert;
+CREATE PROCEDURE sp()
+master_ssl_verify_server_cert:BEGIN
+SELECT 1;
+END//
+DROP PROCEDURE IF EXISTS sp;
+CREATE PROCEDURE sp()
+BEGIN
+DECLARE master_ssl_verify_server_cert CHAR;
+END//
+DROP PROCEDURE IF EXISTS sp;
+CREATE PROCEDURE sp()
+BEGIN
+DECLARE master_ssl_verify_server_cert CONDITION FOR SQLSTATE '02000';
+DECLARE EXIT HANDLER FOR master_ssl_verify_server_cert SET @var2 = 1;
+END//
+DROP PROCEDURE IF EXISTS sp;
+DROP DATABASE IF EXISTS db_is_slave_status;
+# End of rpl_is_slave_status.test
diff --git a/mysql-test/suite/rpl/t/rpl_is_slave_status.test b/mysql-test/suite/rpl/t/rpl_is_slave_status.test
new file mode 100644
index 00000000000..482e6bc3912
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_is_slave_status.test
@@ -0,0 +1,79 @@
+#
+# Test for MDEV-38194: Master_SSL_Verify_Server_Cert should not require identifier quoting
+#
+
+--source include/not_embedded.inc
+
+# Select the column unquoted
+SELECT Master_SSL_Verify_Server_Cert FROM information_schema.slave_status LIMIT 1;
+
+# Select the column quoted
+SELECT `Master_SSL_Verify_Server_Cert` FROM information_schema.slave_status LIMIT 1;
+
+
+# Verify that stored procedures, variables, labels, and functions using the name
+# Master_SSL_Verify_Server_Cert can be successfully created
+
+CREATE DATABASE db_is_slave_status;
+
+USE db_is_slave_status;
+
+CREATE TABLE t1 (
+  Master_SSL_Verify_Server_Cert INT
+);
+INSERT INTO t1 VALUES (123);
+SELECT Master_SSL_Verify_Server_Cert FROM t1;
+DROP TABLE t1;
+
+
+DELIMITER //;
+CREATE PROCEDURE master_ssl_verify_server_cert()
+BEGIN
+  SELECT 1;
+END//
+DELIMITER ;//
+
+DROP PROCEDURE IF EXISTS master_ssl_verify_server_cert;
+
+--disable_warnings
+CREATE FUNCTION master_ssl_verify_server_cert()
+RETURNS INT
+RETURN 1;
+--enable_warnings
+
+DROP FUNCTION IF EXISTS master_ssl_verify_server_cert;
+
+
+DELIMITER //;
+CREATE PROCEDURE sp()
+  master_ssl_verify_server_cert:BEGIN
+    SELECT 1;
+END//
+DELIMITER ;//
+
+DROP PROCEDURE IF EXISTS sp;
+
+
+DELIMITER //;
+CREATE PROCEDURE sp()
+BEGIN
+    DECLARE master_ssl_verify_server_cert CHAR;
+END//
+DELIMITER ;//
+
+DROP PROCEDURE IF EXISTS sp;
+
+
+DELIMITER //;
+CREATE PROCEDURE sp()
+BEGIN
+    DECLARE master_ssl_verify_server_cert CONDITION FOR SQLSTATE '02000';
+    DECLARE EXIT HANDLER FOR master_ssl_verify_server_cert SET @var2 = 1;
+END//
+DELIMITER ;//
+
+DROP PROCEDURE IF EXISTS sp;
+
+DROP DATABASE IF EXISTS db_is_slave_status;
+
+--echo # End of rpl_is_slave_status.test
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 9c440234bf6..e355f76e043 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -16538,6 +16538,7 @@ keyword_func_sp_var_and_label:
         | MASTER_SSL_CRL_SYM
         | MASTER_SSL_CRLPATH_SYM
         | MASTER_SSL_KEY_SYM
+        | MASTER_SSL_VERIFY_SERVER_CERT_SYM
         | MAX_CONNECTIONS_PER_HOUR
         | MAX_QUERIES_PER_HOUR
         | MAX_SIZE_SYM
@@ -16861,7 +16862,6 @@ reserved_keyword_udt_not_param_type:
         | LOCK_SYM
         | LOOP_SYM
         | LOW_PRIORITY
-        | MASTER_SSL_VERIFY_SERVER_CERT_SYM
         | MATCH
         | MAX_SYM
         | MAXVALUE_SYM

From aa2ac3078fa99c7cf712c29023c48ffe68677e10 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 8 Jan 2026 00:13:14 +0100
Subject: [PATCH 117/119] fix tests failing with --view

---
 mysql-test/main/features.result | 1 +
 mysql-test/main/features.test   | 4 ++++
 mysql-test/main/xa.result       | 1 +
 mysql-test/main/xa.test         | 3 +--
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mysql-test/main/features.result b/mysql-test/main/features.result
index 0fec83f363e..2f0c4193698 100644
--- a/mysql-test/main/features.result
+++ b/mysql-test/main/features.result
@@ -225,3 +225,4 @@ show status like "Feature_vector_index";
 Variable_name	Value
 Feature_vector_index	2
 drop table t1;
+# End of 11.8 tests
diff --git a/mysql-test/main/features.test b/mysql-test/main/features.test
index 3d2a03df545..15cc5630c55 100644
--- a/mysql-test/main/features.test
+++ b/mysql-test/main/features.test
@@ -171,6 +171,7 @@ show status like "feature_into_%";
 --echo # Feature vector index
 --echo #
 
+--disable_service_connection
 create table t1 (id int auto_increment primary key,
   u vector(5) not null, vector index (u));
 select * from t1;
@@ -178,3 +179,6 @@ select * from t1;
 select * from t1;
 show status like "Feature_vector_index";
 drop table t1;
+--enable_service_connection
+
+--echo # End of 11.8 tests
diff --git a/mysql-test/main/xa.result b/mysql-test/main/xa.result
index fb87114837c..5ec54445a75 100644
--- a/mysql-test/main/xa.result
+++ b/mysql-test/main/xa.result
@@ -1,4 +1,5 @@
 call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
+call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
 create table t1 (a int) engine=innodb;
 xa start 'test1';
 insert t1 values (10);
diff --git a/mysql-test/main/xa.test b/mysql-test/main/xa.test
index 289f8e7d47c..7504f7d13ba 100644
--- a/mysql-test/main/xa.test
+++ b/mysql-test/main/xa.test
@@ -6,11 +6,10 @@
 
 # Save the initial number of concurrent sessions
 let $count_sessions=1;
+disable_service_connection;
 
 call mtr.add_suppression("Deadlock found when trying to get lock; try restarting transaction");
---disable_query_log
 call mtr.add_suppression("InnoDB: Transaction was aborted due to ");
---enable_query_log
 
 create table t1 (a int) engine=innodb;
 xa start 'test1';

From e7a5539927e8db342f14a1041171b81838f853db Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 8 Jan 2026 00:14:21 +0100
Subject: [PATCH 118/119] fix failing galera tests

* update result
* followup for MDEV-38073. THD created - need to reset read_only
---
 mysql-test/suite/galera/r/MDEV-38201.result | 2 +-
 sql/wsrep_mysqld.cc                         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mysql-test/suite/galera/r/MDEV-38201.result b/mysql-test/suite/galera/r/MDEV-38201.result
index 5d389c6a516..ab66f9a1f6a 100644
--- a/mysql-test/suite/galera/r/MDEV-38201.result
+++ b/mysql-test/suite/galera/r/MDEV-38201.result
@@ -12,7 +12,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `f1` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
 FLUSH HOSTS;
 CREATE TABLE t1 (f1 INT) ENGINE=InnoDB;
 ERROR 42S01: Table 't1' already exists
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index d20d3366150..a1c1edba7e7 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -850,6 +850,7 @@ void wsrep_init_globals()
     /* apparently this thread has already called my_thread_init(),
      * so we skip it, hence 'false' for initialization. */
     wsp::thd thd(false, true);
+    thd.ptr->variables.tx_read_only= thd.ptr->tx_read_only= false;
     wsrep_sst_cleanup_user(thd.ptr);
   }
   if (WSREP_ON)

From a3d1b8264bc328cc2eec6290180f67792256a13c Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 8 Jan 2026 20:32:43 +0100
Subject: [PATCH 119/119] audit crashes when vio=NULL

e.g. galera.MDEV-35511 crashes on shutdown
---
 sql/sql_audit.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/sql/sql_audit.h b/sql/sql_audit.h
index c259aa84c49..66a2ccbc924 100644
--- a/sql/sql_audit.h
+++ b/sql/sql_audit.h
@@ -89,13 +89,12 @@ void set_tls_version_of_event(THD *thd, mysql_event_connection *event)
     event->tls_version = "";
     event->tls_version_length = 0;
 #ifdef HAVE_OPENSSL
-    Vio *vio= thd->net.vio;
-    SSL *ssl= (SSL *) vio->ssl_arg;
-    if (ssl)
-    {
-        event->tls_version = SSL_get_version(ssl);
-        event->tls_version_length = safe_strlen_uint(event->tls_version);
-    }
+    if (Vio *vio= thd->net.vio)
+      if (SSL *ssl= (SSL *) vio->ssl_arg)
+      {
+          event->tls_version = SSL_get_version(ssl);
+          event->tls_version_length = safe_strlen_uint(event->tls_version);
+      }
 #endif
 }