database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.11' into 11.4

Browse Source
This commit is contained in:
Sergei Golubchik
2025-03-31 20:18:05 +02:00
parent 30140c066d 730dcf7e6d
commit 28425cc276
24 changed files with 247 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mysql-test/main/mysql_upgrade.result
View File

@@ -152,7 +152,8 @@ Phase 7/8: uninstalling plugins
Phase 8/8: Running 'FLUSH PRIVILEGES'
OK
Run it again - should say already completed
This installation of MariaDB is already upgraded to VERSION.There is no need to run mariadb-upgrade again for VERSION.
This installation of MariaDB is already upgraded to X.Y.Z-MariaDB.
There is no need to run mariadb-upgrade again.
You can use --force if you still want to run mariadb-upgrade
Force should run it regardless of whether it has been run before
Phase 1/8: Checking and upgrading mysql database
@@ -1922,11 +1923,11 @@ FLUSH PRIVILEGES;
#
# MDEV-27279: mariadb_upgrade add --check-if-upgrade-is-needed
#
This installation of MariaDB is already upgraded to MariaDB .
There is no need to run mariadb-upgrade again for MariaDB .
This installation of MariaDB is already upgraded to X.Y.Z-MariaDB.
There is no need to run mariadb-upgrade again.
Looking for 'mariadb' as: mariadb
This installation of MariaDB is already upgraded to MariaDB .
There is no need to run mariadb-upgrade again for MariaDB .
This installation of MariaDB is already upgraded to X.Y.Z-MariaDB.
There is no need to run mariadb-upgrade again.
#
# MDEV-27279: mariadb_upgrade check-if-upgrade absence is do it
#
@@ -1936,17 +1937,17 @@ Empty or non existent ...mariadb_upgrade_info. Assuming mysql_upgrade has to be
# MDEV-27279: mariadb_upgrade check-if-upgrade with minor version change
#
Looking for 'mariadb' as: mariadb
This installation of MariaDB is already upgraded to MariaDB .
There is no need to run mariadb-upgrade again for MariaDB .
This installation of MariaDB is already upgraded to MariaDB .
There is no need to run mariadb-upgrade again for MariaDB .
This installation of MariaDB is already upgraded to X.Y.0-MariaDB.
There is no need to run mariadb-upgrade again for X.Y.Z-MariaDB, because they're both X.Y.
This installation of MariaDB is already upgraded to X.Y.0-MariaDB.
There is no need to run mariadb-upgrade again for X.Y.Z-MariaDB, because they're both X.Y.
You can use --force if you still want to run mariadb-upgrade
#
# MDEV-27279: mariadb_upgrade check-if-upgrade with major version change
#
Major version upgrade detected from MariaDB to MariaDB . Check required!
Major version upgrade detected from X.0.99 to X.Y.Z-MariaDB. Check required!
Looking for 'mysql' as: mysql
Major version upgrade detected from MariaDB to MariaDB . Check required!
Major version upgrade detected from X.0.99 to X.Y.Z-MariaDB. Check required!
drop table mysql.global_priv;
rename table mysql.global_priv_bak to mysql.global_priv;
# End of 10.2 tests