-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
MDEV-36531 Enable Feedback Plugin for DEB Packages #4021
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: 11.8
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,6 +52,10 @@ | |
<!-- Disable advertised shortcuts weirdness --> | ||
<Property Id="DISABLEADVTSHORTCUTS" Secure="yes" Value="1"/> | ||
|
||
<!-- Activate feedback plugin--> | ||
<Property Id="FEEDBACK" Secure="yes"/> | ||
|
||
|
||
<!-- Quick configuration : set default storage engine to innodb, use strict sql_mode --> | ||
<Property Id="STDCONFIG" Secure="yes" Value="1"/> | ||
|
||
|
@@ -167,6 +171,43 @@ | |
</Control> | ||
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" /> | ||
</Dialog> | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think dedicating full extra dialog to something that unimportant is bad user experience. It should be less clicking, not more clicking, and definitely not for feedback plugin. So, can you instead place that checkbox into an existing dialog, where database properties are configured? Now, that UTF8 checkbox is effectively a no-op, and needs to go, its screen real estate can be used by something else, e.g feedback thing. It needs of course less text, so we can cut Clarification- it turns out, in the last 10 years, This information was not used by the developers to improve MariaDB. Enabling this plugin was not an easy way to help with MariaDB development. Collected statistics, and more information on the plugin, could not be viewed at http://mariadb.org/feedback_plugin, most of the times. Also, please fix the comment. This checkbox was never ever enabled by default, I'm not sure what the comment was referring to. |
||
<!-- Feedback dialog --> | ||
<Dialog Id="Feedback" Width="370" Height="270" Title="[ProductName] Setup" NoMinimize="yes"> | ||
|
||
<Control Id="CheckBoxFeedback" Type="CheckBox" X="8" Y="61" Width="360" Height="12" Property="FEEDBACK" CheckBoxValue="1" TabSkip="no"> | ||
<Text>{\Font1}Enable the Feedback plugin and submit anonymous usage information</Text> | ||
</Control> | ||
|
||
<Control Id="Text" Type="Text" X="23" Y="82" Width="290" Height="55"> | ||
<Text>Feedback plugin for MariaDB, if enabled, collects basic anonymous statistical information. This information is used by the developers to improve MariaDB. Enabling this plugin is an easy way to help with MariaDB development. Collected statistics, and more information on the plugin, can be viewed at http://mariadb.org/feedback_plugin</Text> | ||
</Control> | ||
|
||
<Control Id="MoreInfo" Type="PushButton" X="23" Y="140" Width="56" Height="17" Text="More Info" ToolTip="http://mariadb.org/feedback_plugin" > | ||
<Publish Property="WixShellExecTarget" Value="http://mariadb.org/feedback_plugin" Order="1">1</Publish> | ||
<Publish Event="DoAction" Value="LaunchUrl" Order="2">1</Publish> | ||
</Control> | ||
|
||
|
||
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back"> | ||
<Publish Event="NewDialog" Value="ServicePortDlg">1</Publish> | ||
</Control> | ||
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next"> | ||
<Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish> | ||
</Control> | ||
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel"> | ||
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> | ||
</Control> | ||
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="WixUI_Bmp_Banner" /> | ||
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes"> | ||
<Text>Submit usage information</Text> | ||
</Control> | ||
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> | ||
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes"> | ||
<Text>{\WixUI_Font_Title}[ProductName] setup</Text> | ||
</Control> | ||
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" /> | ||
</Dialog> | ||
|
||
<!-- Error popup dialog --> | ||
<Dialog Id="WarningDlg" Width="320" Height="85" Title="[ProductName] Setup" NoMinimize="yes"> | ||
|
@@ -327,7 +368,7 @@ | |
</Publish> | ||
<Publish Event="DoAction" Value="CheckDatabaseProperties">NOT WarningText</Publish> | ||
<Publish Event="SpawnDialog" Value="WarningDlg">WarningText</Publish> | ||
<Publish Event="NewDialog" Value="VerifyReadyDlg">Not WarningText</Publish> | ||
<Publish Event="NewDialog" Value="Feedback">Not WarningText</Publish> | ||
</Control> | ||
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="no" Text="Cancel"> | ||
<Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> | ||
|
@@ -358,7 +399,7 @@ | |
NOT Installed AND UpgradableServiceFound | ||
</Publish> | ||
|
||
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ServicePortDlg" Order="3" ><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish> | ||
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="Feedback" Order="3" ><![CDATA[&DBInstance=3 AND NOT !DBInstance=3]]></Publish> | ||
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3"> <![CDATA[OLDERVERSIONBEINGUPGRADED <>""]]></Publish> | ||
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfirmDataCleanupDlg" Order="1" ><![CDATA[(&DBInstance=2) AND (!DBInstance=3)]]></Publish> | ||
|
||
|
@@ -456,6 +497,19 @@ | |
Key="innodb_buffer_pool_size" | ||
Value="[BUFFERPOOLSIZE]M" /> | ||
</Component> | ||
<Component Id="C.feedback" Guid="*" Directory="DATADIR"> | ||
<Condition>FEEDBACK</Condition> | ||
<RegistryValue Root='HKLM' | ||
Key='SOFTWARE\@CPACK_WIX_PACKAGE_NAME@' | ||
Name='FEEDBACK' Value='1' Type='string' KeyPath='yes'/> | ||
<IniFile Id="Ini5" | ||
Action="createLine" | ||
Directory="DATADIR" | ||
Section="mysqld" | ||
Name="my.ini" | ||
Key="feedback" | ||
Value="OFF" /> | ||
</Component> | ||
|
||
<Component Id="C.utf8" Guid="*" Directory="DATADIR"> | ||
<Condition>UTF8</Condition> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
http://mariadb.org/feedback_plugin says 404 not found. The MR in Debian links to https://mariadb.org/about/statistics/ which seems to redirect to https://mariadb.org/about/#usage-statistics, which links to pages that are all broken.