|
43 | 43 | <Property Id="SKIPNETWORKING" Secure="yes"/>
|
44 | 44 | <!-- Whether to keep default (unauthenticated) user. Default is no-->
|
45 | 45 | <Property Id="DEFAULTUSER" Secure="yes"/>
|
46 |
| - <!-- Set server character set to UTF8 --> |
47 |
| - <Property Id="UTF8" Secure="yes"/> |
48 | 46 | <!-- Whether to data on uninstall (default yes, after asking user consent) -->
|
49 | 47 | <Property Id="CLEANUPDATA" Secure="yes" Value="1"/>
|
50 | 48 | <!-- Force per machine installation -->
|
51 | 49 | <Property Id="ALLUSERS" Secure="yes" Value="1"/>
|
52 | 50 | <!-- Disable advertised shortcuts weirdness -->
|
53 | 51 | <Property Id="DISABLEADVTSHORTCUTS" Secure="yes" Value="1"/>
|
54 | 52 |
|
| 53 | + <!-- Activate feedback plugin--> |
| 54 | + <Property Id="FEEDBACK" Secure="yes"/> |
| 55 | + |
55 | 56 | <!-- Quick configuration : set default storage engine to innodb, use strict sql_mode -->
|
56 | 57 | <Property Id="STDCONFIG" Secure="yes" Value="1"/>
|
57 | 58 |
|
|
227 | 228 | <Condition Action="disable">NOT ModifyRootPassword</Condition>
|
228 | 229 | </Control>
|
229 | 230 |
|
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> |
232 | 237 | </Control>
|
| 238 | + |
233 | 239 | <Control Type="Text" Id="Text11" Width="67" Height="17" X="8" Y="190" Text="{\Font1}Data directory" />
|
234 | 240 | <Control Type="PathEdit" Id="TxtDir" Width="175" Height="18" X="80" Y="190" Property="DATADIR">
|
235 | 241 | </Control>
|
|
456 | 462 | Key="innodb_buffer_pool_size"
|
457 | 463 | Value="[BUFFERPOOLSIZE]M" />
|
458 | 464 | </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> |
462 | 467 | <RegistryValue Root='HKLM'
|
463 | 468 | 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" |
466 | 471 | Action="createLine"
|
467 | 472 | Directory="DATADIR"
|
468 | 473 | Section="mysqld"
|
469 | 474 | Name="my.ini"
|
470 |
| - Key="character-set-server" |
471 |
| - Value="utf8mb4" /> |
| 475 | + Key="feedback" |
| 476 | + Value="ON" /> |
472 | 477 | </Component>
|
473 | 478 |
|
474 | 479 | <!-- Shortcuts in program menu (mysql client etc) -->
|
|
0 commit comments