Merge branch '10.6' into mariadb-10.6.19

CMakeLists.txt

@@ -192,11 +192,7 @@ ELSE()
 ENDIF()
 
 
-IF("${MYSQL_NO_DASH_VERSION}" VERSION_LESS 11.2)
-  SET(MEMPROTECT_DEFAULT ON)
-ELSE()
-  SET(MEMPROTECT_DEFAULT OFF)
-ENDIF()
+SET(MEMPROTECT_DEFAULT ON)
 
 OPTION(WITH_PROTECT_STATEMENT_MEMROOT "Enable protection of statement's memory root after first SP/PS execution. Turned into account only for debug build"
 ${MEMPROTECT_DEFAULT})

VERSION

 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=19
+MYSQL_VERSION_PATCH=20
 SERVER_MATURITY=stable

sql/handler.cc

@@ -782,7 +782,7 @@ int ha_initialize_handlerton(st_plugin_int *plugin)
   update_discovery_counters(hton, 1);
 
   if (ddl_recovery_done && hton->signal_ddl_recovery_done)
-    hton->signal_ddl_recovery_done(hton);
+    ret= hton->signal_ddl_recovery_done(hton);
 
   DBUG_RETURN(ret);
 

storage/spider/spd_table.cc

@@ -6511,8 +6511,10 @@ bool spider_init_system_tables()
 
 
 /*
-  Spider is typically loaded before ddl_recovery, but DDL statements
-  cannot be executed before ddl_recovery, so we delay system table creation.
+  Spider may be loaded before ddl_recovery (e.g. with
+  --plugin-load-add), but DDL statements in spider init queries cannot
+  be executed before ddl_recovery, so we execute these queries only
+  after ddl recovery.
 */
 static int spider_after_ddl_recovery(handlerton *)
 {