diff --git a/VERSION b/VERSION index 7546880140e..431fdb8856b 100644 --- a/VERSION +++ b/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 diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 6e0d9665b81..d782939e497 100644 --- a/client/mysqlbinlog.cc +++ b/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: diff --git a/debian/additions/mariadb.conf.d/50-server.cnf b/debian/additions/mariadb.conf.d/50-server.cnf index 3b9b1b731fd..32d65931f61 100644 --- a/debian/additions/mariadb.conf.d/50-server.cnf +++ b/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] diff --git a/debian/changelog b/debian/changelog index faf54074614..45c6112e36a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mariadb (1:11.8.0) unstable; urgency=medium +mariadb (1:12.0.0) unstable; urgency=medium * Initial Release 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 e397989bec5..ce40c38d5d2 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 /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 diff --git a/mysql-test/suite/sys_vars/r/sysvars_star.result b/mysql-test/suite/sys_vars/r/sysvars_star.result index c005a6d2ad6..d54a320afcd 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