Merge 10.2 into bb-10.2-mariarocks

4 files changed, 29 insertions, 69 deletions

diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt
index 1682bae6986..d33516044f6 100644
--- a/win/packaging/CMakeLists.txt
+++ b/win/packaging/CMakeLists.txt
@@ -51,7 +51,7 @@ IF(MSVC_VERSION EQUAL 1600 OR MSVC_VERSION EQUAL 1700 )
   SET(WIX_MSVC_SUFFIX "VS2010")
 ELSEIF(MSVC_VERSION EQUAL 1800)
   SET(WIX_MSVC_SUFFIX "VS2013")
-ELSEIF (MSVC_VERSION EQUAL 1900)
+ELSE()
   SET(WIX_MSVC_SUFFIX "VS2015")
 ENDIF()
 
diff --git a/win/packaging/COPYING.rtf b/win/packaging/COPYING.rtf
index 9370fbcaa0c..ba5fa3f31f0 100644
--- a/win/packaging/COPYING.rtf
+++ b/win/packaging/COPYING.rtf
@@ -2,7 +2,7 @@
 {\stylesheet{ Normal;}{\s1 heading 1;}{\s2 heading 2;}}
 \viewkind4\uc1\pard\s2\sb100\sa100\b\f0\fs24 GNU GENERAL PUBLIC LICENSE\par
 \pard\sb100\sa100\b0\fs20 Version 2, June 1991 \par
-\pard Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\fs24  \par
+\pard Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\fs24  \par
 \pard\s2\sb100\sa100\b Preamble\par
 \pard\sb100\sa100\b0\fs20 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. \par
 When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. \par
@@ -48,7 +48,7 @@ NO WARRANTY \par
 How to Apply These Terms to Your New Programs\fs20\par
 \pard\sb100\sa100\b0 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. \par
 To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. \par
-\pard one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. \par
+\pard one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. \par
 \pard\sb100\sa100 Also add information on how to contact you by electronic and paper mail. \par
 If the program is interactive, make it output a short notice like this when it starts in an interactive mode: \par
 \pard Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. \par
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp
index 56df4ae791e..9a174b8529e 100644
--- a/win/packaging/ca/CustomAction.cpp
+++ b/win/packaging/ca/CustomAction.cpp
@@ -11,7 +11,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 #ifndef UNICODE
 #define UNICODE
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index 016f6a8a97f..3aba129fdf3 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -12,7 +12,7 @@
 
     <!-- If Innodb is compiled in, enable "optimize for transactions" checkbox -->
     <?ifndef HaveInnodb ?>
-      <?define HaveInnodb="0"?>
+      <?define HaveInnodb="1"?>
     <?endif?>
 
     <Property Id="PortTemplate" Value="#####" />
@@ -55,13 +55,14 @@
     <!-- Activate feedback plugin-->
     <Property Id="FEEDBACK" Secure="yes"/>
 
-    <?if $(var.HaveInnodb) = "1" ?>
-      <!-- Quick configuration : set default storage engine to innodb, use strict sql_mode -->
-      <Property Id="STDCONFIG" Secure="yes" Value="1"/>
-    <?endif?>
+
+    <!-- Quick configuration : set default storage engine to innodb, use strict sql_mode -->
+    <Property Id="STDCONFIG" Secure="yes" Value="1"/>
+
     <!-- Innodb Buffer pool size in MB-->
     <Property Id="BUFFERPOOLSIZE" Secure="yes"/>
-
+    <!-- Innodb page size -->
+    <Property Id="PAGESIZE" Secure="yes" Value="16K"/>
 
     <CustomAction Id="LaunchUrl" BinaryKey="WixCA" DllEntry="WixShellExec"  Execute="immediate" Return="check" Impersonate="yes" />
 
@@ -267,18 +268,7 @@
           <Condition Action="disable">NOT ModifyRootPassword</Condition>
         </Control>
 
-        <Control Id="CheckBoxCreateDefaultUser" Type="CheckBox" X="8" Y="154" Width="200" Height="18" Property="DEFAULTUSER"
-                 CheckBoxValue="--default-user" TabSkip="no">
-          <Text>{\Font1}Create An Anonymous Account</Text>
-        </Control>
-        <Control Id="Text14" Type="Text" X="21" Y="174" Width="268" Height="16" TabSkip="yes">
-          <Text>This option will create an anonymous account on this server. </Text>
-        </Control>
-        <Control Id="Text13" Type="Text" X="21" Y="190" Width="254" Height="24" TabSkip="yes">
-          <Text>Please note: this setting can lead to insecure systems.</Text>
-        </Control>
-
-        <Control Id="CheckBoxUTF8" Type="CheckBox" X="8" Y="215" Width="250" Height="18" Property="UTF8" CheckBoxValue="1" TabSkip="no">
+        <Control Id="CheckBoxUTF8" Type="CheckBox" X="8" Y="154" Width="250" Height="18" Property="UTF8" CheckBoxValue="1" TabSkip="no">
           <Text>{\Font1}Use UTF8 as default server's character set</Text>
         </Control>
 
@@ -336,29 +326,23 @@
           <Condition Action="disable">Not EnableNetworking</Condition>
         </Control>
 
