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

	Commit message (Expand)	Author	Age	Files	Lines
*	MDEV-12466 : Assertion `thd->transaction.stmt.is_empty() \|\| thd->in_sub_stmt ...	Sergei Petrunia	2018-04-07	1	-0/+2
*	Merge branch '10.1' into 10.2	Sergei Golubchik	2017-11-21	1	-1/+4
\|\
\| *	MDEV-12012/MDEV-11969 Can't remove GTIDs for a stale GTID Domain ID	Andrei Elkin	2017-11-15	1	-1/+4
* \|	Merge 10.1 into 10.2	Marko Mäkelä	2017-06-19	1	-1/+2
\|\ \ \| \|/
\| *	MDEV-12620 - set lock_wait_timeout = 1;flush tables with read lock;	Sergey Vojtovich	2017-06-16	1	-1/+2
* \|	Merge 10.1 into 10.2	Marko Mäkelä	2017-06-08	1	-2/+6
\|\ \ \| \|/
\| *	MDEV-9544 FLUSH [RELAY] LOGS does not rotate logs for a named slave	Sachin Setiya	2017-06-05	1	-2/+6
* \|	Merge branch '10.1' into 10.2	Sergei Golubchik	2017-03-30	1	-27/+29
\|\ \ \| \|/
\| *	Merge 10.0 into 10.1	Marko Mäkelä	2017-03-03	1	-27/+29
\| \|\
\| \| *	MDEV-9573 'Stop slave' hangs on replication slave	Monty	2017-02-28	1	-27/+29
* \| \|	Merge branch '10.1' into 10.2	Sergei Golubchik	2016-09-09	1	-0/+6
\|\ \ \ \| \|/ /
\| * \|	MDEV-9423: cannot add new node to the cluser: Binlog..mariadb-10.1.15	Nirbhay Choubey	2016-06-29	1	-0/+6
* \| \|	Merge branch '10.1' into 10.2	Sergei Golubchik	2016-06-30	1	-1/+2
\|\ \ \ \| \|/ /
\| * \|	Merge branch '10.0' into 10.1	Sergei Golubchik	2016-06-28	1	-1/+2
\| \|\ \ \| \| \|/
\| \| *	Merge branch '5.5' into bb-10.0	Sergei Golubchik	2016-06-21	1	-1/+2
\| \| \|\
\| \| \| *	Merge branch 'mysql/5.5' into 5.5	Sergei Golubchik	2016-06-14	1	-1/+2
\| \| \| \|\
\| \| \| \| *	Bug#23251517: SEMISYNC REPLICATION HANGINGmysql-5.5.50	Sujatha Sivakumar	2016-05-16	1	-1/+1
\| \| \| \| *	Bug#20685029: SLAVE IO THREAD SHOULD STOP WHEN DISK IS	Sujatha Sivakumar	2016-03-01	1	-2/+2
* \| \| \| \|	Reuse THD for new user connections	Monty	2016-06-04	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch '10.0-galera' into 10.1	Nirbhay Choubey	2015-12-23	1	-0/+10
\|\ \ \ \
\| * \| \| \|	MDEV-9224: postfix - thd can be null in reload_acl_and_cache()mariadb-galera-10.0.23	Nirbhay Choubey	2015-12-23	1	-1/+1
\| * \| \| \|	MDEV-9224 : Database lockup on flush in galera	Nirbhay Choubey	2015-12-22	1	-0/+10
\| * \| \| \|	Merge tag 'mariadb-10.0.23' into 10.0-galera	Nirbhay Choubey	2015-12-19	1	-3/+3
\| \|\ \ \ \
\| * \ \ \ \	Merge tag 'mariadb-10.0.22' into 10.0-galera	Nirbhay Choubey	2015-10-31	1	-0/+1
\| \|\ \ \ \ \
\| * \ \ \ \ \	bzr merge -rtag:mariadb-10.0.15 maria/10.0	Nirbhay Choubey	2014-12-05	1	-0/+1
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	bzr merge -rtag:mariadb-10.0.14 maria/10.0/	Nirbhay Choubey	2014-09-28	1	-26/+31
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	* bzr merge -rtag:mariadb-10.0.9 maria/10.0	Nirbhay Choubey	2014-03-26	1	-24/+44
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6	Seppo Jaakola	2013-12-04	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge 10.0 to galera-10.0	Jan Lindström	2013-09-03	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Initial merge result with mariaDB 10: lp:maria	Seppo Jaakola	2013-07-13	1	-1/+12
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '10.0' into 10.1	Sergei Golubchik	2015-12-21	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	MDEV-9088 Server crashes on shutdown after the second post of feedback report	Sergei Golubchik	2015-12-19	1	-2/+0
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '5.5' into 10.0	Sergei Golubchik	2015-12-13	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| / / \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'mysql/5.5' into 5.5	Sergei Golubchik	2015-12-09	1	-2/+3
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Bug #21370329 : FLUSH DES_KEY_FILE MAY NOT WORK	Arun Kuruvila	2015-09-22	1	-2/+3
\| \| \| * \| \| \| \| \| \|	Merge from mysql-5.5.18-release	hery.ramilison@oracle.com	2011-11-17	1	-3/+29
\| \| \| \|\ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \|	Manual merge from mysql-5.1-security.	Alexander Nozdrin	2011-09-23	1	-3/+29
\| \| \| * \| \| \| \| \| \| \|	Bug#11763573 - 56299: MUTEX DEADLOCK WITH COM_BINLOG_DUMP, BINLOG PURGE, AND ...	Andrei Elkin	2011-10-27	1	-1/+1
\| \| \| \|/ / / / / / /
\| \| \| * \| \| \| \| \| \|	Merge from 5.1.	Guilhem Bichot	2011-05-21	1	-1/+1
\| \| \| * \| \| \| \| \| \|	Bug #11764779 (former 57649)	Jon Olav Hauglid	2011-03-07	1	-3/+17
\| \| \| * \| \| \| \| \| \|	BUG#46166	Luis Soares	2010-12-07	1	-6/+15
\| \| \| * \| \| \| \| \| \|	Fix for bug #55273 "FLUSH TABLE tm WITH READ LOCK for Merge	Dmitry Lenev	2010-09-09	1	-19/+23
\| \| \| * \| \| \| \| \| \|	Extract reload_acl_and_cache() and flush_tables_with_read_lock()	Konstantin Osipov	2010-08-13	1	-0/+427
\| \| \| / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '10.0' into 10.1	Sergei Golubchik	2015-11-19	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Set opt_noacl (running with--skip-grant-tables) to 0 if we	Michael Widenius	2015-10-21	1	-0/+1
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	MDEV-8469 Add RESET MASTER TO x to allow specification of binlog file nr	Monty	2015-07-16	1	-1/+1
* \| \| \| \| \| \| \|	don't let current_thd to point to a destroyed THD	Sergei Golubchik	2015-02-03	1	-2/+0
* \| \| \| \| \| \| \|	MDEV-7004 - Merge scalability fixes from 10.0-power	Sergey Vojtovich	2014-12-05	1	-4/+8
* \| \| \| \| \| \| \|	Merge branch '10.0' into bb-10.1-merge	Sergei Golubchik	2014-12-02	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	MDEV-5120 Test suite test maria-no-logging fails	Michael Widenius	2014-09-30	1	-0/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|