12.0 branch

VERSION

@@ -1,4 +1,4 @@
-MYSQL_VERSION_MAJOR=11
-MYSQL_VERSION_MINOR=8
-MYSQL_VERSION_PATCH=1
-SERVER_MATURITY=gamma
+MYSQL_VERSION_MAJOR=12
+MYSQL_VERSION_MINOR=0
+MYSQL_VERSION_PATCH=0
+SERVER_MATURITY=alpha

client/mysqlbinlog.cc

@@ -2547,6 +2547,7 @@ static Exit_status check_master_version()
   case 5:
   case 10:
   case 11:
+  case 12:
     glob_description_event= new Format_description_log_event(4);
     break;
   default:

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

@@ -110,7 +110,7 @@ expire_logs_days        = 10
 # you can put MariaDB-only options here
 [mariadbd]
 
-# This group is only read by MariaDB-11.8 servers.
+# This group is only read by MariaDB-12.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-11.8]
+[mariadb-12.0]

debian/changelog

@@ -1,4 +1,4 @@
-mariadb (1:11.8.0) unstable; urgency=medium
+mariadb (1:12.0.0) unstable; urgency=medium
 
   * Initial Release
 

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 /11\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	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