-        <?if $(var.HaveInnodb) = "1" ?>
-        <Control Id="CheckBoxStandardConfig" Type="CheckBox" Height="18" Width="220" X="9" Y="171" Property="STDCONFIG" CheckBoxValue="1">
-          <Text>{\Font1}Optimize for transactions</Text>
-        </Control>
-
-        <Control Id="StandardConfigExplain" Type="Text" X="25" Y="190" Width="270" Height="14" TabSkip="yes">
-          <Text>(Uses transactional storage engine and "strict" SQL mode)</Text>
-          <Condition Action="enable" >STDCONFIG</Condition>
-          <Condition Action="disable">Not STDCONFIG</Condition>
-        </Control>
-        <Control Id="LabelInnodbBufferpool" Type="Text" Height="17" Width="77" X="25" Y="210" Text="Buffer pool size:" >
-        <Condition Action="enable" >STDCONFIG</Condition>
-          <Condition Action="disable">Not STDCONFIG</Condition>
-        </Control>
-        <Control Id="BPSize" Type="MaskedEdit" X="104" Y="208" Width="40" Height="15" Property="BUFFERPOOLSIZE"  Sunken="yes" Text="[BufferPoolSizeTemplate]">
-          <Condition Action="enable" >STDCONFIG</Condition>
-          <Condition Action="disable">Not STDCONFIG</Condition>
+        <Control Id="LabelInnodbSettings" Type="Text" Height="18" Width="220" X="25" Y="171" >
+          <Text>{\Font1}Innodb engine settings</Text>
         </Control>
-        <Control Id="LabelMB" Type="Text" Height="17" Width="15" X="150" Y="210" Text="MB" >
-        <Condition Action="enable" >STDCONFIG</Condition>
-          <Condition Action="disable">Not STDCONFIG</Condition>
+        <Control Id="LabelInnodbBufferpool" Type="Text" Height="17" Width="77" X="25" Y="190" Text="Buffer pool size:" />
+        <Control Id="BPSize" Type="MaskedEdit" X="104" Y="188" Width="40" Height="15" Property="BUFFERPOOLSIZE"  Sunken="yes" Text="[BufferPoolSizeTemplate]"/>
+        <Control Id="LabelMB" Type="Text" Height="17" Width="15" X="150" Y="190" Text="MB" />
+        <Control Id="LabelInnodbPageSize" Type="Text" Height="17" Width="77" X="25" Y="208" Text="Page size:" />
+        <Control Id="LabelKB" Type="Text" Height="17" Width="15" X="150" Y="210" Text="KB" />
+        <Control Id="ComboBoxInnodbPageSize" Type="ComboBox" X="104" Y="208" Width="30" Height="17" ComboList="yes" Sorted="yes" Property="PAGESIZE" >
+        <ComboBox Property="PAGESIZE">
+          <ListItem Text=" 4" Value="4K"/>
+          <ListItem Text=" 8" Value="8K"/>
+          <ListItem Text="16" Value="16K"/>
+          <ListItem Text="32" Value="32K"/>
+          <ListItem Text="64" Value="64K"/>
+        </ComboBox>
         </Control>
-       <?endif?>
 
         <!-- Navigation buttons-->
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back">
@@ -493,26 +477,11 @@
         <ServiceControl Id='DBInstanceServiceStop' Name='[SERVICENAME]'  Stop='both' Remove='uninstall' Wait='yes'/>
         <ServiceControl Id='DBInstanceServiceStart' Name='[SERVICENAME]' Start='install' Wait='yes'/>
       </Component>
-      <?if $(var.HaveInnodb) = "1" ?>
+
       <Component Id="C.myiniconfig" Guid="*" Directory="DATADIR">
-      <Condition>STDCONFIG</Condition>
         <RegistryValue Root='HKLM'
            Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@'
            Name='STDCONFIG' Value='1' Type='string' KeyPath='yes'/>
-        <IniFile Id="Ini1"
-            Action="createLine"
-            Directory="DATADIR"
-            Section="mysqld"
-            Name="my.ini"
-            Key="sql_mode"
-            Value="&quot;STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION&quot;" />
-        <IniFile Id="Ini2"
-            Action="createLine"
-            Directory="DATADIR"
-            Section="mysqld"
-            Name="my.ini"
-            Key="default_storage_engine"
-            Value="innodb" />
         <IniFile Id="Ini3"
             Action="createLine"
             Directory="DATADIR"
@@ -520,16 +489,7 @@
             Name="my.ini"
             Key="innodb_buffer_pool_size"
             Value="[BUFFERPOOLSIZE]M" />
-        <IniFile Id="Ini4"
-            Action="createLine"
-            Directory="DATADIR"
-            Section="mysqld"
-            Name="my.ini"
-            Key="innodb_log_file_size"
-            Value="[LOGFILESIZE]M" />
       </Component>
-      <?endif?>
-     
       <Component Id="C.feedback" Guid="*" Directory="DATADIR">
         <Condition>FEEDBACK</Condition>
         <RegistryValue Root='HKLM'
@@ -699,7 +659,7 @@
     <CustomAction Id='PresetDatabaseProperties' BinaryKey='wixca.dll' DllEntry='PresetDatabaseProperties' />
     <CustomAction Id="CreateDatabaseCommand" Property="CreateDatabase"
     Value=
-    "&quot;[#F.bin.mysql_install_db.exe]&quot;  &quot;--service=[SERVICENAME]&quot; --port=[PORT] &quot;--password=[ESCAPEDPASSWORD]&quot; &quot;--datadir=[DATADIR]\&quot; [SKIPNETWORKING] [ALLOWREMOTEROOTACCESS] [DEFAULTUSER] --verbose-bootstrap"
+    "&quot;[#F.bin.mysql_install_db.exe]&quot;  &quot;--service=[SERVICENAME]&quot; --port=[PORT] --innodb-page-size=[PAGESIZE] &quot;--password=[ESCAPEDPASSWORD]&quot; &quot;--datadir=[DATADIR]\&quot; [SKIPNETWORKING] [ALLOWREMOTEROOTACCESS] [DEFAULTUSER] --verbose-bootstrap"
      Execute="immediate"
      HideTarget="yes"
      />