Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ following services to the MariaDB community:
- Bug fixing in MariaDB (for bugs that affects a large part of the community)
- Building the official MariaDB binaries
- Maintaining https://mariadb.org
- Documenting MariaDB in the MariaDB Documentation https://mariadb.com/kb
- Documenting MariaDB in the MariaDB Documentation https://mariadb.com/docs

To be able to do the above we need help from corporations and individuals!

Expand Down
10 changes: 5 additions & 5 deletions Docs/INSTALL-BINARY
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ MariaDB and MySQL have identical install methods. In this document we
describe how to install MariaDB.

The full documentation for installing MariaDB can be found at
https://mariadb.com/kb/en/library/binary-packages/
https://mariadb.com/docs/server/server-management/install-and-upgrade-mariadb/installing-mariadb/binary-packages
However most documentation at www.mysql.com also applies.

2.2. Installing MariaDB from Generic Binaries on Unix/Linux
Expand Down Expand Up @@ -36,7 +36,7 @@ However most documentation at www.mysql.com also applies.
please report them to: https://mariadb.org/jira

See the instructions at
https://mariadb.com/kb/en/mariadb-community-bug-reporting
https://mariadb.com/docs/general-resources/community/community/bug-tracking/reporting-bugs

The basic commands that you must execute to install and use a
MariaDB binary distribution are:
Expand Down Expand Up @@ -83,7 +83,7 @@ shell> useradd -g mysql mysql
shell> cd /usr/local

3. Obtain a distribution file using the instructions at
https://mariadb.com/kb/en/library/where-to-download-mariadb/
https://mariadb.com/docs/server/clients-and-utilities/server-client-software/download/where-to-download-mariadb
The description below describes how to install a MariaDB tar file.

4. Unpack the distribution, which creates the installation
Expand Down Expand Up @@ -152,7 +152,7 @@ shell> chown -R mysql data
location where your system has its startup files. More
information can be found in the support-files/mysql.server
script itself and at
https://mariadb.com/kb/en/starting-and-stopping-mariadb-automatically.
https://mariadb.com/docs/server/server-management/starting-and-stopping-mariadb/starting-and-stopping-mariadb-automatically
10. You can set up new accounts using the bin/mysql_setpermission
script if you install the DBI and DBD::MariaDB Perl modules. See
Section 4.6.14, "mysql_setpermission --- Interactively Set
Expand Down Expand Up @@ -184,7 +184,7 @@ shell> bin/mysqld_safe --user=mysql &
directory.

More information about mysqld_safe can be found at
https://mariadb.com/kb/en/mysqld_safe
https://mariadb.com/docs/server/clients-and-utilities/legacy-clients-and-utilities/mariadbd_safe

Note

Expand Down
2 changes: 1 addition & 1 deletion INSTALL-SOURCE
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Instructions for building MariaDB can be found at:
https://mariadb.com/kb/en/compiling-mariadb-from-source
https://mariadb.com/docs/server/server-management/install-and-upgrade-mariadb/compiling-mariadb-from-source

2 changes: 1 addition & 1 deletion INSTALL-WIN-SOURCE
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Up-to-date instructions about building MariaDB on Windows can be found
at: https://mariadb.com/kb/en/Building_MariaDB_on_Windows
at: https://mariadb.com/docs/server/server-management/install-and-upgrade-mariadb/compiling-mariadb-from-source/building_mariadb_on_windows

2 changes: 1 addition & 1 deletion KNOWN_BUGS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ that we are can try to fix it for the next release. You can also add
feature request to the JIRA.

The latest documentation for the MariaDB server can be found at:
https://mariadb.com/kb
https://mariadb.com/docs
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ A description of the MariaDB project and a manual can be found at:

https://mariadb.org

https://mariadb.com/kb/en/
https://mariadb.com/docs/

https://mariadb.com/kb/en/mariadb-vs-mysql-features/
https://mariadb.com/docs/release-notes/community-server/about/compatibility-and-differences/mariadb-vs-mysql-features

https://mariadb.com/kb/en/mariadb-versus-mysql-compatibility/
https://mariadb.com/docs/release-notes/community-server/about/compatibility-and-differences/mariadb-vs-mysql-compatibility

