delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	MDEV-26548: replace .mysql_history with .mariadb_history	Daniel Black	2023-01-24	1	-12/+13
\| \| \| \| \| \| \| \| \|	Fall back to using .mysql_history if .mariadb_history isn't present and .mysql_history is present. Also replace the use of MYSQL_HISTFILE as an environment variable with MARIADB_HISTFILE and fall back to using MYSQL_HISTFILE if MARIADB_HISTFILE isn't present.
*	Merge 10.10 into 10.11	Marko Mäkelä	2022-11-30	1	-4/+6
\|\
\| *	Merge 10.9 into 10.10	Marko Mäkelä	2022-11-30	1	-4/+6
\| \|\
\| \| *	Merge 10.8 into 10.9	Marko Mäkelä	2022-11-30	1	-4/+6
\| \| \|\
\| \| \| *	Merge 10.7 into 10.8	Marko Mäkelä	2022-11-30	1	-4/+6
\| \| \| \|\
\| \| \| \| *	Merge 10.6 into 10.7	Marko Mäkelä	2022-11-30	1	-4/+6
\| \| \| \| \|\
\| \| \| \| \| *	Merge 10.5 into 10.6	Marko Mäkelä	2022-11-30	1	-4/+6
\| \| \| \| \| \|\
\| \| \| \| \| \| *	MDEV-23230 wsrep files installed when built without WSREP (#2334)	Daniel Black	2022-11-28	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent wsrep files from being installed if WITH_WSREP=OFF. Reviewed by Daniel Black Additionally excluded #include wsrep files and galera* files along with galera/wsrep tests. mysql-test/include/have_wsrep.inc remainds as its used by a few isolated tests. Co-authored-by: Chris Ross <cross2@cisco.com>
* \| \| \| \| \| \|	Merge 10.10 into 10.11	Marko Mäkelä	2022-11-21	1	-16/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge 10.9 into 10.10	Marko Mäkelä	2022-11-21	1	-16/+3
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Merge 10.8 into 10.9	Marko Mäkelä	2022-11-10	1	-16/+3
\| \| \|\ \ \ \ \ \| \| \| \|/ / / /
\| \| \| * \| \| \|	Merge 10.7 into 10.8	Marko Mäkelä	2022-11-09	1	-16/+3
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / /
\| \| \| \| * \| \|	Merge 10.6 into 10.7	Marko Mäkelä	2022-11-09	1	-16/+3
\| \| \| \| \|\ \ \ \| \| \| \| \| \|/ /
\| \| \| \| \| * \|	Merge 10.5 into 10.6	Marko Mäkelä	2022-11-08	1	-16/+3
\| \| \| \| \| \|\ \ \| \| \| \| \| \| \|/
\| \| \| \| \| \| *	Merge 10.4 into 10.5	Marko Mäkelä	2022-11-08	1	-16/+3
\| \| \| \| \| \| \|\
\| \| \| \| \| \| \| *	Merge 10.3 into 10.4	Marko Mäkelä	2022-11-08	1	-16/+3
\| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| *	Fix duplicate entry in mysqld_safe man page	Ian Gilfillan	2022-11-03	1	-16/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch '10.8' into 10.9	Oleksandr Byelkin	2022-08-09	1	-0/+30
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / /
\| \| \| * \| \| \| \| \|	Merge branch '10.7' into 10.8	Oleksandr Byelkin	2022-08-09	1	-0/+30
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \|/ / / / /
* \| \| \| \| \| \| \| \|	MDEV-22200: maridb-dump add --header option	rmfalves	2022-10-26	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a header row in txt files exported by mariadb-dump --tab Reviewed by: Daniel Black and Dan Lenski
* \| \| \| \| \| \| \| \|	MDEV-29625 Some clients/scripts refer to old slow log variables	Sergei Golubchik	2022-10-04	2	-2/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '10.9' into 10.10	Oleksandr Byelkin	2022-08-09	1	-0/+30
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch '10.8' into 10.9	Oleksandr Byelkin	2022-08-08	1	-0/+30
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch '10.7' into 10.8	Oleksandr Byelkin	2022-08-08	1	-0/+30
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| / / / / / \| \| \| \|/ / / / /
\| \| \| * \| \| \| \|	Merge branch '10.6' into 10.7	Oleksandr Byelkin	2022-08-08	1	-0/+30
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / /
\| \| \| \| * \| \| \|	Merge branch '10.5' into 10.6	Oleksandr Byelkin	2022-08-04	1	-0/+30
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \|/ / /
\| \| \| \| \| * \| \|	Merge branch '10.4' into 10.5	Oleksandr Byelkin	2022-08-04	1	-0/+30
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ /
\| \| \| \| \| \| * \|	Merge branch '10.3' into 10.4	Oleksandr Byelkin	2022-08-03	1	-0/+30
\| \| \| \| \| \| \|\ \ \| \| \| \| \| \| \| \|/
\| \| \| \| \| \| \| *	MDEV-18702 mysqldump: add variable 'max-statement-time'	Mike Griffin	2022-08-02	1	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With a global non-default max-statement-time of a time interval that exceed the query time mysqldump queries when doing a backup. To solve both, add a max-statement-time option, defaulting to 0 (unlimited time). Also like mariabackup, set the session wait_timeout=DEFAULT (28800). The time/processing between mysqldump times isn't expected to get that close ever, but let's adopt the standard of mariabackup as no-one has challenged it has having a detrimental effect. Reviewer and test case author Daniel Black
* \| \| \| \| \| \| \|	Merge 10.9 into 10.10	Marko Mäkelä	2022-06-09	28	-32/+47
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge 10.8 into 10.9	Marko Mäkelä	2022-06-09	28	-32/+32
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge 10.7 into 10.8	Marko Mäkelä	2022-06-09	28	-32/+32
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| \| * \| \| \| \|	Merge 10.6 into 10.7	Marko Mäkelä	2022-06-09	28	-32/+32
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / /
\| \| \| \| * \| \| \|	Merge 10.5 into 10.6	Marko Mäkelä	2022-06-09	28	-32/+32
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \|/ / /
\| \| \| \| \| * \| \|	MDEV-22023 Update man page NAME section to say MariaDB instead of MySQL	Tingyao Nian	2022-06-09	28	-32/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Continue the effort of a previous commit (PR#2114) which changed the man pages titles from MariaDB to MySQL, to further update the man pages. Update the man page NAME sections to use mariadb-* instead of mysql* for MariaDB binaries that are drop-in replacements for MySQL equivalents, indicating that the commands are actually of the MariaDB version. Before: NAME mysql_upgrade - check tables for MariaDB upgrade ... After: NAME mariadb-upgrade - check tables for MariaDB upgrade (mysql_upgrade is now a symlink to mariadb-upgrade) ... All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc.
\| * \| \| \| \| \| \|	Merge 10.8 into 10.9	Marko Mäkelä	2022-06-07	1	-0/+15
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge 10.7 into 10.8	Marko Mäkelä	2022-06-06	1	-0/+15
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| \| * \| \| \| \|	Merge 10.6 into 10.7	Marko Mäkelä	2022-06-06	1	-0/+15
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / /
\| \| \| \| * \| \| \|	Merge 10.5 into 10.6	Marko Mäkelä	2022-06-02	1	-0/+15
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \|/ / /
\| \| \| \| \| * \| \|	Merge 10.4 into 10.5	Marko Mäkelä	2022-06-02	1	-0/+15
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \|/ /
\| \| \| \| \| \| * \|	Merge 10.3 into 10.4	Marko Mäkelä	2022-06-02	1	-0/+15
\| \| \| \| \| \| \|\ \ \| \| \| \| \| \| \| \|/
\| \| \| \| \| \| \| *	Add option --enable-cleartext-plugin to the MariaDB client	Ting Nian	2022-05-26	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For compatibility reasons, add the option to the MariaDB client without any functional changes besides simply accepting the option and emitting a warning that it is obsolete. In MySQL this security related option is compulsory in certain use cases. When users switch to MariaDB, this client command that used to work starts failing without a sensible error message. In worst case users resort to re-installing the mysql client from MySQL. In MariaDB the option is obsolete and should simply be ignored. Users however don't have any opportunity to learn that unless the client program tells them so. Before: mysql --enable-cleartext-plugin ... mysql: unknown option '--enable-cleartext-plugin' (program terminates) After: mysql --enable-cleartext-plugin ... WARNING: option '--enable-cleartext-plugin' is obsolete. (program executes) All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc.
\| \| \| \| * \| \| \|	man: merge error in mysqld.8	Daniel Black	2022-05-24	1	-5/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge 10.9 into 10.10	Marko Mäkelä	2022-05-25	58	-143/+62
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge 10.8 into 10.9	Marko Mäkelä	2022-05-25	58	-143/+58
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	man: adjust major version to 10.8	Marko Mäkelä	2022-05-25	58	-58/+58
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge 10.7 into 10.8	Marko Mäkelä	2022-05-25	32	-32/+32
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / /
\| \| \| * \| \| \| \|	man: adjust major version to 10.7	Daniel Black	2022-05-24	32	-36/+32
\| \| \| \|/ / / /
\| \| \| * \| \| \|	Merge branch 10.5 into 10.6	Daniel Black	2022-05-24	28	-27/+31
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / /
\| \| \| \| * \| \|	MDEV-22023 Update man pages titles to say MariaDB instead of MySQL	Tingyao Nian	2022-05-24	28	-28/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When reading the man page of e.g. 'mysql' on a system with MariaDB installed one would actually see the man page of 'mariadb'. However the man page had no indication of the page being for 'mariadb', which was confusing for users. Fix this by updating the man page title lines to use mariadb-* instead of mysql* for MariaDB binaries that are drop-in replacements for MySQL equivalents, indicating that the commands are actually of the MariaDB version. In long term, all the commands in man pages should be replaced by their MariaDB counterparts. Update the title lines as a start, and only those that exist as symlinks to their MariaDB counterparts. Before: man mariadb-upgrade \| head -n 1 MYSQL_UPGRADE(1) ... After: man mariadb-upgrade \| head -n 1 MARIADB-UPGRADE(1) ... All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services, Inc.