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.6' into 10.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-08-10 13:12:32 +02:00
parent fbfd44be3c c442e1ae21
commit 65a963f755
37 changed files with 309 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysql_upgrade.c
View File

@@ -714,7 +714,7 @@ static char upgrade_info_file[FN_REFLEN]= {0};
Open or create mysql_upgrade_info file in servers data dir.
Take a lock to ensure there cannot be any other mysql_upgrades
runninc concurrently
running concurrently
*/
const char *create_error_message=
@@ -775,7 +775,7 @@ static void open_mysql_upgrade_file()
/**
Place holder for versions that require a major upgrade
@return 0 upgrade has alredy been run on this version
@return 0 upgrade has already been run on this version
@return 1 upgrade has to be run
*/
@@ -799,7 +799,7 @@ static int faulty_server_versions(const char *version)
file it's always better to report that the upgrade hasn't
been performed.
@return 0 Upgrade has alredy been run on this version
@return 0 Upgrade has already been run on this version
@return > 0 Upgrade has to be run
*/