@@ -40,7 +40,7 @@ void get_file_version(const char *path, int *major, int *minor, int *patch)
40
40
* major = * minor = * patch = 0 ;
41
41
42
42
size = GetFileVersionInfoSize (path , & version_handle );
43
- if (size == 0 )
43
+ if (size == 0 )
44
44
return ;
45
45
ver = (char * )malloc (size );
46
46
if (!GetFileVersionInfo (path , version_handle , size , ver ))
@@ -65,7 +65,7 @@ void normalize_path(char *path, size_t size)
65
65
char * p ;
66
66
strcpy_s (buf , MAX_PATH , path + 1 );
67
67
p = strchr (buf , '"' );
68
- if (p )
68
+ if (p )
69
69
* p = 0 ;
70
70
}
71
71
else
@@ -118,15 +118,15 @@ BOOL exclude_service(mysqld_service_properties *props)
118
118
119
119
/*
120
120
Retrieve some properties from windows mysqld service binary path.
121
- We're interested in ini file location and datadir, and also in version of
121
+ We're interested in ini file location and datadir, and also in version of
122
122
the data. We tolerate missing mysqld.exe.
123
123
124
- Note that this function carefully avoids using mysql libraries (e.g dbug),
124
+ Note that this function carefully avoids using mysql libraries (e.g dbug),
125
125
since it is used in unusual environments (windows installer, MFC), where we
126
- do not have much control over how threads are created and destroyed, so we
126
+ do not have much control over how threads are created and destroyed, so we
127
127
cannot assume MySQL thread initilization here.
128
128
*/
129
- int get_mysql_service_properties (const wchar_t * bin_path ,
129
+ int get_mysql_service_properties (const wchar_t * bin_path ,
130
130
mysqld_service_properties * props )
131
131
{
132
132
int numargs ;
@@ -174,7 +174,7 @@ int get_mysql_service_properties(const wchar_t *bin_path,
174
174
if (wcsstr (mysqld_path , L".exe" ) == NULL )
175
175
wcscat (mysqld_path , L".exe" );
176
176
177
- if (wcsicmp (file_part , L"mysqld.exe" ) != 0 &&
177
+ if (wcsicmp (file_part , L"mysqld.exe" ) != 0 &&
178
178
wcsicmp (file_part , L"mysqld-debug.exe" ) != 0 &&
179
179
wcsicmp (file_part , L"mysqld-nt.exe" ) != 0 &&
180
180
wcsicmp (file_part , L"mariadbd.exe" ) != 0 )
@@ -187,7 +187,7 @@ int get_mysql_service_properties(const wchar_t *bin_path,
187
187
/* If mysqld.exe exists, try to get its version from executable */
188
188
if (GetFileAttributes (props -> mysqld_exe ) != INVALID_FILE_ATTRIBUTES )
189
189
{
190
- get_file_version (props -> mysqld_exe , & props -> version_major ,
190
+ get_file_version (props -> mysqld_exe , & props -> version_major ,
191
191
& props -> version_minor , & props -> version_patch );
192
192
}
193
193
@@ -198,7 +198,7 @@ int get_mysql_service_properties(const wchar_t *bin_path,
198
198
normalize_path (props -> inifile , MAX_PATH );
199
199
if (GetFileAttributes (props -> inifile ) != INVALID_FILE_ATTRIBUTES )
200
200
{
201
- GetPrivateProfileString ("mysqld" , "datadir" , NULL , props -> datadir , MAX_PATH ,
201
+ GetPrivateProfileString ("mysqld" , "datadir" , NULL , props -> datadir , MAX_PATH ,
202
202
props -> inifile );
203
203
}
204
204
else
@@ -217,7 +217,7 @@ int get_mysql_service_properties(const wchar_t *bin_path,
217
217
{
218
218
/*
219
219
Hard, although a rare case, we're guessing datadir and defaults-file.
220
- On Windows, defaults-file is traditionally install-root\my.ini
220
+ On Windows, defaults-file is traditionally install-root\my.ini
221
221
and datadir is install-root\data
222
222
*/
223
223
char install_root [MAX_PATH ];
@@ -276,7 +276,7 @@ int get_mysql_service_properties(const wchar_t *bin_path,
276
276
}
277
277
278
278
/*
279
- If version could not be determined so far, try mysql_upgrade_info in
279
+ If version could not be determined so far, try mysql_upgrade_info in
280
280
database directory.
281
281
*/
282
282
if (props -> version_major == 0 )
0 commit comments