diff --git a/VERSION b/VERSION
index 2b0eac3dbce..c1aee6d461c 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=11
 MYSQL_VERSION_MINOR=0
 MYSQL_VERSION_PATCH=1
-SERVER_MATURITY=gamma
+SERVER_MATURITY=alpha
diff --git a/mysql-test/main/comments.result b/mysql-test/main/comments.result
index 8b3f9fba382..506c31b07b6 100644
--- a/mysql-test/main/comments.result
+++ b/mysql-test/main/comments.result
@@ -67,6 +67,9 @@ SELECT 1 /*!100000 +1*/;
 SELECT 1 /*!210000 +1*/;
 1
 1
+SELECT 1 /*!190000 +1*/;
+1
+1
 #
 # Tesing that versions >= 5.7.x and < 10.0.0 are not ignored 
 # when used with the MariaDB executable comment syntax.
@@ -89,6 +92,9 @@ SELECT 1 /*M!100000 +1*/;
 SELECT 1 /*M!210000 +1*/;
 1
 1
+SELECT 1 /*M!190000 +1*/;
+1
+1
 select 1/*!2*/;
 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 '2*/' at line 1
 select 1/*!0000002*/;
diff --git a/mysql-test/main/comments.test b/mysql-test/main/comments.test
index 87125890780..42cdc4255fd 100644
--- a/mysql-test/main/comments.test
+++ b/mysql-test/main/comments.test
@@ -42,6 +42,7 @@ SELECT 1 /*!50999 +1*/;
 SELECT 1 /*!99999 +1*/;
 SELECT 1 /*!100000 +1*/;
 SELECT 1 /*!210000 +1*/;
+SELECT 1 /*!190000 +1*/;
 
 --echo #
 --echo # Tesing that versions >= 5.7.x and < 10.0.0 are not ignored 
@@ -53,6 +54,7 @@ SELECT 1 /*M!50999 +1*/;
 SELECT 1 /*M!99999 +1*/;
 SELECT 1 /*M!100000 +1*/;
 SELECT 1 /*M!210000 +1*/;
+SELECT 1 /*M!190000 +1*/;
 
 #
 # Bug#25411 (trigger code truncated)
diff --git a/mysql-test/main/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test
index b149038067d..4ebfd7c7187 100644
--- a/mysql-test/main/mysql_upgrade.test
+++ b/mysql-test/main/mysql_upgrade.test
@@ -337,12 +337,22 @@ EOF
 --echo # MDEV-27279: mariadb_upgrade check-if-upgrade with major version change
 --echo #
 
+# take 2rd number of version and change to 0. If the 2rd number is already 0,
+# change the first number
 let DATADIR= $MYSQLD_DATADIR;
 
 perl;
   my $ver= $ENV{'MYSQL_SERVER_VERSION'} or die "MYSQL_SERVER_VERSION not set";
   my $file= $ENV{'DATADIR'} or die "MYSQLD_DATADIR not set";
-  $ver =~ s/^(\d*)\.(\d*).(\d*)(.*)/10.11.2$4/;
+  if ($ver =~ m/(\d*)\.0\.(\d*)(.*)/)
+  {
+     my $prev= $1-1;
+     $ver= $prev . '.0.' . $2 . $3;
+  }
+  else
+  {
+    $ver =~ s/^(\d*)\.(\d*)\.(\d*)(.*)/$1.0.$3$4/;
+  }
   open(FILE, ">$file/mysql_upgrade_info") or die "Failed to open $file";
   print FILE "$ver\n";
   close(FILE);
diff --git a/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test b/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test
index e86e93f7a3b..e397989bec5 100644
--- a/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test
+++ b/mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test
@@ -17,7 +17,7 @@ alter table user drop column max_statement_time;
 
 flush privileges;
 
---replace_regex /1\d\d\d\d\d/MYSQL_VERSION_ID/
+--replace_regex /11\d\d\d\d/MYSQL_VERSION_ID/
 --error ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE
 create role test_role;
 --error ER_CANNOT_USER
@@ -30,8 +30,6 @@ after password_expired;
 create role test_role;
 create user test_user@localhost;
 grant test_role to test_user@localhost;
-#--replace_regex /10\d\d\d\d/MYSQL_VERSION_ID/
-#--error ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE
 set default role test_role for root@localhost;
 drop role test_role;
 drop user test_user@localhost;
diff --git a/mysql-test/suite/sys_vars/r/sysvars_star.result b/mysql-test/suite/sys_vars/r/sysvars_star.result
index b3357fda3af..65a391828b2 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_star.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_star.result
@@ -60,7 +60,7 @@ VARIABLE_NAME	PLUGIN_MATURITY
 SESSION_VALUE	NULL
 GLOBAL_VALUE	alpha
 GLOBAL_VALUE_ORIGIN	CONFIG
-DEFAULT_VALUE	beta
+DEFAULT_VALUE	experimental
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	ENUM
 VARIABLE_COMMENT	The lowest desirable plugin maturity. Plugins less mature than that will not be installed or loaded
diff --git a/storage/spider/spd_init_query.h b/storage/spider/spd_init_query.h
index 0aba850ce0f..c3bea1c166b 100644
--- a/storage/spider/spd_init_query.h
+++ b/storage/spider/spd_init_query.h
@@ -544,11 +544,7 @@ static LEX_STRING spider_init_queries[] = {
 /*
     "  if @server_name = 'MariaDB' and"
     "    ("
-    "      @server_major_version > 10 or"
-    "      ("
-    "        @server_major_version = 10 and"
-    "        @server_minor_version >= 999"
-    "      )"
+    "      @server_major_version > 11"
     "    )"
     "  then"
     "    create table if not exists mysql.spider_rewrite_tables("
@@ -806,13 +802,9 @@ static LEX_STRING spider_init_queries[] = {
   Install spider_rewrite plugin
 */
 /*
-    "  if @server_name = 'MariaDB' and"
+    "  if @server_name = 'MariaDB' and "
     "    ("
-    "      @server_major_version > 10 or"
-    "      ("
-    "        @server_major_version = 10 and"
-    "        @server_minor_version >= 999"
-    "      )"
+    "      @server_major_version > 11"
     "    )"
     "  then"
     "    set @have_spider_i_s_rewrite_plugin := 0;"