Version change to 11.0

9 files changed, 32 insertions, 24 deletions

diff --git a/VERSION b/VERSION
index 8cd63dc39bd..c1aee6d461c 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-MYSQL_VERSION_MAJOR=10
-MYSQL_VERSION_MINOR=11
-MYSQL_VERSION_PATCH=2
-SERVER_MATURITY=gamma
+MYSQL_VERSION_MAJOR=11
+MYSQL_VERSION_MINOR=0
+MYSQL_VERSION_PATCH=1
+SERVER_MATURITY=alpha
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 75fc7268b0d..82b9ff20731 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -2822,6 +2822,7 @@ static Exit_status check_master_version()
     break;
   case 5:
   case 10:
+  case 11:
     /*
       The server is soon going to send us its Format_description log
       event, unless it is a 5.0 server with 3.23 or 4.0 binlogs.
diff --git a/mysql-test/main/comments.result b/mysql-test/main/comments.result
index c13eb510326..eb08f6d953f 100644
--- a/mysql-test/main/comments.result
+++ b/mysql-test/main/comments.result
@@ -65,6 +65,9 @@ SELECT 1 /*!100000 +1*/;
 1  +1
 2
 SELECT 1 /*!110000 +1*/;
+1  +1
+2
+SELECT 1 /*!190000 +1*/;
 1
 1
 #
@@ -87,6 +90,9 @@ SELECT 1 /*M!100000 +1*/;
 1  +1
 2
 SELECT 1 /*M!110000 +1*/;
+1  +1
+2
+SELECT 1 /*M!190000 +1*/;
 1
 1
 select 1/*!2*/;
diff --git a/mysql-test/main/comments.test b/mysql-test/main/comments.test
index 6cf69635d1e..7b5241fd913 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 /*!110000 +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!110000 +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 8bff2a87d98..c2fa6015d79 100644
--- a/mysql-test/main/mysql_upgrade.test
+++ b/mysql-test/main/mysql_upgrade.test
@@ -337,14 +337,23 @@ EOF
 --echo # MDEV-27279: mariadb_upgrade check-if-upgrade with major version change
 --echo #
 
-# take 2rd number of version and change to 0
+# 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*)(.*)/$1.0.$3$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 dac6eab21e9..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 /10\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/mysql-test/spider/bugfix/include/sql_mode_init.inc b/storage/spider/mysql-test/spider/bugfix/include/sql_mode_init.inc
index 09ab2934aea..1637bdb36d7 100644
--- a/storage/spider/mysql-test/spider/bugfix/include/sql_mode_init.inc
+++ b/storage/spider/mysql-test/spider/bugfix/include/sql_mode_init.inc
@@ -8,13 +8,13 @@
 --let $SQL_MODES= real_as_float,pipes_as_concat,ansi_quotes,ignore_space,ignore_bad_table_options,only_full_group_by,no_unsigned_subtraction,no_dir_in_create,postgresql,oracle,mssql,db2,maxdb,no_key_options,no_table_options,no_field_options,mysql323,mysql40,ansi,no_auto_value_on_zero,no_backslash_escapes,strict_trans_tables,strict_all_tables,no_zero_in_date,no_zero_date,allow_invalid_dates,error_for_division_by_zero,traditional,no_auto_create_user,high_not_precedence,no_engine_substitution,pad_char_to_full_length
 if (`SELECT IF(STRCMP('$SERVER_NAME', 'MariaDB') = 0, 1, 0)`)
 {
-  if (`SELECT IF($SERVER_MAJOR_VERSION = 10, 1, 0)`)
+  if (`SELECT IF($SERVER_MAJOR_VERSION = 10 or $SERVER_MAJOR_VERSION > 10, 1, 0)`)
   {
-    if (`SELECT IF($SERVER_MINOR_VERSION >= 3, 1, 0)`)
+    if (`SELECT IF($SERVER_MAJOR_VERSION > 10 or $SERVER_MINOR_VERSION >= 3, 1, 0)`)
     {
       --let $SQL_MODES= $SQL_MODES,empty_string_is_null,simultaneous_assignment
     }
-    if (`SELECT IF($SERVER_MINOR_VERSION >= 4, 1, 0)`)
+    if (`SELECT IF($SERVER_MAJOR_VERSION > 10 or $SERVER_MINOR_VERSION >= 4, 1, 0)`)
     {
       --let $SQL_MODES= $SQL_MODES,time_round_fractional
     }
diff --git a/storage/spider/spd_init_query.h b/storage/spider/spd_init_query.h
index e66e94d8373..7c41ba04e0b 100644
--- a/storage/spider/spd_init_query.h
+++ b/storage/spider/spd_init_query.h
@@ -540,11 +540,7 @@ static LEX_STRING spider_init_queries[] = {
     "  end if;"
     "  if @server_name = 'MariaDB' and"
     "    ("
-    "      @server_major_version > 10 or"
-    "      ("
-    "        @server_major_version = 10 and"
-    "        @server_minor_version >= 999"
-    "      )"
+    "      @server_major_version > 11"
     "    )"
     "  then"
     "    /* table for ddl pushdown */"
@@ -798,13 +794,9 @@ static LEX_STRING spider_init_queries[] = {
     "        soname 'ha_spider.dll';"
     "    end if;"
     "  end if;"
-    "  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"
 /*