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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove debian/dist/* and have just one version	Otto Kekäläinen	2015-07-21	9	-1239/+0
\| \| \| \| \| \|	Use the slightly better Ubuntu version in both Ubuntu and Debian and latest versions of Debian don't have problems with AppArmor files included in packaging.
*	Merge tag 'mariadb-10.0.20' into 10.1	Sergei Golubchik	2015-06-27	1	-17/+42
\|\
\| *	MDEV-5977 MariaDB 10.0 is not installable on Trusty when "trusty-updates ↵	Sergei Golubchik	2015-06-17	1	-16/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	universe" is in sources.list fix upgrade[2] tests on trusty and utopic: add missing conflicts/replaces, client-10.0 should conflict/replace client-5.5. reformat other conflicts/replaces lines to make them easier to read and merge
\| *	Merge branch '5.5' into 10.0	Sergei Golubchik	2015-06-11	1	-1/+6
\| \|\
\| \| *	MDEV-4608 deb packages for jessie	Sergei Golubchik	2015-06-03	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jessie has newer automake so build-depends could not be satisfied. refresh build-depends, remove automake, libtool, doxygen, texlive-latex-base, ghostscript.
* \| \|	Update galera package name/version for debian	Nirbhay Choubey	2015-04-15	1	-1/+1
\| \| \|
* \| \|	add encryption plugins to deb packages	Sergei Golubchik	2015-04-10	1	-0/+1
\| \| \|
* \| \|	MDEV-7874 deb package installation fails with "dpkg: dependency problems ↵	Elena Stepanova	2015-03-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prevent configuration of mariadb-server" Added usr/share/mysql/maria_add_gis_sp_bootstrap.sql to the file lists
* \| \|	Merge branch '10.0' into 10.1	Sergei Golubchik	2015-03-07	1	-3/+4
\|\ \ \ \| \|/ /
\| * \|	MDEV-7520 gtid replication broken during upgrade to debian 10.0.16	Sergei Golubchik	2015-02-22	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't binlog mariadb setup sql statements: * use "mysql_install_db --disable-log-bin" * use "mysqld --bootstrap --disable-log-bin" * use "SET sql_log_bin=0"
\| * \|	fix after 5.5 merge, debian packaging	Sergei Golubchik	2015-02-20	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* oqgraph is in a separate package in 10.0 * sphinx udf is in the ha_sphinx.so
\| * \|	Merge branch '5.5' into 10.0	Sergei Golubchik	2015-02-18	2	-1/+3
\| \|\ \ \| \| \|/
\| \| *	MDEV-7351 5.5 build fails on Ubuntu Utopic in buildbot	Sergei Golubchik	2015-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	include oqgraph into deb packages conditionally, just like we do with tokudb
\| \| *	MDEV-7519 debian / ubuntu packaging creation of plugin table (if not exists)	Elena Stepanova	2015-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously IF NOT EXISTS was added in Debian version in revno 3543. Now added the same for Ubuntu.
* \| \|	MDEV-7305 Difficulties building cracklib_password_check	Sergei Golubchik	2015-02-17	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	put cracklib_password_check into a separate package. build it conditionally on Debian/Ubuntu
* \| \|	cleanup: remove old debian/ubuntu names from debian/* files	Sergei Golubchik	2015-02-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	namely, remove the code to support: etch, lenny, hardy, intrepid, jaunty, karmic, maverick, natty
* \| \|	MDEV-7151 ha_archive.so missing from .deb	Sergei Golubchik	2015-02-08	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \|	add missing plugins to debs
* \| \|	Merge 10.0-galera into 10.1	Sergei Golubchik	2015-02-06	1	-3/+3
\|\ \ \
\| * \| \|	MDEV-7470: MariaDB-Galera-server uses 'tar', but 'tar' is	Nirbhay Choubey	2015-01-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not in the dependency list Added tar to the dependency list.
\| * \| \|	MDEV-7204: mariadb-galera-server el7 rpms packaging	Nirbhay Choubey	2014-12-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-10.0.15 maria/10.0	Nirbhay Choubey	2014-12-05	2	-5/+9
\| \|\ \ \ \| \| \|/ /
\| * \| \|	bzr merge -rtag:mariadb-10.0.14 maria/10.0/	Nirbhay Choubey	2014-09-28	1	-1/+1
\| \|\ \ \
\| * \| \| \|	Fix for a debian build failure (cherry-pickedmariadb-galera-10.0.11	Nirbhay Choubey	2014-06-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from 10.0:r4231).
\| * \| \| \|	Added rsync to galera server's debian dependency list.	Nirbhay Choubey	2014-05-29	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Removing rsync from the debian build dependency list.	Nirbhay Choubey	2014-05-27	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' is	Nirbhay Choubey	2014-05-25	1	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not in the dependency list Added socat, grep, gawk, iproute, coreutils, findutils to the dependency list.
\| * \| \| \|	Merging changes from maria-5.5-galera and	Nirbhay Choubey	2014-05-22	1	-5/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some test fixes. bzr merge -r3479..3493 maria-5.5-galera
\| * \| \| \|	MDEV-6192 [Warning] Failed to load slave replication state from	Nirbhay Choubey	2014-04-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	table mysql.gtid_slave_pos: 1286: Unknown storage engine 'InnoDB' Removed 'loose-innodb' option from mysqld booststrap command in debian post-installation script.
\| * \| \| \|	Adding wsrep_sst_xtrabackup-v2 to the list of files	Nirbhay Choubey	2014-04-15	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in mariadb-galera-server package.
\| * \| \| \|	Merging mariadb-10.0.10.	Nirbhay Choubey	2014-04-08	1	-0/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* bzr merge -rtag:mariadb-10.0.10 maria/10.0.
\| * \ \ \ \	* bzr merge -rtag:mariadb-10.0.9 maria/10.0	Nirbhay Choubey	2014-03-26	2	-3/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix for post-merge build failures.
\| * \| \| \| \| \|	Merging deb/rpm script changes from maria-5.5-galera.	Nirbhay Choubey	2014-03-24	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Modified debian scripts to make galera packages	Nirbhay Choubey	2014-03-14	4	-194/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	self-contained.
\| * \| \| \| \| \|	Debian script fixes.	Nirbhay Choubey	2014-03-13	3	-10/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed install_macros.cmake to set the correct	Nirbhay Choubey	2014-02-19	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	destination for documentation.
\| * \| \| \| \| \|	Fixes in debian distribution files.	Nirbhay Choubey	2014-02-13	3	-48/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	* Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.	Nirbhay Choubey	2014-01-30	8	-23/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fixed Debian/Ubuntu dist files. * Fixed some compiler warnings.
\| * \| \| \| \| \|	Merge MariaDB-10.0.7 revision 3961.	Jan Lindström	2014-01-25	2	-3/+11
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6	Seppo Jaakola	2013-12-04	3	-19/+29
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and a number of fixes to make this buildable. Run also few short multi-master high conflict rate tests, with no issues
\| * \ \ \ \ \ \ \	Merged with lp:maria revision #3766	Seppo Jaakola	2013-07-13	2	-3/+4
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Initial merge result with mariaDB 10: lp:maria	Seppo Jaakola	2013-07-13	2	-5/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	MDEV-7053 - WSREP_STATUS & WSREP_MEMBERSHIP I_S tables	Sergey Vojtovich	2014-12-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wsrep_status was renamed to wsrep_info. Adjusted deb build scripts accordingly.
* \| \| \| \| \| \| \| \| \|	MDEV-6894 Enable SEQUENCE engine by default	Sergei Golubchik	2014-12-04	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	disable mroonga temporarily: see MDEV-7246	Sergei Golubchik	2014-12-02	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '10.0' into bb-10.1-merge	Sergei Golubchik	2014-12-02	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .bzrignore VERSION cmake/plugin.cmake debian/dist/Debian/control debian/dist/Ubuntu/control mysql-test/r/join_outer.result mysql-test/r/join_outer_jcl6.result mysql-test/r/null.result mysql-test/r/old-mode.result mysql-test/r/union.result mysql-test/t/join_outer.test mysql-test/t/null.test mysql-test/t/old-mode.test mysql-test/t/union.test packaging/rpm-oel/mysql.spec.in scripts/mysql_config.sh sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_cond.cc sql/item_cmpfunc.h sql/lock.cc sql/sql_select.cc sql/sql_show.cc sql/sql_update.cc sql/sql_yacc.yy storage/innobase/buf/buf0flu.cc storage/innobase/fil/fil0fil.cc storage/innobase/include/srv0srv.h storage/innobase/lock/lock0lock.cc storage/tokudb/CMakeLists.txt storage/xtradb/buf/buf0flu.cc storage/xtradb/fil/fil0fil.cc storage/xtradb/include/srv0srv.h storage/xtradb/lock/lock0lock.cc support-files/mysql.spec.sh
\| * \| \| \| \| \| \| \| \|	debian packaging: add mroonga and example engines	Sergei Golubchik	2014-11-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	5.5.40+ merge	Sergei Golubchik	2014-10-09	1	-1/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| / \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	MDEV-6550 Missing dependency on Debian 7 (Wheezy) installation package	Sergei Golubchik	2014-10-02	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add bsdutils dependency, because mariadb-server-5.5 deb package uses logger
* \| \| \| \| \| \| \| \|	MDEV-7161: Build failure in buildbot on work-amd64-valgrind	Nirbhay Choubey	2014-11-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for embedded build failure. Also added wsrep_info plugin library to server debian package.
* \| \| \| \| \| \| \| \|	Added SST scripts to the server package.	Nirbhay Choubey	2014-10-27	1	-0/+6
\| \| \| \| \| \| \| \| \|