diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:24:31 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 12:24:31 +0200 |
| commit | 1ac0bce36e5bf2136cedb1ce1da949f53cce4404 (patch) | |
| tree | 7b81481b201c4e64aaa4a70411d992e0fac2289d /client/mysql_upgrade.c | |
| parent | 3b071bad1981a12e76769cbfc31b62fbd7362372 (diff) | |
| parent | 65e8506ca9d03967191b6ed207cf107d311f7f99 (diff) | |
| download | mariadb-git-1ac0bce36e5bf2136cedb1ce1da949f53cce4404.tar.gz | |
Merge branch '10.4' into 10.5mariadb-10.5.17
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 9f091d037a7..4e7ddec312f 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -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 */ |