1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-3993 - add MSI installer option to set character-set-server=utf8

Browse Source
This commit is contained in:
Vladislav Vaintroub 2013-01-01 15:33:25 +01:00
parent 5a99c5f58e
commit 6e7e3f80ee
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
win/packaging/extra.wxs.in
View File

@ -43,6 +43,8 @@
<Property Id="SKIPNETWORKING" Secure="yes"/> <Property Id="SKIPNETWORKING" Secure="yes"/>
<!-- Whether to keep default (unauthenticated) user. Default is no--> <!-- Whether to keep default (unauthenticated) user. Default is no-->
<Property Id="DEFAULTUSER" Secure="yes"/> <Property Id="DEFAULTUSER" Secure="yes"/>
<!-- Set server character set to UTF8 -->
<Property Id="UTF8" Secure="yes"/>
<!-- Whether to data on uninstall (default yes, after asking user consent) --> <!-- Whether to data on uninstall (default yes, after asking user consent) -->
<Property Id="CLEANUPDATA" Secure="yes" Value="1"/> <Property Id="CLEANUPDATA" Secure="yes" Value="1"/>
<!-- Force per machine installation --> <!-- Force per machine installation -->
@ -272,6 +274,10 @@
<Text>Please note: this setting can lead to insecure systems.</Text> <Text>Please note: this setting can lead to insecure systems.</Text>
</Control> </Control>
<Control Id="CheckBoxUTF8" Type="CheckBox" X="8" Y="215" Width="250" Height="18" Property="UTF8" CheckBoxValue="1" TabSkip="no">
<Text>{\Font1}Use UTF8 as default server's character set</Text>
</Control>
<!-- Navigation buttons--> <!-- Navigation buttons-->
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back"> <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back">
<Publish Event="NewDialog" Value="CustomizeDlg">1</Publish> <Publish Event="NewDialog" Value="CustomizeDlg">1</Publish>
@ -519,6 +525,20 @@
Value="ON" /> Value="ON" />
</Component> </Component>
<Component Id="C.utf8" Guid="*" Directory="DATADIR">
<Condition>UTF8</Condition>
<RegistryValue Root='HKLM'
Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
Name='UTF8' Value='1' Type='string' KeyPath='yes'/>
<IniFile Id="Ini6"
Action="createLine"
Directory="DATADIR"
Section="mysqld"
Name="my.ini"
Key="character-set-server"
Value="utf8" />
</Component>
<!--- Grant service account permission to the database folder (Windows 7 and later) --> <!--- Grant service account permission to the database folder (Windows 7 and later) -->
<Component Id="C.serviceaccount.permission" Guid="*" Directory='DATADIR' Transitive='yes'> <Component Id="C.serviceaccount.permission" Guid="*" Directory='DATADIR' Transitive='yes'>
<Condition><![CDATA[SERVICENAME AND (VersionNT > 600)]]></Condition> <Condition><![CDATA[SERVICENAME AND (VersionNT > 600)]]></Condition>