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

	Commit message (Expand)	Author	Age	Files	Lines
*	wsrep: create a macro for the error: label	Sergei Golubchik	2018-10-24	1	-7/+4
*	Merge branch '10.0-galera' into 10.1	Sergei Golubchik	2018-09-07	1	-7/+13
\|\
\| *	Add missing WSREP(thd) condition and remove unnecessary DBUG_RETURN.	Jan Lindström	2018-08-02	1	-3/+2
\| *	Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera	Jan Lindström	2018-08-02	1	-5/+12
\| \|\
\| \| *	Follow up to previous commit for codership/mysql-wsrep#332mariadb-galera-5.5.61	Daniele Sciascia	2018-08-02	1	-1/+1
\| \| *	Fix FK constraint violation in applier, after ALTER TABLE ADD FK	Daniele Sciascia	2018-08-02	1	-8/+9
\| \| *	MDEV#6148 main.flush_read_lock fails due to conflicting	Nirbhay Choubey	2014-04-21	1	-2/+3
\| \| *	Merged revisions 3931--3942 from from lp:~codership/codership-mysql/5.5-23.	Jan Lindström	2013-11-25	1	-8/+13
\| \| *	Merged changes from lp:codership-mysql up to rev 3743	Seppo Jaakola	2012-04-26	1	-2/+5
\| \| *	Initial push of codership-wsrep API implementation for MariaDB.	Seppo Jaakola	2012-04-13	1	-1/+16
* \| \|	fix compilation w/o partitioning	Sergei Golubchik	2018-06-14	1	-1/+0
* \| \|	MDEV-10679 Crash in performance schema and partitioning with discovery	Monty	2018-05-26	1	-2/+3
* \| \|	- Renaming variables so that they don't shadow others (After this patch one c...	Monty	2015-07-06	1	-2/+2
* \| \|	Merge 10.0-galera into 10.1	Sergei Golubchik	2015-02-06	1	-9/+11
\|\ \ \ \| \|/ /
\| * \|	bzr merge -r4123..4144 codership/5.6	Nirbhay Choubey	2014-09-30	1	-10/+10
\| * \|	Fixes for some test failures.	Nirbhay Choubey	2014-04-09	1	-1/+2
\| * \|	* bzr merge -rtag:mariadb-10.0.9 maria/10.0	Nirbhay Choubey	2014-03-26	1	-13/+2
\| \|\ \
\| * \ \	Merge 10.0 to galera-10.0	Jan Lindström	2013-09-03	1	-12/+261
\| \|\ \ \
\| * \| \| \|	Initial merge result with mariaDB 10: lp:maria	Seppo Jaakola	2013-07-13	1	-1/+19
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	MDEV-6247: Merge 10.0-galera to 10.1.	Jan Lindström	2014-08-26	1	-0/+17
\| \|_\|/ \|/\| \|
* \| \|	Implementation of MDEV-5491: CREATE OR REPLACE TABLE	Michael Widenius	2014-01-29	1	-13/+2
\| \|/ \|/\|
* \|	Applied all changes from Igor and Sanja	Michael Widenius	2013-06-15	1	-12/+261
\|/
*	mysql-5.5.18 merge	Sergei Golubchik	2011-11-03	1	-1/+1
\|\
\| *	Updated/added copyright headers	Kent Boortz	2011-06-30	1	-1/+1
* \|	merge with 5.3	Sergei Golubchik	2011-10-19	1	-1/+1
\|/
*	Remove check_merge_table_access().	Alexander Nozdrin	2010-08-31	1	-5/+8
*	Rename of sql_alter_table -> sql_alter and sql_table_maintenance -> sql_admin	Mattias Jonsson	2010-08-16	1	-0/+106