diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-11-09 18:23:10 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-11-09 18:23:10 +0100 |
| commit | 718b556f67514c5a1d43775ed763be03b809c37e (patch) | |
| tree | 3f770a26152cab8c6d4a63eaf80d794dacffc079 /sql/mysql_install_db.cc | |
| parent | 679b8dc18b206ca297d2f49f488d0a152d679334 (diff) | |
| download | mariadb-git-718b556f67514c5a1d43775ed763be03b809c37e.tar.gz | |
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.
Diffstat (limited to 'sql/mysql_install_db.cc')
| -rw-r--r-- | sql/mysql_install_db.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc index 4dc63d8a28d..6a1ca2e09d3 100644 --- a/sql/mysql_install_db.cc +++ b/sql/mysql_install_db.cc @@ -569,7 +569,7 @@ static int create_db_instance() for (i=0; mysql_bootstrap_sql[i]; i++) { /* 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"); ret= 1; @@ -625,6 +625,14 @@ static int create_db_instance() 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.*/ ret= create_myini(); if (ret) |