database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source 
FIXME: Part of the MDEV-20699 test is disabled due to
nonderterministic result.
This commit is contained in:
Marko Mäkelä
2021-09-30 09:04:43 +03:00
parent e5a9dcfda2 57fdd016ce
commit 064cb58efe
34 changed files with 483 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/mysql_upgrade_service.cc
View File

@ -269,7 +269,7 @@ void stop_mysqld_service()
}
/*
Remeber initial state of the service, we will restore it on
Remember initial state of the service, we will restore it on
exit.
*/
if(initial_service_state == UINT_MAX)
@ -490,8 +490,10 @@ int main(int argc, char **argv)
CopyFile(service_properties.inifile, my_ini_bck, FALSE);
upgrade_config_file(service_properties.inifile);
log("Phase %d/%d: Ensuring innodb slow shutdown%s", ++phase, max_phases,
old_mysqld_exe_exists?",this can take some time":"(skipped)");
bool do_start_stop_server = old_mysqld_exe_exists && initial_service_state != SERVICE_RUNNING;
log("Phase %d/%d: Start and stop server in the old version, to avoid crash recovery %s", ++phase, max_phases,
do_start_stop_server?",this can take some time":"(skipped)");
char socket_param[FN_REFLEN];
sprintf_s(socket_param, "--socket=mysql_upgrade_service_%u",
@ -499,11 +501,11 @@ int main(int argc, char **argv)
DWORD start_duration_ms = 0;
if (old_mysqld_exe_exists)
if (do_start_stop_server)
{
/* Start/stop server with --loose-innodb-fast-shutdown=0 */
/* Start/stop server with --loose-innodb-fast-shutdown=1 */
mysqld_process = (HANDLE)run_tool(P_NOWAIT, service_properties.mysqld_exe,
defaults_file_param, "--loose-innodb-fast-shutdown=0", "--skip-networking",
defaults_file_param, "--loose-innodb-fast-shutdown=1", "--skip-networking",
"--enable-named-pipe", socket_param, "--skip-slave-start", NULL);
if (mysqld_process == INVALID_HANDLE_VALUE)