mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Version change to 11.0

Browse source
This commit is contained in:
Monty 2022-11-18 13:51:15 +02:00 committed by Sergei Petrunia
parent dd1a4131ef
commit 98879f8d43
7 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

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

6
mysql-test/main/comments.result
View file

@ -67,6 +67,9 @@ SELECT 1 /*!100000 +1*/;
SELECT 1 /*!210000 +1*/; SELECT 1 /*!210000 +1*/;
1 1
1 1
SELECT 1 /*!190000 +1*/;
1
1
# #
# Tesing that versions >= 5.7.x and < 10.0.0 are not ignored # Tesing that versions >= 5.7.x and < 10.0.0 are not ignored
# when used with the MariaDB executable comment syntax. # when used with the MariaDB executable comment syntax.
@ -89,6 +92,9 @@ SELECT 1 /*M!100000 +1*/;
SELECT 1 /*M!210000 +1*/; SELECT 1 /*M!210000 +1*/;
1 1
1 1
SELECT 1 /*M!190000 +1*/;
1
1
select 1/*!2*/; 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 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*/; select 1/*!0000002*/;

2
mysql-test/main/comments.test
View file

@ -42,6 +42,7 @@ SELECT 1 /*!50999 +1*/;
SELECT 1 /*!99999 +1*/; SELECT 1 /*!99999 +1*/;
SELECT 1 /*!100000 +1*/; SELECT 1 /*!100000 +1*/;
SELECT 1 /*!210000 +1*/; SELECT 1 /*!210000 +1*/;
SELECT 1 /*!190000 +1*/;
--echo # --echo #
--echo # Tesing that versions >= 5.7.x and < 10.0.0 are not ignored --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!99999 +1*/;
SELECT 1 /*M!100000 +1*/; SELECT 1 /*M!100000 +1*/;
SELECT 1 /*M!210000 +1*/; SELECT 1 /*M!210000 +1*/;
SELECT 1 /*M!190000 +1*/;
# #
# Bug#25411 (trigger code truncated) # Bug#25411 (trigger code truncated)

12
mysql-test/main/mysql_upgrade.test
View file

@ -337,12 +337,22 @@ EOF
--echo # MDEV-27279: mariadb_upgrade check-if-upgrade with major version change --echo # MDEV-27279: mariadb_upgrade check-if-upgrade with major version change
--echo # --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; let DATADIR= $MYSQLD_DATADIR;
perl; perl;
my $ver= $ENV{'MYSQL_SERVER_VERSION'} or die "MYSQL_SERVER_VERSION not set"; my $ver= $ENV{'MYSQL_SERVER_VERSION'} or die "MYSQL_SERVER_VERSION not set";
my $file= $ENV{'DATADIR'} or die "MYSQLD_DATADIR 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"; open(FILE, ">$file/mysql_upgrade_info") or die "Failed to open $file";
print FILE "$ver\n"; print FILE "$ver\n";
close(FILE); close(FILE);

4
mysql-test/suite/roles/create_and_drop_role_invalid_user_table.test
View file

@ -17,7 +17,7 @@ alter table user drop column max_statement_time;
flush privileges; 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 --error ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE
create role test_role; create role test_role;
--error ER_CANNOT_USER --error ER_CANNOT_USER
@ -30,8 +30,6 @@ after password_expired;
create role test_role; create role test_role;
create user test_user@localhost; create user test_user@localhost;
grant test_role to 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; set default role test_role for root@localhost;
drop role test_role; drop role test_role;
drop user test_user@localhost; drop user test_user@localhost;

2
mysql-test/suite/sys_vars/r/sysvars_star.result
View file

@ -60,7 +60,7 @@ VARIABLE_NAME PLUGIN_MATURITY
SESSION_VALUE NULL SESSION_VALUE NULL
GLOBAL_VALUE alpha GLOBAL_VALUE alpha
GLOBAL_VALUE_ORIGIN CONFIG GLOBAL_VALUE_ORIGIN CONFIG
DEFAULT_VALUE beta DEFAULT_VALUE experimental
VARIABLE_SCOPE GLOBAL VARIABLE_SCOPE GLOBAL
VARIABLE_TYPE ENUM VARIABLE_TYPE ENUM
VARIABLE_COMMENT The lowest desirable plugin maturity. Plugins less mature than that will not be installed or loaded VARIABLE_COMMENT The lowest desirable plugin maturity. Plugins less mature than that will not be installed or loaded

14
storage/spider/spd_init_query.h
View file

@ -544,11 +544,7 @@ static LEX_STRING spider_init_queries[] = {
/* /*
" if @server_name = 'MariaDB' and" " if @server_name = 'MariaDB' and"
" (" " ("
" @server_major_version > 10 or" " @server_major_version > 11"
" ("
" @server_major_version = 10 and"
" @server_minor_version >= 999"
" )"
" )" " )"
" then" " then"
" create table if not exists mysql.spider_rewrite_tables(" " create table if not exists mysql.spider_rewrite_tables("
@ -806,13 +802,9 @@ static LEX_STRING spider_init_queries[] = {
Install spider_rewrite plugin Install spider_rewrite plugin
*/ */
/* /*
" if @server_name = 'MariaDB' and" " if @server_name = 'MariaDB' and "
" (" " ("
" @server_major_version > 10 or" " @server_major_version > 11"
" ("
" @server_major_version = 10 and"
" @server_minor_version >= 999"
" )"
" )" " )"
" then" " then"
" set @have_spider_i_s_rewrite_plugin := 0;" " set @have_spider_i_s_rewrite_plugin := 0;"