Commit 718b556f authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

MDEV-3847 : MSI installer does not work.

- Fix bug in bootstrapper. 

- Also, delete innodb log files cafter bootstrapping , to workaround
"different log size" Innodb error during the first service start by MSI. 
This is a temporary measure, in the future innodb will allow handling 
different file size more gracefully.
parent 679b8dc1
...@@ -569,7 +569,7 @@ static int create_db_instance() ...@@ -569,7 +569,7 @@ static int create_db_instance()
for (i=0; mysql_bootstrap_sql[i]; i++) for (i=0; mysql_bootstrap_sql[i]; i++)
{ {
/* Write the bootstrap script to stdin. */ /* Write the bootstrap script to stdin. */
if (fwrite(mysql_bootstrap_sql, strlen(mysql_bootstrap_sql[i]), 1, in) != 1) if (fwrite(mysql_bootstrap_sql[i], strlen(mysql_bootstrap_sql[i]), 1, in) != 1)
{ {
verbose("ERROR: Cannot write to mysqld's stdin"); verbose("ERROR: Cannot write to mysqld's stdin");
ret= 1; ret= 1;
...@@ -625,6 +625,14 @@ static int create_db_instance() ...@@ -625,6 +625,14 @@ static int create_db_instance()
goto end; goto end;
} }
/*
Remove innodb log files if they exist (this works around "different size logs"
error in MSI installation). TODO : remove this with the next Innodb, where
different size is handled gracefully.
*/
DeleteFile("ib_logfile0");
DeleteFile("ib_logfile1");
/* Create my.ini file in data directory.*/ /* Create my.ini file in data directory.*/
ret= create_myini(); ret= create_myini();
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment