database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 11.0-selectivity into 11.0

Browse Source
This commit is contained in:
Sergei Petrunia
2023-02-15 12:03:12 +03:00
parent f74bb51b30 e8c7222ba3
commit 10a974adc9
739 changed files with 33079 additions and 13101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,13 +350,23 @@ EOF
--echo # MDEV-27279: mariadb_upgrade check-if-upgrade with major version change
--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;
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*)(.*)/10.11.2$4/;
open(FILE, ">$file/mariadb_upgrade_info") or die "Failed to open $file";
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/;
}
print FILE "$ver\n";
close(FILE);
EOF