From ad5241a8338b6599ab0956460fc1376a7d450293 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 27 Apr 2025 18:04:45 +0200 Subject: [PATCH 1/2] MDEV-36532 Enable Feedback Plugin for Windows Revert "Remove feedback from Windows MSI" (a89f1faf7b) but change the default value to OFF --- win/packaging/extra.wxs.in | 58 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 056a7ec43abdb..a2ed0cf8b2d64 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -52,6 +52,10 @@ + + + + @@ -167,6 +171,43 @@ + + + + + + {\Font1}Enable the Feedback plugin and submit anonymous usage information + + + + 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 + + + + 1 + 1 + + + + + 1 + + + 1 + + + 1 + + + + Submit usage information + + + + {\WixUI_Font_Title}[ProductName] setup + + + @@ -327,7 +368,7 @@ NOT WarningText WarningText - Not WarningText + Not WarningText 1 @@ -358,7 +399,7 @@ NOT Installed AND UpgradableServiceFound - + ""]]> @@ -456,6 +497,19 @@ Key="innodb_buffer_pool_size" Value="[BUFFERPOOLSIZE]M" /> + + FEEDBACK + + + UTF8 From e596aa494d71948d3ac7e80e4f0938fa403407bf Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 27 Apr 2025 20:12:28 +0200 Subject: [PATCH 2/2] MDEV-36531 Enable Feedback Plugin for DEB Packages --- debian/mariadb-server.postinst | 17 +++++++++++++++++ debian/mariadb-server.templates | 10 ++++++++++ 2 files changed, 27 insertions(+) diff --git a/debian/mariadb-server.postinst b/debian/mariadb-server.postinst index ea8de619b5d74..3ebfe174253e2 100644 --- a/debian/mariadb-server.postinst +++ b/debian/mariadb-server.postinst @@ -242,6 +242,23 @@ EOF chown 0:0 $dc chmod 0600 $dc + feedback_cnf=$mariadb_cfgdir/mariadb.conf.d/feedback.cnf + if [ ! -f $feedback_cnf ]; then + if db_input high mariadb-server/feedback_optin; then + db_go || true + fi + db_get mariadb-server/feedback_optin + { + echo "# THIS IS A GENERATED FILE. ALL CHANGES TO IT MIGHT BE LOST."; + echo "[server]"; + if [ "$RET" = true ]; then + echo "feedback=ON"; + else + echo "feedback=OFF"; + fi + } >> $feedback_cnf + fi + # If there is a real AppArmor profile, we reload it. # If the default empty profile is installed, then we remove any old # profile that may be loaded. diff --git a/debian/mariadb-server.templates b/debian/mariadb-server.templates index 3f790bcd25070..3e1426681f632 100644 --- a/debian/mariadb-server.templates +++ b/debian/mariadb-server.templates @@ -43,3 +43,13 @@ _Description: Remove all MariaDB databases? If you're removing the MariaDB package in order to later install a more recent version or if a different mariadb-server package is already using it, the data should be kept. + +Template: mariadb-server/feedback_optin +Type: boolean +Default: false +_Description: Enable the Feedback plugin and submit anonymous usage information? + 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