Index: mysql-5.7.5-m15/sql/mysqld.cc
===================================================================
--- mysql-5.7.5-m15.orig/sql/mysqld.cc
+++ mysql-5.7.5-m15/sql/mysqld.cc
@@ -356,7 +356,7 @@ my_bool opt_super_large_pages= 0;
 my_bool opt_myisam_use_mmap= 0;
 my_bool offline_mode= 0;
 uint   opt_large_page_size= 0;
-volatile uint default_password_lifetime= 0;
+uint default_password_lifetime= 0;
 #if defined(ENABLED_DEBUG_SYNC)
 MYSQL_PLUGIN_IMPORT uint    opt_debug_sync_timeout= 0;
 #endif /* defined(ENABLED_DEBUG_SYNC) */
Index: mysql-5.7.5-m15/sql/mysqld.h
===================================================================
--- mysql-5.7.5-m15.orig/sql/mysqld.h
+++ mysql-5.7.5-m15/sql/mysqld.h
@@ -191,7 +191,7 @@ extern const char *log_output_str;
 extern const char *log_backup_output_str;
 extern char *mysql_home_ptr, *pidfile_name_ptr;
 extern char *default_auth_plugin;
-extern volatile uint default_password_lifetime;
+extern uint default_password_lifetime;
 extern char *my_bind_addr_str;
 extern char glob_hostname[FN_REFLEN], mysql_home[FN_REFLEN];
 extern char pidfile_name[FN_REFLEN], system_time_zone[30], *opt_init_file;