Skip to content

Commit 7fe2ddd

Browse files
ottokcvicentiu
authored andcommitted
Clean up logcheck.ignore.* configs and unify MariaDB.org links with https
1 parent b8092a3 commit 7fe2ddd

6 files changed

+20
-24
lines changed

Docs/INSTALL-BINARY

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ However most documentation at www.mysql.com also applies.
3333
first.
3434

3535
If you run into problems and need to file a bug report,
36-
please report them to: http://mariadb.org/jira
36+
please report them to: https://mariadb.org/jira
3737

3838
See the instructions at
3939
https://mariadb.com/kb/en/mariadb-community-bug-reporting

debian/mariadb-server-10.5.logcheck.ignore.server

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was
1616
mysqld_safe\[[0-9]+\]: ?$
1717
mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
1818
mysqld_safe\[[0-9]+\]: ended$
19-
mysqld_safe\[[0-9]+\]: http://www.mysql.com$
2019
mysqld_safe\[[0-9]+\]: NOTE: If you are upgrading from a MySQL <= 3.22.10 you should run$
2120
mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
22-
mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$
21+
mysqld_safe\[[0-9]+\]: Please report any problems at https://mariadb.org/jira$
2322
mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
2423
mysqld_safe\[[0-9]+\]: started$
25-
mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$
26-
mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$
24+
mysqld_safe\[[0-9]+\]: The latest information about MariaDB is available at$
2725
mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$
2826
mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$
2927
mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$

debian/mariadb-server-10.5.logcheck.ignore.workstation

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@ mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was
1616
mysqld_safe\[[0-9]+\]: ?$
1717
mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
1818
mysqld_safe\[[0-9]+\]: ended$
19-
mysqld_safe\[[0-9]+\]: http://www.mysql.com$
2019
mysqld_safe\[[0-9]+\]: NOTE: If you are upgrading from a MySQL <= 3.22.10 you should run$
2120
mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
22-
mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$
21+
mysqld_safe\[[0-9]+\]: Please report any problems at https://mariadb.org/jira$
2322
mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
2423
mysqld_safe\[[0-9]+\]: started$
25-
mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$
26-
mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$
24+
mysqld_safe\[[0-9]+\]: The latest information about MariaDB is available at$
2725
mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$
2826
mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$
2927
mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$

mysql-test/README

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ If the result is incorrect, you have found a bug. In this case, you should
8686
edit the test result to the correct results so that we can verify that
8787
the bug is corrected in future releases.
8888

89-
If you want to submit your test case you can send it
89+
If you want to submit your test case you can send it
9090
to [email protected] or attach it to a bug report on
91-
http://mariadb.org/jira/.
91+
https://mariadb.org/jira/.
9292

9393
If the test case is really big or if it contains 'not public' data,
9494
then put your .test file and .result file(s) into a tar.gz archive,
9595
add a README that explains the problem, ftp the archive to
9696
ftp://ftp.askmonty.org/private and submit a report to
97-
http://mariadb.org/jira about it.
97+
https://mariadb.org/jira about it.
9898

9999
The latest information about mysql-test-run can be found at:
100100
https://mariadb.com/kb/en/mariadb/mysqltest/

scripts/mysql_install_db.sh

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#!/bin/sh
22
# Copyright (c) 2000, 2013, Oracle and/or its affiliates.
33
# Copyright (c) 2009, 2013, Monty Program Ab
4-
#
4+
#
55
# This program is free software; you can redistribute it and/or modify
66
# it under the terms of the GNU General Public License as published by
77
# the Free Software Foundation; version 2 of the License.
8-
#
8+
#
99
# This program is distributed in the hope that it will be useful,
1010
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1111
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1212
# GNU General Public License for more details.
13-
#
13+
#
1414
# You should have received a copy of the GNU General Public License
1515
# along with this program; if not, write to the Free Software
1616
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
@@ -76,7 +76,7 @@ Usage: $0 [OPTIONS]
7676
--force Causes mysql_install_db to run even if DNS does not
7777
work. In that case, grant table entries that
7878
normally use hostnames will use IP addresses.
79-
--help Display this help and exit.
79+
--help Display this help and exit.
8080
--ldata=path The path to the MariaDB data directory. Same as
8181
--datadir.
8282
--no-defaults Don't read default options from any option file.
@@ -593,7 +593,7 @@ else
593593
echo "the maria-discuss email list at https://launchpad.net/~maria-discuss"
594594
echo
595595
echo "Please check all of the above before submitting a bug report"
596-
echo "at http://mariadb.org/jira"
596+
echo "at https://mariadb.org/jira"
597597
echo
598598
exit 1
599599
fi
@@ -636,7 +636,7 @@ then
636636
fi
637637

638638
echo
639-
echo "See the MariaDB Knowledgebase at http://mariadb.com/kb or the"
639+
echo "See the MariaDB Knowledgebase at https://mariadb.com/kb or the"
640640
echo "MySQL manual for more instructions."
641641

642642
if test "$in_rpm" -eq 0
@@ -650,11 +650,11 @@ then
650650
fi
651651

652652
echo
653-
echo "Please report any problems at http://mariadb.org/jira"
653+
echo "Please report any problems at https://mariadb.org/jira"
654654
echo
655-
echo "The latest information about MariaDB is available at http://mariadb.org/."
655+
echo "The latest information about MariaDB is available at https://mariadb.org/."
656656
echo "You can find additional information about the MySQL part at:"
657-
echo "http://dev.mysql.com"
657+
echo "https://dev.mysql.com"
658658
echo "Consider joining MariaDB's strong and vibrant community:"
659659
echo "https://mariadb.org/get-involved/"
660660
echo

scripts/mytop.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@ sub GetData()
12771277
{
12781278
## To have a computed value of "Progress" like the
12791279
## "SHOW PROCESSLIST" one, the Progress column of the query
1280-
## must be replaced by :
1280+
## must be replaced by :
12811281
## "CASE WHEN Max_Stage < 2 THEN Progress ELSE
12821282
## (Stage-1)/Max_Stage*100+Progress/Max_Stage END AS Progress"
12831283
$proc_cmd = "SELECT /*mytop*/ Id, User, Host, db, Command,
@@ -1439,7 +1439,7 @@ sub GetData()
14391439
## Trailing space removal
14401440
$thread->{Info} =~ s/\s$//;
14411441

1442-
## Put the first letter of the query uppercase for a better readability
1442+
## Put the first letter of the query uppercase for a better readability
14431443
## with long State strings
14441444
$thread->{Info} = ucfirst $thread->{Info};
14451445

@@ -2082,7 +2082,7 @@ B<mytop> [options]
20822082
20832083
Base version from B<http://www.mysqlfanboy.com/mytop-3>.
20842084
2085-
This version comes as part of the B<MariaDB> distribution. See B<http://mariadb.org/>.
2085+
This version comes as part of the B<MariaDB> distribution. See B<https://mariadb.org/>.
20862086
20872087
And older (the original) version B<mytop> is available from
20882088
http://www.mysqlfanboy.com/mytop-3/ it B<might> also be on CPAN as

0 commit comments

Comments
 (0)