[Commits] Rev 3477: MDEV-3847 : MSI installer does not work. in file:///H:/bzr/10.0/

Vladislav Vaintroub wlad at montyprogram.com
Fri Nov 9 19:23:20 EET 2012


At file:///H:/bzr/10.0/

------------------------------------------------------------
revno: 3477
revision-id: wlad at montyprogram.com-20121109172310-yj7dmtyfjiugoyc9
parent: wlad at montyprogram.com-20121106212013-iaojf2m619t5ya37
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 10.0
timestamp: Fri 2012-11-09 18:23:10 +0100
message:
  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.
-------------- next part --------------
=== modified file 'sql/mysql_install_db.cc'
--- a/sql/mysql_install_db.cc	2012-10-19 18:38:59 +0000
+++ b/sql/mysql_install_db.cc	2012-11-09 17:23:10 +0000
@@ -569,7 +569,7 @@
   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 @@
     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)



More information about the commits mailing list