Clean up logcheck.ignore.* configs and unify MariaDB.org links with https

6 files changed, 20 insertions, 24 deletions

diff --git a/Docs/INSTALL-BINARY b/Docs/INSTALL-BINARY
index 64d5192a49d..b9153f7cb67 100644
--- a/Docs/INSTALL-BINARY
+++ b/Docs/INSTALL-BINARY
@@ -33,7 +33,7 @@ However most documentation at www.mysql.com also applies.
        first.
 
    If you run into problems and need to file a bug report,
-   please report them to: http://mariadb.org/jira
+   please report them to: https://mariadb.org/jira
 
    See the instructions at
    https://mariadb.com/kb/en/mariadb-community-bug-reporting
diff --git a/debian/mariadb-server-10.5.logcheck.ignore.server b/debian/mariadb-server-10.5.logcheck.ignore.server
index a0b4792ecda..5b7b0322fc3 100644
--- a/debian/mariadb-server-10.5.logcheck.ignore.server
+++ b/debian/mariadb-server-10.5.logcheck.ignore.server
@@ -16,14 +16,12 @@ mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was
 mysqld_safe\[[0-9]+\]: ?$
 mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
 mysqld_safe\[[0-9]+\]: ended$
-mysqld_safe\[[0-9]+\]: http://www.mysql.com$
 mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
 mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
-mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$
+mysqld_safe\[[0-9]+\]: Please report any problems at https://mariadb.org/jira$
 mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
 mysqld_safe\[[0-9]+\]: started$
-mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$
-mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$
+mysqld_safe\[[0-9]+\]: The latest information about MariaDB is available at$
 mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$
 mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$
 mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$
diff --git a/debian/mariadb-server-10.5.logcheck.ignore.workstation b/debian/mariadb-server-10.5.logcheck.ignore.workstation
index a0b4792ecda..5b7b0322fc3 100644
--- a/debian/mariadb-server-10.5.logcheck.ignore.workstation
+++ b/debian/mariadb-server-10.5.logcheck.ignore.workstation
@@ -16,14 +16,12 @@ mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was
 mysqld_safe\[[0-9]+\]: ?$
 mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
 mysqld_safe\[[0-9]+\]: ended$
-mysqld_safe\[[0-9]+\]: http://www.mysql.com$
 mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
 mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
-mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$
+mysqld_safe\[[0-9]+\]: Please report any problems at https://mariadb.org/jira$
 mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
 mysqld_safe\[[0-9]+\]: started$
-mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$
-mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$
+mysqld_safe\[[0-9]+\]: The latest information about MariaDB is available at$
 mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$
 mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$
 mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$
diff --git a/mysql-test/README b/mysql-test/README
index f1c38f11716..6c7f004a54d 100644
--- a/mysql-test/README
+++ b/mysql-test/README
@@ -86,15 +86,15 @@ If the result is incorrect, you have found a bug. In this case, you should
 edit the test result to the correct results so that we can verify that
 the bug is corrected in future releases.
 
-If you want to submit your test case you can send it 
+If you want to submit your test case you can send it
 to maria-developers@lists.launchpad.net or attach it to a bug report on
-http://mariadb.org/jira/.
+https://mariadb.org/jira/.
 
 If the test case is really big or if it contains 'not public' data,
 then put your .test file and .result file(s) into a tar.gz archive,
 add a README that explains the problem, ftp the archive to
 ftp://ftp.askmonty.org/private and submit a report to
-http://mariadb.org/jira about it.
+https://mariadb.org/jira about it.
 
 The latest information about mysql-test-run can be found at:
 https://mariadb.com/kb/en/mariadb/mysqltest/
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 5226c183d46..62d0b3a58c7 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -1,16 +1,16 @@
 #!/bin/sh
 # Copyright (c) 2000, 2013, Oracle and/or its affiliates.
 # Copyright (c) 2009, 2013, Monty Program Ab
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335  USA
@@ -76,7 +76,7 @@ Usage: $0 [OPTIONS]
   --force              Causes mysql_install_db to run even if DNS does not
                        work.  In that case, grant table entries that
                        normally use hostnames will use IP addresses.
-  --help               Display this help and exit.                     
+  --help               Display this help and exit.
   --ldata=path         The path to the MariaDB data directory. Same as
                        --datadir.
   --no-defaults        Don't read default options from any option file.
@@ -593,7 +593,7 @@ else
   echo "the maria-discuss email list at https://launchpad.net/~maria-discuss"
   echo
   echo "Please check all of the above before submitting a bug report"
-  echo "at http://mariadb.org/jira"
+  echo "at https://mariadb.org/jira"
   echo
   exit 1
 fi
@@ -636,7 +636,7 @@ then
   fi
 
   echo
-  echo "See the MariaDB Knowledgebase at http://mariadb.com/kb or the"
+  echo "See the MariaDB Knowledgebase at https://mariadb.com/kb or the"
   echo "MySQL manual for more instructions."
 
   if test "$in_rpm" -eq 0
@@ -650,11 +650,11 @@ then
   fi
 
   echo
-  echo "Please report any problems at http://mariadb.org/jira"
+  echo "Please report any problems at https://mariadb.org/jira"
   echo
-  echo "The latest information about MariaDB is available at http://mariadb.org/."
+  echo "The latest information about MariaDB is available at https://mariadb.org/."
   echo "You can find additional information about the MySQL part at:"
-  echo "http://dev.mysql.com"
+  echo "https://dev.mysql.com"
   echo "Consider joining MariaDB's strong and vibrant community:"
   echo "https://mariadb.org/get-involved/"
   echo
diff --git a/scripts/mytop.sh b/scripts/mytop.sh
index 669d6a82907..c8de6c56f3e 100644
--- a/scripts/mytop.sh
+++ b/scripts/mytop.sh
@@ -1277,7 +1277,7 @@ sub GetData()
             {
                 ## To have a computed value of "Progress" like the
                 ## "SHOW PROCESSLIST" one, the Progress column of the query
-                ## must be replaced by : 
+                ## must be replaced by :
                 ## "CASE WHEN Max_Stage < 2 THEN Progress ELSE
                 ## (Stage-1)/Max_Stage*100+Progress/Max_Stage END AS Progress"
                 $proc_cmd = "SELECT /*mytop*/ Id, User, Host, db, Command,
@@ -1439,7 +1439,7 @@ sub GetData()
         ## Trailing space removal
         $thread->{Info} =~ s/\s$//;
 
-        ## Put the first letter of the query uppercase for a better readability 
+        ## Put the first letter of the query uppercase for a better readability
         ## with long State strings
         $thread->{Info} = ucfirst $thread->{Info};
 
@@ -2082,7 +2082,7 @@ B<mytop> [options]
 
 Base version from B<http://www.mysqlfanboy.com/mytop-3>.
 
-This version comes as part of the B<MariaDB> distribution. See B<http://mariadb.org/>.
+This version comes as part of the B<MariaDB> distribution. See B<https://mariadb.org/>.
 
 And older (the original) version B<mytop> is available from
 http://www.mysqlfanboy.com/mytop-3/ it B<might> also be on CPAN as