diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:17:38 +0000 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-07 20:17:38 +0000 |
commit | 282b652028ca79baa5a43aa5356d779a688947a8 (patch) | |
tree | 66205f73da3a22532dc0defa6132778e258ded8e /sql/mysql_install_db.cc | |
parent | d995dd2865b4dd5d01175594ed667cfe8ce41712 (diff) | |
download | mariadb-git-282b652028ca79baa5a43aa5356d779a688947a8.tar.gz |
Windows, compiling : reenable warning C4996 (deprecated functions)
But set _CRT_NONSTDC_NO_WARNINGS to silence silly warnings about
ANSI C function being non-standard
Remove now deprecated GetVersion()/GetVersionEx(),except single case
where where it is really needed, in feedback plugin. Remove checks for
Windows NT.
Avoid old IPv4-only inet_aton, which generated the warning.
Diffstat (limited to 'sql/mysql_install_db.cc')
-rw-r--r-- | sql/mysql_install_db.cc | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc index 30f2d4f6526..b4af5cc79ed 100644 --- a/sql/mysql_install_db.cc +++ b/sql/mysql_install_db.cc @@ -524,28 +524,6 @@ static int set_directory_permissions(const char *dir, const char *os_user) } -/* - Give directory permissions for special service user NT SERVICE\servicename - this user is available only on Win7 and later. -*/ - -void grant_directory_permissions_to_service() -{ - char service_user[MAX_PATH+ 12]; - OSVERSIONINFO info; - info.dwOSVersionInfoSize= sizeof(info); - GetVersionEx(&info); - if (info.dwMajorVersion >6 || - (info.dwMajorVersion== 6 && info.dwMinorVersion > 0) - && opt_service) - { - my_snprintf(service_user,sizeof(service_user), "NT SERVICE\\%s", - opt_service); - set_directory_permissions(opt_datadir, service_user); - } -} - - /* Create database instance (including registering as service etc) .*/ static int create_db_instance() @@ -668,7 +646,6 @@ static int create_db_instance() if (opt_service && opt_service[0]) { ret= register_service(); - grant_directory_permissions_to_service(); if (ret) goto end; } |