diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /sql/winservice.c | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sql/winservice.c')
| -rw-r--r-- | sql/winservice.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/winservice.c b/sql/winservice.c index d4e3bb09..c5fba810 100644 --- a/sql/winservice.c +++ b/sql/winservice.c @@ -305,19 +305,19 @@ int get_mysql_service_properties(const wchar_t *bin_path, } /* - If version could not be determined so far, try mysql_upgrade_info in + If version could not be determined so far, try mariadb_upgrade_info in database directory. */ if(props->version_major == 0) { char buf[MAX_PATH]; - FILE *mysql_upgrade_info; + FILE *mariadb_upgrade_info; - sprintf_s(buf, MAX_PATH, "%s\\mysql_upgrade_info", props->datadir); - mysql_upgrade_info= fopen(buf, "r"); - if(mysql_upgrade_info) + sprintf_s(buf, MAX_PATH, "%s\\mariadb_upgrade_info", props->datadir); + mariadb_upgrade_info= fopen(buf, "r"); + if(mariadb_upgrade_info) { - if (fgets(buf, MAX_PATH, mysql_upgrade_info)) + if (fgets(buf, MAX_PATH, mariadb_upgrade_info)) { int major,minor,patch; if (sscanf(buf, "%d.%d.%d", &major, &minor, &patch) == 3) |