diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-13 13:39:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-13 13:39:00 +0300 |
| commit | e98013cb5c3695729114a56e1181b23c69801ae0 (patch) | |
| tree | 9efb24178eb71a15db85057be0379e3ded75feec /include | |
| parent | bea47a6f59d0aa80461877d04f81b96e1c487362 (diff) | |
| parent | cbf9d8a8d5362e710144c308c97b2f96432c233d (diff) | |
| download | mariadb-git-e98013cb5c3695729114a56e1181b23c69801ae0.tar.gz | |
Merge 10.8 into 10.9
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_service_manager.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/my_service_manager.h b/include/my_service_manager.h index 3eff1253f20..498fc762048 100644 --- a/include/my_service_manager.h +++ b/include/my_service_manager.h @@ -43,7 +43,12 @@ #define SD_LISTEN_FDS_START (0) #define sd_notify(X, Y) #define sd_notifyf(E, F, ...) -#define service_manager_extend_timeout(I, FMTSTR, ...) +#ifdef _WIN32 + #define service_manager_extend_timeout(I, F, ...) \ + mysqld_win_extend_service_timeout(I) +#else + #define service_manager_extend_timeout(I, FMTSTR, ...) +#endif #endif #endif /* MY_SERVICE_MANAGER_INCLUDED */ |