Skip to content

Commit 496ba6a

Browse files
committed
MDEV-36532 Enable Feedback Plugin for Windows
Replace the now-redundant utf8 checkbox with the enable-feedback checkbox.
1 parent c517f0e commit 496ba6a

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

win/packaging/extra.wxs.in

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,16 @@
4343
<Property Id="SKIPNETWORKING" Secure="yes"/>
4444
<!-- Whether to keep default (unauthenticated) user. Default is no-->
4545
<Property Id="DEFAULTUSER" Secure="yes"/>
46-
<!-- Set server character set to UTF8 -->
47-
<Property Id="UTF8" Secure="yes"/>
4846
<!-- Whether to data on uninstall (default yes, after asking user consent) -->
4947
<Property Id="CLEANUPDATA" Secure="yes" Value="1"/>
5048
<!-- Force per machine installation -->
5149
<Property Id="ALLUSERS" Secure="yes" Value="1"/>
5250
<!-- Disable advertised shortcuts weirdness -->
5351
<Property Id="DISABLEADVTSHORTCUTS" Secure="yes" Value="1"/>
5452

53+
<!-- Activate feedback plugin-->
54+
<Property Id="FEEDBACK" Secure="yes"/>
55+
5556
<!-- Quick configuration : set default storage engine to innodb, use strict sql_mode -->
5657
<Property Id="STDCONFIG" Secure="yes" Value="1"/>
5758

@@ -227,9 +228,14 @@
227228
<Condition Action="disable">NOT ModifyRootPassword</Condition>
228229
</Control>
229230

230-
<Control Id="CheckBoxUTF8" Type="CheckBox" X="8" Y="154" Width="250" Height="18" Property="UTF8" CheckBoxValue="1" TabSkip="no">
231-
<Text>{\Font1}Use UTF8 as default server's character set</Text>
231+
<Control Id="CheckBoxFeedback" Type="CheckBox" X="8" Y="150" Width="350" Height="18" Property="FEEDBACK" CheckBoxValue="1" TabSkip="no">
232+
<Text>{\Font1}Enable the Feedback plugin and submit anonymous usage information</Text>
233+
</Control>
234+
235+
<Control Id="LinkFeedbackPlugin" Type="Hyperlink" X="23" Y="167" Width="350" Height="18" TabSkip="yes">
236+
<Text>Collected statistics can be viewed at <![CDATA[<a href="https://mariadb.org/feedback-plugin">https://mariadb.org/feedback-plugin</a>]]></Text>
232237
</Control>
238+
233239
<Control Type="Text" Id="Text11" Width="67" Height="17" X="8" Y="190" Text="{\Font1}Data directory" />
234240
<Control Type="PathEdit" Id="TxtDir" Width="175" Height="18" X="80" Y="190" Property="DATADIR">
235241
</Control>
@@ -456,19 +462,18 @@
456462
Key="innodb_buffer_pool_size"
457463
Value="[BUFFERPOOLSIZE]M" />
458464
</Component>
459-
460-
<Component Id="C.utf8" Guid="*" Directory="DATADIR">
461-
<Condition>UTF8</Condition>
465+
<Component Id="C.feedback" Guid="*" Directory="DATADIR">
466+
<Condition>FEEDBACK</Condition>
462467
<RegistryValue Root='HKLM'
463468
Key='SOFTWARE\@CPACK_WIX_PACKAGE_NAME@'
464-
Name='UTF8' Value='1' Type='string' KeyPath='yes'/>
465-
<IniFile Id="Ini6"
469+
Name='FEEDBACK' Value='1' Type='string' KeyPath='yes'/>
470+
<IniFile Id="Ini5"
466471
Action="createLine"
467472
Directory="DATADIR"
468473
Section="mysqld"
469474
Name="my.ini"
470-
Key="character-set-server"
471-
Value="utf8mb4" />
475+
Key="feedback"
476+
Value="ON" />
472477
</Component>
473478

474479
<!-- Shortcuts in program menu (mysql client etc) -->

0 commit comments

Comments
 (0)