https://mariadb.com/kb/en/new-and-old-releases/
https://mariadb.com/docs/release-notes

# Getting the code, building it and testing it

Expand Down
4 changes: 2 additions & 2 deletions client/mysqlcheck.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@ static void usage(void)
printf("Usage: %s [OPTIONS] database [tables]\n", my_progname);
printf("OR %s [OPTIONS] --databases DB1 [DB2 DB3...]\n",
my_progname);
puts("Please consult the MariaDB Knowledge Base at");
puts("https://mariadb.com/kb/en/mysqlcheck for latest information about");
puts("Please consult the MariaDB Documentation at");
puts("https://mariadb.com/docs/server/clients-and-utilities/legacy-clients-and-utilities/mysqlcheck for latest information about");
puts("this program.");
print_defaults("my", load_default_groups);
puts("");
Expand Down
2 changes: 1 addition & 1 deletion client/mysqltest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
Tool used for executing a .test file
See the "MySQL Test framework manual" for more information
https://mariadb.com/kb/en/library/mysqltest/
https://mariadb.com/docs/server/clients-and-utilities/testing-tools/mariadb-test
Please keep the test framework tools identical in all versions!
Expand Down
2 changes: 1 addition & 1 deletion cmake/cpack_rpm.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ SET(CPACK_RPM_PACKAGE_DESCRIPTION "MariaDB: a very fast and robust SQL database
It is GPL v2 licensed, which means you can use the it free of charge under the
conditions of the GNU General Public License Version 2 (http://www.gnu.org/licenses/).
MariaDB documentation can be found at https://mariadb.com/kb
MariaDB documentation can be found at https://mariadb.com/docs
MariaDB bug reports should be submitted through https://jira.mariadb.org")

# mariabackup
Expand Down
2 changes: 1 addition & 1 deletion cmake/mysql_version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ SET_IF_UNSET(CPACK_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
It is GPL v2 licensed, which means you can use the it free of charge under the
conditions of the GNU General Public License Version 2 (http://www.gnu.org/licenses/).
MariaDB documentation can be found at https://mariadb.com/kb
MariaDB documentation can be found at https://mariadb.com/docs
MariaDB bug reports should be submitted through https://jira.mariadb.org
")
Expand Down
2 changes: 1 addition & 1 deletion debian/additions/mariadb.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Run program with --help to get a list of available options and with
# --print-defaults to see which it would actually understand and use.
#
# If you are new to MariaDB, check out https://mariadb.com/kb/en/basic-mariadb-articles/
# If you are new to MariaDB, check out https://mariadb.com/docs/server/server-usage/basics

#
# This group is read both by the client and the server
Expand Down
2 changes: 1 addition & 1 deletion debian/additions/mariadb.conf.d/50-mysqld_safe.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# SyslogLevel = err
# SyslogIdentifier = mysqld
#
# For more information, please read https://mariadb.com/kb/en/mariadb/systemd/
# For more information, please read https://mariadb.com/docs/server/server-management/starting-and-stopping-mariadb/systemd

[mysqld_safe]
# This will be passed to all mysql clients
Expand Down
4 changes: 2 additions & 2 deletions debian/additions/mariadb.conf.d/50-server.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ expire_logs_days = 10
#

# For documentation, please read
# https://mariadb.com/kb/en/securing-connections-for-client-and-server/
# https://mariadb.com/docs/server/security/encryption/data-in-transit-encryption/securing-connections-for-client-and-server
#ssl-ca = /etc/mysql/cacert.pem
#ssl-cert = /etc/mysql/server-cert.pem
#ssl-key = /etc/mysql/server-key.pem
Expand All @@ -104,7 +104,7 @@ collation-server = utf8mb4_general_ci
# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
# Read the manual for more InnoDB related options. There are many!
# Most important is to give InnoDB 80 % of the system RAM for buffer use:
# https://mariadb.com/kb/en/innodb-system-variables/#innodb_buffer_pool_size
# https://mariadb.com/docs/server/server-usage/storage-engines/innodb/innodb-system-variables#innodb_buffer_pool_size
#innodb_buffer_pool_size = 8G

# this is only for embedded server
Expand Down
2 changes: 1 addition & 1 deletion debian/additions/mariadb.conf.d/60-galera.cnf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# * Galera-related settings
#
# See the examples of server wsrep.cnf files in /usr/share/mysql
# and read more at https://mariadb.com/kb/en/galera-cluster/
# and read more at https://mariadb.com/docs/galera-cluster

[galera]
# Mandatory settings
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ Description: Backup tool for MariaDB server
Based on Xtrabackup, but improved to work with MariaDB server.
This backup tool is guaranteed to be compatible with MariaDB server.
.
Please refer to the MariaDB Knowledge Base on more information on
Please refer to the MariaDB Documentation on more information on
how to use this tool.

Package: mariadb-plugin-connect
Expand Down
8 changes: 4 additions & 4 deletions debian/mariadb-server.README.Debian
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ name has been kept as a symbolic link to the new name for backwards compatibilit
From MariaDB 10.1 onward the upstream mariadb.service and mariadb@.service are
used to provide the full systemd experience. Some features available in
traditional /etc/init.d/mysql have been changed. For details see
https://mariadb.com/kb/en/mariadb/systemd/
https://mariadb.com/docs/server/server-management/starting-and-stopping-mariadb/systemd


* MIXING PACKAGES FROM MARIADB.ORG AND OFFICIAL DEBIAN REPOSITORIES
Expand Down Expand Up @@ -99,7 +99,7 @@ that script will try to do things that are already prevented, and might fail.
===========================

The privilege tables are automatically updated so all there is left is read
the release notes on https://mariadb.com/kb/en/release-notes/ to see if any
the release notes on https://mariadb.com/docs/release-notes to see if any
changes affect custom apps.

There should not be any need to run 'mysql_upgrade' manually, as the upgrade
Expand Down Expand Up @@ -132,7 +132,7 @@ immediately check your firewall rules or network routes.
* WHERE IS THE DOCUMENTATION?
=============================

https://mariadb.com/kb
https://mariadb.com/docs


* PASSWORDS
Expand Down Expand Up @@ -169,7 +169,7 @@ be chmod 0600 (-rw------- username usergroup .my.cnf) to ensure that nobody else
can read it. Every other configuration parameter can be stored there, too.

For more information in the MariaDB manual in/usr/share/doc/mariadb-doc or
https://mariadb.com/kb/en/configuring-mariadb-with-mycnf/.
https://mariadb.com/docs/server/server-management/install-and-upgrade-mariadb/configuring-mariadb/configuring-mariadb-with-option-files


* FURTHER NOTES ON REPLICATION
Expand Down
2 changes: 1 addition & 1 deletion debian/mariadb-server.mysql.default
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
# See also:
# https://wiki.debian.org/Teams/pkg-systemd/Packaging#overriding_options_and_.2Fetc.2Fdefault_handling
# https://mariadb.com/kb/en/mariadb/systemd/
# https://mariadb.com/docs/server/server-management/starting-and-stopping-mariadb/systemd
#
# Note also that MariaDB systemd does _not_ utilize mysqld_safe.

Expand Down
4 changes: 2 additions & 2 deletions extra/innochecksum.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ static struct my_option innochecksum_options[] = {
{"verbose", 'v', "Verbose (prints progress every 5 seconds).",
&verbose, &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
#ifndef DBUG_OFF
{"debug", '#', "Output debug log. See https://mariadb.com/kb/en/library/creating-a-trace-file/",
{"debug", '#', "Output debug log. See https://mariadb.com/docs/server/reference/product-development/mariadb-fault-finding",
&dbug_setting, &dbug_setting, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
#endif /* !DBUG_OFF */
{"count", 'c', "Print the count of pages in the file and exits.",
Expand Down Expand Up @@ -1263,7 +1263,7 @@ static void usage(void)
"[-p <page>] [-i] [-v] [-a <allow mismatches>] [-n] "
"[-S] [-D <page type dump>] "
"[-l <log>] [-l] [-m <merge pages>] <filename or [-]>\n", my_progname);
printf("See https://mariadb.com/kb/en/library/innochecksum/"
printf("See https://mariadb.com/docs/server/clients-and-utilities/administrative-tools/innochecksum"
" for usage hints.\n");
my_print_help(innochecksum_options);
my_print_variables(innochecksum_options);
Expand Down
2 changes: 1 addition & 1 deletion include/mysql/service_progress_report.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
if requested.
The functions are documented at
https://mariadb.com/kb/en/progress-reporting/#how-to-add-support-for-progress-reporting-to-a-storage-engine
https://mariadb.com/docs/server/reference/product-development/mariadb-internals/using-mariadb-with-your-programs-api
*/

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion man/galera_new_cluster.1
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ Display a help message and exit\&.
.sp
.SH "SEE ALSO"
For more information on configuration and usage see
https://mariadb.com/kb/en/mariadb/getting-started-with-mariadb-galera-cluster/
https://mariadb.com/docs/galera-cluster/galera-cluster-quickstart-guides/mariadb-galera-cluster-guide
2 changes: 1 addition & 1 deletion man/myrocks_hotbackup.1
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@ starting backup.
debugging purpose: waiting until the specified file is
created
.SH "SEE ALSO"
For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
For more information, please refer to the MariaDB Documentation, available online at https://mariadb.com/docs
.SH AUTHOR
MariaDB Foundation (http://www.mariadb.org/).
2 changes: 1 addition & 1 deletion man/mysql_ldb.1
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ mariadb-ldb \- RocksDB tool (mysql_ldb is now a symlink to mariadb-ldb)
.SH DESCRIPTION
Use \fBmysql_ldb \-\-help\fR for details on usage\.
.PP
For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
For more information, please refer to the MariaDB Documentation, available online at https://mariadb.com/docs
5 changes: 0 additions & 5 deletions man/mysqlcheck.1
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,8 @@ note : The storage engine for the table doesn't support check
.\}
.PP
If
<<<<<<< HEAD:man/mysqlcheck.1
\fBmysqlcheck\fR
is unable to repair a table, see the MariaDB Knowledge Base
=======
\fBmariadb-check\fR
is unable to repair a table, see the MariaDB Documentation
>>>>>>> 894af99358b (edit KB to documentation):man/mariadb-check.1
for manual table repair strategies\&. This will be the case, for example, for
InnoDB
tables, which can be checked with
Expand Down
6 changes: 3 additions & 3 deletions mysql-test/README
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ To clean up afterwards, remove the created "var" subdirectory, e.g.
If tests fail on your system, please read the following manual section
for instructions on how to report the problem:

https://mariadb.com/kb/en/reporting-bugs
https://mariadb.com/docs/general-resources/community/community/bug-tracking/reporting-bugs

If you want to use an already running MySQL server for specific tests,
use the --extern option to mysql-test-run. Please note that in this mode,
Expand Down Expand Up @@ -94,7 +94,7 @@ ftp://ftp.mariadb.org/private and submit a report to
https://mariadb.org/jira about it.

The latest information about mysql-test-run can be found at:
https://mariadb.com/kb/en/mariadb/mysqltest/
https://mariadb.com/docs/server/clients-and-utilities/testing-tools/mariadb-test

If you want to create .rdiff files, check
https://mariadb.com/kb/en/mariadb/mysql-test-auxiliary-files/
https://mariadb.com/docs/server/clients-and-utilities/testing-tools/mariadb-test/mariadb-test-auxiliary-files
5 changes: 3 additions & 2 deletions mysql-test/main/ps_missed_cmds.result
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,8 @@ DEALLOCATE PREPARE stmt_4;
DROP TABLE t1;
# Test case 10: Check that the HELP statement
# is supported by prepared statements
INSERT INTO mysql.help_topic VALUES (0, 'Tamagotchi', 0, 'This digital pet is not a KB article', 'no example', 'https://tamagotchi.com/');
INSERT INTO mysql.help_topic (help_topic_id, help_category_id, name, description, example, url)
VALUES (4294967295, 0, 'Tamagotchi', 'This digital pet is not a KB article', 'no example', 'https://tamagotchi.com/');
PREPARE stmt_1 FROM "HELP `Tamagotchi`";
EXECUTE stmt_1;
name description example
Expand All @@ -253,7 +254,7 @@ Tamagotchi This digital pet is not a KB article no example
EXECUTE stmt_1;
name description example
Tamagotchi This digital pet is not a KB article no example
DELETE FROM mysql.help_topic WHERE help_topic_id = 0;
DELETE FROM mysql.help_topic WHERE help_topic_id = 4294967295;
# Test case 11: Check that the 'CREATE PROCEDURE' statement
# is supported by prepared statements
PREPARE stmt_1 FROM 'CREATE PROCEDURE p1() SET @a=1';
Expand Down
5 changes: 3 additions & 2 deletions mysql-test/main/ps_missed_cmds.test
Original file line number Diff line number Diff line change
Expand Up @@ -270,15 +270,16 @@ DROP TABLE t1;
--echo # Test case 10: Check that the HELP statement
--echo # is supported by prepared statements
# avoid existing articles that may get updated.
INSERT INTO mysql.help_topic VALUES (0, 'Tamagotchi', 0, 'This digital pet is not a KB article', 'no example', 'https://tamagotchi.com/');
INSERT INTO mysql.help_topic (help_topic_id, help_category_id, name, description, example, url)
VALUES (4294967295, 0, 'Tamagotchi', 'This digital pet is not a KB article', 'no example', 'https://tamagotchi.com/');
PREPARE stmt_1 FROM "HELP `Tamagotchi`";
EXECUTE stmt_1;
--echo # Execute the same prepared statement the second time to check that
--echo # no internal structures used for handling the 'HELP' statement
--echo # were damaged.

EXECUTE stmt_1;
DELETE FROM mysql.help_topic WHERE help_topic_id = 0;
DELETE FROM mysql.help_topic WHERE help_topic_id = 4294967295;

--echo # Test case 11: Check that the 'CREATE PROCEDURE' statement
--echo # is supported by prepared statements
Expand Down
5 changes: 3 additions & 2 deletions mysql-test/main/ps_missed_cmds_bin_prot.result
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,12 @@ HANDLER t1 CLOSE;
DROP TABLE t1;
# Test case 10: Check that the statements 'HELP'
# is supported by prepared statements
INSERT INTO mysql.help_topic VALUES (0, 'Tamagotchi', 0, 'This digital pet is not a KB article', 'no example', 'https://tamagotchi.com/');
INSERT INTO mysql.help_topic (help_topic_id, help_category_id, name, description, example, url)
VALUES (4294967295, 0, 'Tamagotchi','This digital pet is not a KB article', 'no example', 'https://tamagotchi.com/');
HELP `Tamagotchi`;
name description example
Tamagotchi This digital pet is not a KB article no example
DELETE FROM mysql.help_topic WHERE help_topic_id = 0;
DELETE FROM mysql.help_topic WHERE help_topic_id = 4294967295;
# Test case 11: Check that the statements CREATE/ALTER/DROP PROCEDURE
# are supported by prepared statements
CREATE PROCEDURE p1() SET @a=1;
Expand Down
5 changes: 3 additions & 2 deletions mysql-test/main/ps_missed_cmds_bin_prot.test
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,10 @@ DROP TABLE t1;
--echo # Test case 10: Check that the statements 'HELP'
--echo # is supported by prepared statements
# avoid existing articles that may get updated.
INSERT INTO mysql.help_topic VALUES (0, 'Tamagotchi', 0, 'This digital pet is not a KB article', 'no example', 'https://tamagotchi.com/');
INSERT INTO mysql.help_topic (help_topic_id, help_category_id, name, description, example, url)
VALUES (4294967295, 0, 'Tamagotchi','This digital pet is not a KB article', 'no example', 'https://tamagotchi.com/');
HELP `Tamagotchi`;
DELETE FROM mysql.help_topic WHERE help_topic_id = 0;
DELETE FROM mysql.help_topic WHERE help_topic_id = 4294967295;

--echo # Test case 11: Check that the statements CREATE/ALTER/DROP PROCEDURE
--echo # are supported by prepared statements
Expand Down
Loading