11.0 branch

VERSION

-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=0
+SERVER_MATURITY=beta

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.

debian/additions/mariadb.conf.d/50-server.cnf

@@ -108,7 +108,7 @@ collation-server      = utf8mb4_general_ci
 # you can put MariaDB-only options here
 [mariadb]
 
-# This group is only read by MariaDB-10.11 servers.
+# This group is only read by MariaDB-11.0 servers.
 # If you use the same .cnf file for MariaDB of different versions,
 # use this group for options that older servers don't understand
-[mariadb-10.11]
+[mariadb-11.0]

debian/changelog

-mariadb (1:10.11.0) unstable; urgency=medium
+mariadb (1:11.0.0) unstable; urgency=medium
 
   * Initial Release
 

debian/control

@@ -384,7 +384,6 @@ Replaces: mariadb-client (<< ${source:Version}),
           percona-xtradb-cluster-server-5.7,
           virtual-mysql-client-core
 Provides: default-mysql-client-core,
-          mariadb-client-core-10.11,
           virtual-mysql-client-core
 Description: MariaDB database core client binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -544,7 +543,6 @@ Replaces: mariadb-client (<< ${source:Version}),
           percona-xtradb-cluster-server-5.7,
           virtual-mysql-client
 Provides: default-mysql-client,
-          mariadb-client-10.11,
           virtual-mysql-client
 Recommends: libdbd-mariadb-perl | libdbd-mysql-perl,
             libdbi-perl,
@@ -658,7 +656,6 @@ Replaces: mariadb-client (<< ${source:Version}),
           percona-xtradb-cluster-server-5.7,
           virtual-mysql-server-core
 Provides: default-mysql-server-core,
-          mariadb-server-core-10.11,
           virtual-mysql-server-core
 Description: MariaDB database core server files
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
@@ -771,7 +768,6 @@ Replaces: handlersocket-mysql-5.5,
           percona-xtradb-cluster-server-5.7,
           virtual-mysql-server
 Provides: default-mysql-server,
-          mariadb-server-10.11,
           virtual-mysql-server
 Description: MariaDB database server binaries
  MariaDB is a fast, stable and true multi-user, multi-threaded SQL database

debian/source/lintian-overrides

@@ -9,23 +9,6 @@ version-substvar-for-external-package mariadb-server-10.9 -> mysql-client-8.*
 version-substvar-for-external-package mariadb-client-10.9 -> mysql-client-core-5.*
 version-substvar-for-external-package mariadb-client-10.9 -> mysql-client-core-8.*
 version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
-# Intentional version-substvar-for-external-package as long as mariadb-server
-# provides mariadb-server-10.11 and mariadb-client provides mariadb-client-10.11
-version-substvar-for-external-package Conflicts (line 408) ${source:Version} mariadb-client -> mariadb-client-10.11
-version-substvar-for-external-package Conflicts (line 575) ${source:Version} mariadb-server-core -> mariadb-server-core-10.11
-version-substvar-for-external-package Conflicts (line 711) ${source:Version} mariadb-server -> mariadb-server-10.11
-version-substvar-for-external-package Conflicts (line 95) ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev
-version-substvar-for-external-package Replaces (line 109) ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev
-version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-client-10.11
-version-substvar-for-external-package Replaces (line 330) ${source:Version} mariadb-client-core -> mariadb-server-core-10.11
-version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-10.11
-version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-client-core-10.11
-version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-10.11
-version-substvar-for-external-package Replaces (line 481) ${source:Version} mariadb-client -> mariadb-server-core-10.11
-version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-client-10.11
-version-substvar-for-external-package Replaces (line 626) ${source:Version} mariadb-server-core -> mariadb-server-10.11
-version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-client-10.11
-version-substvar-for-external-package Replaces (line 748) ${source:Version} mariadb-server -> mariadb-server-10.11
 # ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
 source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
 source-is-missing [storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2]

mysql-test/main/comments.result

@@ -64,7 +64,7 @@ SELECT 1 /*!99999 +1*/;
 SELECT 1 /*!100000 +1*/;
 1  +1
 2
-SELECT 1 /*!110000 +1*/;
+SELECT 1 /*!210000 +1*/;
 1
 1
 #
@@ -86,7 +86,7 @@ SELECT 1 /*M!99999 +1*/;
 SELECT 1 /*M!100000 +1*/;
 1  +1
 2
-SELECT 1 /*M!110000 +1*/;
+SELECT 1 /*M!210000 +1*/;
 1
 1
 select 1/*!2*/;

mysql-test/main/comments.test

@@ -41,7 +41,7 @@ SELECT 1 /*!50700 +1*/;
 SELECT 1 /*!50999 +1*/;
 SELECT 1 /*!99999 +1*/;
 SELECT 1 /*!100000 +1*/;
-SELECT 1 /*!110000 +1*/;
+SELECT 1 /*!210000 +1*/;
 
 --echo #
 --echo # Tesing that versions >= 5.7.x and < 10.0.0 are not ignored 
@@ -52,7 +52,7 @@ SELECT 1 /*M!50700 +1*/;
 SELECT 1 /*M!50999 +1*/;
 SELECT 1 /*M!99999 +1*/;
 SELECT 1 /*M!100000 +1*/;
-SELECT 1 /*M!110000 +1*/;
+SELECT 1 /*M!210000 +1*/;
 
 #
 # Bug#25411 (trigger code truncated)

mysql-test/main/mysql_upgrade.test

@@ -337,14 +337,12 @@ EOF
 --echo # MDEV-27279: mariadb_upgrade check-if-upgrade with major version change
 --echo #
 
-# take 2rd number of version and change to 0
-
 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/;
+  $ver =~ s/^(\d*)\.(\d*).(\d*)(.*)/10.11.2$4/;
   open(FILE, ">$file/mysql_upgrade_info") or die "Failed to open $file";
   print FILE "$ver\n";
   close(FILE);

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 /1\d\d\d\d\d/MYSQL_VERSION_ID/
 --error ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE
 create role test_role;
 --error ER_CANNOT_USER

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	alpha
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	ENUM
 VARIABLE_COMMENT	The lowest desirable plugin maturity. Plugins less mature than that will not be installed or loaded