mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-10118 : do not suggest upgrade from MySQL 5.7 to MariaDB 10.x in the installer. Do not lauch upgrade wizard after installation

Browse source
This commit is contained in:
Vladislav Vaintroub 2016-05-24 23:15:00 +02:00
parent cee9ab9d85
commit b6e826bac2
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sql/winservice.c
View file

@ -81,8 +81,10 @@ void normalize_path(char *path, size_t size)
and services. We do not want to mess up with these installations. We will
just ignore such services, pretending it is not MySQL.
´@return
TRUE, if this service should be excluded from UI lists etc (OEM install)
We also exclude MySQL5.7+ since we cannot upgrade it (and it is not an upgrade anyway)
@return
TRUE, if this service should be excluded from UI lists etc
FALSE otherwise.
*/
BOOL exclude_service(mysqld_service_properties *props)
@ -104,7 +106,12 @@ BOOL exclude_service(mysqld_service_properties *props)
if (strstr(buf, exclude_patterns[i]))
return TRUE;
}
if ((props->version_major == 0) ||
(props->version_major > 5 && props->version_major < 10) ||
(props->version_major == 5 && props->version_minor > 6))
{
return TRUE;
}
return FALSE;
}

4
win/packaging/ca/CustomAction.cpp
View file

@ -886,11 +886,11 @@ extern "C" UINT __stdcall CheckServiceUpgrades(MSIHANDLE hInstall)
(QUERY_SERVICE_CONFIGW*)(void *)config_buffer;
DWORD needed;
BOOL ok= QueryServiceConfigW(service, config,sizeof(config_buffer),
&needed);
&needed) && (config->dwStartType != SERVICE_DISABLED);
CloseServiceHandle(service);
if (ok)
{
mysqld_service_properties props;
mysqld_service_properties props;
if (get_mysql_service_properties(config->lpBinaryPathName, &props))
continue;
/*