Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
7fe2dddb
Commit
7fe2dddb
authored
Apr 05, 2020
by
Otto Kekäläinen
Committed by
Vicențiu-Marian Ciorbaru
Apr 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up logcheck.ignore.* configs and unify MariaDB.org links with https
parent
b8092a3c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
24 deletions
+20
-24
Docs/INSTALL-BINARY
Docs/INSTALL-BINARY
+1
-1
debian/mariadb-server-10.5.logcheck.ignore.server
debian/mariadb-server-10.5.logcheck.ignore.server
+2
-4
debian/mariadb-server-10.5.logcheck.ignore.workstation
debian/mariadb-server-10.5.logcheck.ignore.workstation
+2
-4
mysql-test/README
mysql-test/README
+3
-3
scripts/mysql_install_db.sh
scripts/mysql_install_db.sh
+9
-9
scripts/mytop.sh
scripts/mytop.sh
+3
-3
No files found.
Docs/INSTALL-BINARY
View file @
7fe2dddb
...
...
@@ -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: http
s
://mariadb.org/jira
See the instructions at
https://mariadb.com/kb/en/mariadb-community-bug-reporting
...
...
debian/mariadb-server-10.5.logcheck.ignore.server
View file @
7fe2dddb
...
...
@@ -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 http
s
://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'$
...
...
debian/mariadb-server-10.5.logcheck.ignore.workstation
View file @
7fe2dddb
...
...
@@ -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 http
s
://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'$
...
...
mysql-test/README
View file @
7fe2dddb
...
...
@@ -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/.
http
s
://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.
http
s
://mariadb.org/jira about it.
The latest information about mysql-test-run can be found at:
https://mariadb.com/kb/en/mariadb/mysqltest/
...
...
scripts/mysql_install_db.sh
View file @
7fe2dddb
#!/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 http
s
://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 http
s
://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 http
s
://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 http
s
://mariadb.org/."
echo
"You can find additional information about the MySQL part at:"
echo
"http://dev.mysql.com"
echo
"http
s
://dev.mysql.com"
echo
"Consider joining MariaDB's strong and vibrant community:"
echo
"https://mariadb.org/get-involved/"
echo
...
...
scripts/mytop.sh
View file @
7fe2dddb
...
...
@@ -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<http
s
://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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment