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

	Commit message (Expand)	Author	Age	Files	Lines
*	fixes for test failures	Sergei Golubchik	2012-09-27	1	-2/+0
*	5.3 merge	Sergei Golubchik	2012-01-13	1	-1/+2
\|\
\| *	Merge with 5.2.	Michael Widenius	2011-12-11	1	-2/+4
\| \|\
\| \| *	Initail merge with MySQL 5.1 (XtraDB still needs to be merged)	Michael Widenius	2011-11-21	1	-2/+4
\| \| \|\
* \| \| \	mysql-5.5.18 merge	Sergei Golubchik	2011-11-03	1	-2/+2
\|\ \ \ \
\| * \ \ \	Updated/added copyright headers	Kent Boortz	2011-06-30	1	-2/+2
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Updated/added copyright headers	Kent Boortz	2011-06-30	1	-2/+4
\| \| \|\ \ \
\| \| \| * \ \	Merge chunk from trunk.	Chad MILLER	2008-07-10	1	-6/+9
\| \| \| \|\ \ \
\| \| \| * \ \ \	Merge chunk from trunk.	Chad MILLER	2008-07-10	1	-1/+1
\| \| \| \|\ \ \ \
* \| \| \| \ \ \ \	merge with 5.3	Sergei Golubchik	2011-10-19	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| / / \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Backport MySQL WL#2540 into MariaDB.	unknown	2011-05-03	1	-2/+4
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Merge with MySQL 5.1.49	Michael Widenius	2010-08-02	1	-1/+1
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	BUG#53657: Slave crashed with error 22 when trying to lock mutex	Luis Soares	2010-05-24	1	-1/+1
\| \| * \| \| \|	Bug#49501 Inefficient information_schema check (system collation), addon	Sergey Glukhov	2010-01-22	1	-1/+1
\| \| * \| \| \|	Bug#49501 Inefficient information_schema check (system collation)	Sergey Glukhov	2010-01-19	1	-1/+1
\| * \| \| \| \|	Fix a bunch of Windows warnings	Bo Thorsen	2010-04-21	1	-0/+5
\| \|/ / / /
* \| \| \| \|	WL#5670: Proposal: Remove SHOW NEW MASTER statement	Sven Sandberg	2011-02-16	1	-366/+0
* \| \| \| \|	Fix for crash in mysqld --verbose --help while initializing option	Luis Soares	2010-10-11	1	-2/+2
* \| \| \| \|	WL#5498: Remove dead and unused source code	Davi Arnaut	2010-07-23	1	-3/+0
* \| \| \| \|	WL#5498: Remove dead and unused source code	Davi Arnaut	2010-07-23	1	-96/+0
* \| \| \| \|	Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled	Davi Arnaut	2010-07-08	1	-2/+2
* \| \| \| \|	WL#5419 "LOCK_open scalability: make tdc_refresh_version	Konstantin Osipov	2010-06-11	1	-1/+0
* \| \| \| \|	WL#5030: Split and remove mysql_priv.h	Mats Kindahl	2010-03-31	1	-1/+4
* \| \| \| \|	Patch to eliminate warnings in mysql-next-mr-bugteam.	Mats Kindahl	2010-01-25	1	-1/+1
* \| \| \| \|	merge mysql-next-mr --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-14	1	-4/+4
\|\ \ \ \ \
\| * \| \| \| \|	WL#2360 Performance schema	Marc Alff	2010-01-11	1	-4/+4
* \| \| \| \| \|	merge mysql-next-mr --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-13	1	-32/+57
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	WL#2360 Performance schema	Marc Alff	2010-01-06	1	-32/+57
* \| \| \| \| \|	Manual merge from next-mr.	unknown	2010-01-12	1	-5/+2
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	WL#4738 streamline/simplify @@variable creation process	Sergei Golubchik	2009-12-22	1	-5/+2
* \| \| \| \| \|	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-07	1	-2/+9
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1	Alfranio Correia	2009-12-21	1	-2/+9
\| \|\ \ \ \ \
\| \| * \| \| \| \|	BUG#49259: Slave I/O thread could not register on master	Luis Soares	2009-12-18	1	-2/+9
\| * \| \| \| \| \|	merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...	Alfranio Correia	2009-12-17	1	-1/+6
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| / / / / \| \| \|/ / / /
* \| \| \| \| \|	Manual merge from mysql-trunk-merge.	Alexander Nozdrin	2009-12-12	1	-1/+6
\|\ \ \ \ \ \
\| * \ \ \ \ \	Manual merge from mysql-trunk.	Alexander Nozdrin	2009-12-11	1	-13/+14
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Bug#45613 handle failures from my_hash_insert	Kristofer Pettersson	2009-11-20	1	-1/+6
* \| \| \| \| \| \|	Manual resolving for the following files	Andrei Elkin	2009-12-01	1	-330/+2
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| / / / / \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)	Luis Soares	2009-11-13	1	-324/+0
\| \|\ \ \ \ \
\| \| * \| \| \| \|	BUG#48048: Deprecated constructs need removal in Betony	Luis Soares	2009-11-04	1	-324/+0
\| * \| \| \| \| \|	merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640	Andrei Elkin	2009-11-06	1	-1/+3
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| / / / / \| \| \|/ / / /
\| * \| \| \| \|	Bug#13963 SHOW SLAVE HOSTS is unreliable	unknown	2009-10-20	1	-6/+2
* \| \| \| \| \|	Merge from mysql-next-mr.	Alexander Nozdrin	2009-10-23	1	-1/+3
\|\ \ \ \ \ \
\| * \ \ \ \ \	Manual merge from mysql-trunk-merge.	Alexander Nozdrin	2009-10-14	1	-1/+3
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	A patch for Bug#47474 (mysqld hits Dbug_violation_helper assert	Alexander Nozdrin	2009-09-23	1	-1/+3
\| \| \|/ / / /
* \| \| \| \| \|	Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,	Konstantin Osipov	2009-10-22	1	-2/+2
* \| \| \| \| \|	Backport of:	Konstantin Osipov	2009-10-14	1	-10/+11
\|/ / / / /
* \| \| \| \|	WL#2110 (SIGNAL)	Marc Alff	2009-09-10	1	-1/+1
\|/ / / /
* \| \| \|	BUG#41924: high-level replication functions are not commented	Sven Sandberg	2009-01-09	1	-0/+10
* \| \| \|	Merge stella.local:/home2/mydev/mysql-5.0-axmrg	unknown	2008-03-20	1	-1/+1
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|