diff options
| author | Sergei Petrunia <sergey@mariadb.com> | 2023-02-15 12:03:12 +0300 |
|---|---|---|
| committer | Sergei Petrunia <sergey@mariadb.com> | 2023-02-15 12:03:12 +0300 |
| commit | 10a974adc9b250431cac44555c7aa9354e5840df (patch) | |
| tree | ceb40f857edb82caf29a4f41f919fc9709f199f2 /mysql-test/main/mysql_upgrade.test | |
| parent | f74bb51b30df03cf21aca040901089ed27821762 (diff) | |
| parent | e8c7222ba3add52665e425740860325866b2aef5 (diff) | |
| download | mariadb-git-10a974adc9b250431cac44555c7aa9354e5840df.tar.gz | |
Merge 11.0-selectivity into 11.0
Diffstat (limited to 'mysql-test/main/mysql_upgrade.test')
| -rw-r--r-- | mysql-test/main/mysql_upgrade.test | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/main/mysql_upgrade.test b/mysql-test/main/mysql_upgrade.test index e9caf94d362..8d2a3334d7c 100644 --- a/mysql-test/main/mysql_upgrade.test +++ b/mysql-test/main/mysql_upgrade.test @@ -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 |