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

	Commit message (Collapse)	Author	Age	Files	Lines
*	mysqlreport update to 4.0, see MDEV-573 for more informations	Jean Weisbuch	2016-02-17	1	-101/+429
\|
*	MDEV-9484 - Typo fixes	Daniel Dent	2016-02-17	2	-2/+2
\|
*	MDEV-9259 Add missing mroonga files to Debian packaging in 10.1	Sergei Golubchik	2016-01-25	1	-0/+3
\|
*	MDEV-9081 - Debian: insecure debian-sys-maint password handling	Sergey Vojtovich	2015-12-22	1	-0/+2
\| \| \| \| \| \|	Set umask so that newly created file is not readable by others. This is a quick fix to close security gap. To be replaced by MDEV-8375 - passwordless root login.
*	Merge branch '10.0' into 10.1	Sergei Golubchik	2015-12-21	2	-2/+1
\|\
\| *	Merge branch '5.5' into 10.0	Sergei Golubchik	2015-12-13	1	-1/+1
\| \|\
\| \| *	fix debian logrotate slow log filename	Christian Loos	2015-12-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	debian/additions/my.cnf sets slow_query_log_file to /var/log/mysql/mariadb-slow.log. Update the filename to rotate the slow log file.
\| * \|	Force installation of MariaDB version of mysql-common	Otto Kekäläinen	2015-12-11	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make dependency on mysql-common package in debian/control versioned to force that it is installed together with the other mariadb-* packages. This ensures that the init.d and systemd files for MariaDB mysqld are the ones from MariaDB.org repos.
\| * \|	Make autobake-deb.sh to omit .git directory from source tar.gz	Otto Kekäläinen	2015-12-11	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is useful for developers who run autobake-deb.sh directly from the source tree as the resulting source tar package will be 90% smaller and all operations regarding it consequently 10x faster.
\| * \|	Add MySQL 5.6 stanzas next to MySQL 5.5 in debian/control file	Otto Kekäläinen	2015-12-11	1	-10/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should make the provides/breaks/replaces/conflicts lines work properly when upgrading from mysql-5.6 to mariadb-packages. Conflicts: debian/control
\| * \|	Run wrap-and-sort for debian/* files. No functional changes.	Otto Kekäläinen	2015-12-11	2	-95/+185
\| \| \|
\| * \|	Replace two identical debian/control files with a single one	Otto Kekäläinen	2015-12-11	3	-290/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The only difference between the files was the Debian standards line by one micro version. There was no logical motivation why there was separate control file for Debian and Ubuntu. The new debian/control file lives directly at the correct location and has the correct contents. Modify autobake.sh to take into account new control file location.
* \| \|	MDEV-9227 : Both CentOS service names mysql and mariadb exist?	Nirbhay Choubey	2015-12-09	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As 10.1 has systemd support, there is no longer need to set _SYSTEMCTL_SKIP_REDIRECT/SYSTEMD_NO_WRAP.
* \| \|	switch from myisam_recover to myisam_recover_options	Christian Loos	2015-12-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	myisam_recover is only an alias for myisam_recover_options. Use the option name instead of the alias is more correct. This also avoids an note about the use of an alias instead of the option name on every server start.
* \| \|	Merge branch 'github/10.0-galera' into 10.1	Sergei Golubchik	2015-11-19	1	-1/+11
\|\ \ \
\| * \ \	Merge branch '5.5-galera' into 10.0-galera	Nirbhay Choubey	2015-09-25	1	-1/+11
\| \|\ \ \
\| \| * \| \|	MDEV-8803: Debian jessie 8.2 + MariaDB 10.1.7 + GaleraCluster	Nirbhay Choubey	2015-09-15	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Merge fix for issue #127 from mysql-wsrep (commit : a0ba0d7) * Also, cherry-picked a similar fix for OpenSUSE (commit : 7790cb1)
\| \| * \| \|	MDEV-8804: bootstrap command missing in debian init script	Nirbhay Choubey	2015-09-15	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 'bootstrap' to debian init script.
\| \| * \| \|	Merge tag 'mariadb-5.5.44' into 5.5-galera	Nirbhay Choubey	2015-06-21	4	-23/+23
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	Update galera package name	Nirbhay Choubey	2015-03-04	2	-2/+2
\| \| \| \| \|
\| \| * \| \|	Merge branch '5.5' into 5.5-galera	Nirbhay Choubey	2015-02-18	3	-3/+3
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge banch 5.5 till revision : fdd6c11 - MDEV-7419 Function cli_safe_read not exported Conflicts: .bzrignore debian/dist/Debian/mariadb-galera-server-5.5.files.in debian/dist/Ubuntu/mariadb-galera-server-5.5.files.in storage/tokudb/CMakeLists.txt support-files/build-tags
\| \| * \| \| \|	MDEV-7204: mariadb-galera-server el7 rpms packaging	Nirbhay Choubey	2014-12-09	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issue, no mariadb-server in provides MDEV-7233: Fix issue with missing dependency socat when installing MariaDB-galera-server on RedhatEL/OracleEL/(Others?) RPM based * Added mariadb-server to "provides" for MariaDB Galera server package. (rpm) * Removed "socat" from MariaDB Galera server's mandatory dependency list. (rpm) * Moved "socat" from mandatory to optional dependency. (deb)
\| \| * \| \| \|	bzr merge -rtag:mariadb-5.5.40 maria/5.5	Nirbhay Choubey	2014-10-09	2	-10/+12
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Moved wsrep_slave_threads to optional settings.	Nirbhay Choubey	2014-09-24	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Updated config files:	Nirbhay Choubey	2014-09-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Removed QC restriction - Added bind-address Fixed file permissions for wsrep_sst_rsync.sh.
\| \| * \| \| \| \|	MDEV-6495: innodb_flush_log_at_trx_commit=0 as suggestion	Nirbhay Choubey	2014-08-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for galera vs =2 Updated innodb_flush_log_at_trx_commit value in cnfs as per recommendation.
\| \| * \| \| \| \|	MDEV-3896: More user-friendly cnf files in MariaDB-Galera rpm/deb	Nirbhay Choubey	2014-07-17	1	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	packages * Added "galera" as default option group. * Updated deb/rpm server config files to include mandatory and optional settings (as comments) required to configure Galera cluster.
\| \| * \| \| \| \|	bzr merge -rtag:mariadb-5.5.38 maria/5.5	Nirbhay Choubey	2014-06-10	26	-766/+2
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Added rsync to galera server's debian/rpm dependency list.	Nirbhay Choubey	2014-05-29	2	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Removing rsync from the debian build dependency list.	Nirbhay Choubey	2014-05-27	2	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Setting the "Standards-Version" in Debian control file	Nirbhay Choubey	2014-05-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	back to 3.8.3.
\| \| * \| \| \| \| \|	MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' is	Nirbhay Choubey	2014-05-25	2	-7/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not in the dependency list Added socat, grep, gawk, iproute, coreutils, findutils to the dependency list.
\| \| * \| \| \| \| \|	MDEV#5925: New mariadb-galera-test packages	Nirbhay Choubey	2014-05-12	5	-8/+164
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added logic for generation of 'galera' test packages.
\| \| * \| \| \| \| \|	MDEV-6204: wsrep_sst_rsync timeout when lsof is not installed	Nirbhay Choubey	2014-05-03	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Added a check for lsof * Added rsync & lsof to debian dependency list. * Merged r3982 from codership-mysql/wsrep-5.5.
\| \| * \| \| \| \| \|	* Adding wsrep_sst_xtrabackup-v2 to deb servermariadb-galera-5.5.37	Nirbhay Choubey	2014-04-25	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	files * Updated .bzrignore
\| \| * \| \| \| \| \|	Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.	Jan Lindström	2014-04-16	3	-7/+9
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Modified debian scripts to make galera packages	Nirbhay Choubey	2014-03-14	33	-601/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	self-contained.
\| \| * \| \| \| \| \| \|	Debian script fixes.	Nirbhay Choubey	2014-03-13	35	-57/+300
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	MDEV #5682 : Incompatible galera / mariadb-galera-server	Nirbhay Choubey	2014-02-20	2	-16/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	version on Debian Updated galera package version to >=25.2 in Debian/Ubuntu control files.
\| \| * \| \| \| \| \| \|	Merge of maria/5.5 into maria-5.5-galera.	Nirbhay Choubey	2014-01-29	7	-13/+351
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bzr merge -r tag:mariadb-5.5.35 maria/5.5
\| \| * \| \| \| \| \| \| \|	fix debian buildsmariadb-galera-5.5.34	Sergei Golubchik	2013-12-11	6	-259/+70
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	MDEV-5430: Debian MariaDB-Galera packages do not get built in buildbot [Part 4]	Jan Lindström	2013-12-11	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Missed one file name change.
\| \| * \| \| \| \| \| \| \|	MDEV-5428: Debian MariaDB-Galera packages do not get built in buildbot [Part 3]	Jan Lindström	2013-12-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Missed one lintian rule.
\| \| * \| \| \| \| \| \| \|	Additional name fixes.	Jan Lindström	2013-12-10	5	-9/+9
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	MDEV-5423: Debian MariaDB-Galera packages do not get built in buildbot [Part 2]	Jan Lindström	2013-12-10	6	-16/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: Server name is mariadb-galera-5.5
\| \| * \| \| \| \| \| \| \|	MDEV-5385: Debian MariaDB-Galera packages do not get built in buildbot	Jan Lindström	2013-12-05	2	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Analysis: File names were incorrect for distribution files. Fix: Fixed file names to be same as in 5.5.
\| \| * \| \| \| \| \| \| \|	MDEV-5385: Debian MariaDB-Galera packages do not get built in buildbot	Jan Lindström	2013-12-04	2	-0/+150
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added missing .in files and updated CMakeLists.txt to contain galera specific files.
\| \| * \| \| \| \| \| \| \|	Merge with MariaDB 5.5.34.	Jan Lindström	2013-11-25	5	-5/+11
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Fix merge error.	Jan Lindström	2013-09-27	2	-4/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	mariadb-5.5.33a merge	Jan Lindström	2013-09-27	2	-0/+4
\| \| \|\ \ \ \ \ \ \ \ \