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

	Commit message (Expand)	Author	Age	Files	Lines
*	MDEV-11168: InnoDB: Failing assertion: !other_lock \|\| wsrep_thd_is_BF(lock->t...	sensssz	2016-12-02	1	-21/+20
*	MDEV-11349 (1/2) Fix some clang 4.0 warnings	Marko Mäkelä	2016-11-25	1	-1/+0
*	MDEV-10692: InnoDB: Failing assertion: lock->trx->lock.wait_lock == lock	Jan Lindström	2016-11-09	1	-1/+26
*	A few fixes for VATS in 10.1	sensssz	2016-10-25	1	-151/+360
*	Move the lock after deadlock is resolved.	sensssz	2016-10-13	1	-11/+15
*	Get thd by lock->trx->mysql_thd.	sensssz	2016-10-12	1	-1/+1
*	Reduce conflict during in-order replication.	sensssz	2016-10-12	1	-0/+15
*	Bug fix: add * and ; for innodb	sensssz	2016-10-11	1	-2/+2
*	Implement VATS both in InnoDB and XtraDB. Add configuration options for it in...	sensssz	2016-10-11	1	-14/+144
*	Merge branch '10.0-galera' into bb-10.1-serg	Nirbhay Choubey	2016-08-25	1	-7/+15
\|\
\| *	Refs: MW-279	sjaakola	2016-08-21	1	-7/+15
\| *	Merge tag 'mariadb-10.0.26' into 10.0-galera	Nirbhay Choubey	2016-06-24	1	-8/+10
\| \|\
\| * \	Merge tag 'mariadb-10.0.24' into 10.0-galera	Nirbhay Choubey	2016-02-23	1	-1/+1
\| \|\ \
* \| \ \	Merge branch '10.0' into 10.1	Sergei Golubchik	2016-06-28	1	-8/+10
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'merge-innodb-5.6' into 10.0	Sergei Golubchik	2016-06-21	1	-8/+10
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	5.6.31	Sergei Golubchik	2016-06-21	1	-7/+9
* \| \| \|	Merge branch '10.0' into 10.1	Sergei Golubchik	2016-02-23	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge branch 'merge-innodb-5.6' into 10.0	Sergei Golubchik	2016-02-16	1	-1/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	5.6.29	Sergei Golubchik	2016-02-16	1	-1/+1
* \| \| \|	Merge branch 'github/10.0-galera' into 10.1	Sergei Golubchik	2015-12-22	1	-10/+50
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	MDEV-8869: Potential lock_sys->mutex deadlockbb-10.0-galera-jan	Jan Lindström	2015-12-21	1	-2/+37
\| * \| \|	MDEV-8869: Potential lock_sys->mutex deadlock	Jan Lindström	2015-12-14	1	-10/+16
* \| \| \|	Merge branch 'github/10.0-galera' into 10.1	Sergei Golubchik	2015-11-19	1	-7/+18
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge tag 'mariadb-10.0.22' into 10.0-galera	Nirbhay Choubey	2015-10-31	1	-3/+4
\| \|\ \ \ \| \| \|/ /
\| * \| \|	MDEV-8869: Potential lock_sys->mutex deadlock	Jan Lindström	2015-10-20	1	-7/+18
\| * \| \|	Merge tag 'mariadb-10.0.19' into 10.0-galera	Nirbhay Choubey	2015-05-09	1	-2/+4
\| \|\ \ \
\| * \| \| \|	refs #7 - merged fix from 5.5 branch. However, 5.6 branch has not (yet) surfa...	sjaakola	2015-05-08	1	-14/+20
\| * \| \| \|	Merge tag 'mariadb-10.0.17' into 10.0-galera	Nirbhay Choubey	2015-02-27	1	-1/+45
\| \|\ \ \ \
\| * \ \ \ \	maria-10.0.16 merge	Nirbhay Choubey	2015-01-26	1	-5/+22
\| \|\ \ \ \ \
\| * \ \ \ \ \	bzr merge -rtag:mariadb-10.0.15 maria/10.0	Nirbhay Choubey	2014-12-05	1	-2/+3
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	MDEV-6807: InnoDB: Assertion failure in file lock0lock.cc (lock != ctx->wait_...	Nirbhay Choubey	2014-10-03	1	-3/+0
\| * \| \| \| \| \| \|	Fix compiler error when WITH_WSREP is not used.	Jan Lindström	2014-08-27	1	-9/+8
\| * \| \| \| \| \| \|	MDEV-6602: rpl.rpl_mdev6020 fails sporadically with SIGABRT	Jan Lindström	2014-08-25	1	-80/+121
\| * \| \| \| \| \| \|	bzr merge -r4104..4120 codership/5.6/	Nirbhay Choubey	2014-08-12	1	-6/+24
\| * \| \| \| \| \| \|	bzr merge -r4346 maria/10.0 (maria-10.0.13)	Nirbhay Choubey	2014-08-11	1	-24/+150
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	bzr merge -r4091..4101 codership/5.6/	Nirbhay Choubey	2014-06-19	1	-2/+9
\| * \| \| \| \| \| \| \|	bzr merge -r4209 maria/10.0.	Nirbhay Choubey	2014-05-21	1	-98/+81
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merging revision from codership-mysql/5.5 (r3928..3968) and	Nirbhay Choubey	2014-03-27	1	-86/+57
\| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	* bzr merge -r4027..4061 codership/5.6	Nirbhay Choubey	2014-03-26	1	-82/+58
\| * \| \| \| \| \| \| \| \| \|	Merging wsrep specific changes from InnoDB to	Nirbhay Choubey	2014-03-26	1	-5/+4
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Merging InnoDB changes to xtradb (r3783..3808).	Nirbhay Choubey	2014-03-26	1	-5/+4
\| \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	* bzr merge -rtag:mariadb-10.0.9 maria/10.0	Nirbhay Choubey	2014-03-26	1	-115/+151
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	MDEV-5644: Assertion failure during lock_cancel_waiting_and_release.	Jan Lindström	2014-02-11	1	-50/+153
\| * \| \| \| \| \| \| \| \| \|	Fixed issue on wsrep_kill_victim mutexing order error. Furthermore, fixed merge	Jan Lindström	2014-01-29	1	-5/+7
\| * \| \| \| \| \| \| \| \| \|	Merge MariaDB-10.0.7 revision 3961.	Jan Lindström	2014-01-25	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6	Seppo Jaakola	2013-12-04	1	-1/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Ported all remaining storage/innobase changes from lp:codership-mysql/5.6, up...	Seppo Jaakola	2013-11-27	1	-20/+29
\| * \| \| \| \| \| \| \| \| \| \|	diffed in fix in #3953 from lp:codership-mysql/5.6	Seppo Jaakola	2013-11-27	1	-20/+22
\| * \| \| \| \| \| \| \| \| \| \|	Fixed performance schema instrumentation on galera and added correct mutexing...	Jan Lindström	2013-10-15	1	-3/+10
\| * \| \| \| \| \| \| \| \| \| \|	After merge fixes	Jan Lindström	2013-09-25	1	-89/+90