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

	Commit message (Expand)	Author	Age	Files	Lines
*	merge 5.1-> 5.2	unknown	2009-12-08	1	-7/+111
\|\
\| *	Merge with MySQL 5.1, with following additions:	unknown	2009-11-16	1	-7/+111
\| \|\
\| \| *	Bug#47925: regression of range optimizer and date comparison in 5.1.39!	Martin Hansson	2009-11-02	1	-3/+3
\| \| *	Auto-merge.	Ramil Kalimullin	2009-10-23	1	-0/+21
\| \| \|\
\| \| \| *	Fix for bug#48258: Assertion failed when using a spatial index	Ramil Kalimullin	2009-10-23	1	-0/+21
\| \| * \|	Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN	Alexey Kopytov	2009-10-17	1	-0/+11
\| \| * \|	Revert the fix for bug #47123 until test suite failures are resolved.	Georgi Kodinov	2009-10-16	1	-11/+0
\| \| * \|	Manual merge.	Alexey Kopytov	2009-10-15	1	-0/+11
\| \| \|\ \
\| \| \| * \|	Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN	Alexey Kopytov	2009-10-13	1	-0/+11
\| \| * \| \|	Bug#42846: wrong result returned for range scan when using	Martin Hansson	2009-10-09	1	-3/+72
\| \| * \| \|	Merge 5.0-bugteam-> 5.1-bugteam	Frazer Clement	2009-10-08	1	-1/+4
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	Fix for bug #42803: Field_bit does not have unsigned_flag field,	Ramil Kalimullin	2009-10-08	1	-1/+4
* \| \| \| \|	Merge of the patch introducing virtual columns into maria-5.2	Igor Babaev	2009-11-11	1	-25/+56
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge MySQL 5.1.39 into MariaDB 5.1.	unknown	2009-10-15	1	-25/+56
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge from 5.1-bugteam	Staale Smedseng	2009-08-30	1	-1/+11
\| \| \|\ \ \
\| \| \| * \ \	Automerge.	Alexey Kopytov	2009-08-30	1	-1/+11
\| \| \| \|\ \ \
\| \| \| \| * \| \|	Bug #46607: Assertion failed: (cond_type == Item::FUNC_ITEM)	Alexey Kopytov	2009-08-30	1	-1/+11
\| \| * \| \| \| \|	Merge from 5.0 for 43414	Staale Smedseng	2009-08-28	1	-5/+4
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| / / \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| \| * \| \|	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-08-28	1	-4/+4
\| \| * \| \| \|	merge	Mattias Jonsson	2009-08-28	1	-12/+14
\| \| \|\ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| \| * \| \|	Manual merge between bug#46362 and bug#20577.	Mattias Jonsson	2009-08-28	1	-12/+10
\| \| \| \|\ \ \
\| \| \| \| * \| \|	Bug#46362: Endpoint should be set to false for TO_DAYS(DATE)	Mattias Jonsson	2009-08-26	1	-5/+10
\| \| \| \| \| \|/ \| \| \| \| \|/\|
\| \| \| * \| \|	merge	Mattias Jonsson	2009-08-26	1	-0/+4
\| \| \| \|\ \ \
\| \| \| \| * \| \|	Bug#20577: Partitions: use of to_days() function leads to selection failures	Mattias Jonsson	2009-08-26	1	-0/+4
\| \| \| \| \|/ /
\| \| * \| \| \|	merged 5.0-bugteam -> 5.1-bugteam	Georgi Kodinov	2009-08-27	1	-6/+17
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| / \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	Bug #37044: Read overflow in opt_range.cc found during "make test"	Georgi Kodinov	2009-08-24	1	-4/+14
\| \| \| * \|	Bug #46807: subselect test fails on PB-2 with a crash	Georgi Kodinov	2009-08-19	1	-1/+1
\| \| \| * \|	Bug #45287: phase 2 : 5.0 64 bit compilation warnings	Georgi Kodinov	2009-07-16	1	-1/+1
\| \| * \| \|	Bug #45962: memory leak after 'sort aborted' errors	Georgi Kodinov	2009-07-09	1	-1/+10
\| \| \| \|/ \| \| \|/\|
* \| \| \|	This is based on the userstatv2 patch from Percona and OurDelta.	Michael Widenius	2009-10-19	1	-41/+46
\|/ / /
* \| \|	Merge MySQL 5.1 -> MariaDB	Sergey Petrunya	2009-09-10	1	-6/+16
* \| \|	MySQL 5.1 -> MariaDB 5.1 merge	Sergey Petrunya	2009-09-10	1	-16/+6
* \| \|	Merge MySQL->MariaDB	Sergey Petrunya	2009-09-08	1	-5/+17
\|\ \ \ \| \|/ /
\| * \|	Merge	Martin Hansson	2009-06-16	1	-1/+1
\| \|\ \
\| \| * \|	Bug#44821: select distinct on partitioned table returns wrong results	Martin Hansson	2009-06-10	1	-1/+1
\| * \| \|	automerge	Georgi Kodinov	2009-06-12	1	-4/+16
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Bug #45386: Wrong query result with MIN function in field list,	Georgi Kodinov	2009-06-12	1	-4/+16
\| \| \| \|
\| \| \ \
\| *-. \ \	Merge from 5.0-bugteam for 43414	Staale Smedseng	2009-06-09	1	-6/+6
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|_\| / \| \|/\| \|
\| \| \| *	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-06-09	1	-7/+7
\| \| * \|	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-06-09	1	-7/+7
\| \| \|/
* \| \|	Fixed problems in merge	Michael Widenius	2009-05-19	1	-1/+1
\|\ \ \
\| * \| \|	We are now using Valgrind rather than purify, and have for quite some time.	unknown	2009-05-06	1	-1/+1
* \| \| \|	Merged with mysql-5.1 tree.	Michael Widenius	2009-04-25	1	-23/+44
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	merged 5.0-bugteam -> 5.1-bugteam	Georgi Kodinov	2009-03-24	1	-1/+1
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	auto-merge	Ignacio Galarza	2009-03-19	1	-25/+32
\| \| \|\ \
\| \| * \| \|	Bug#29125 Windows Server X64: so many compiler warnings	Ignacio Galarza	2009-02-10	1	-23/+23
\| * \| \| \|	Change optimizer_switch from no_xxx to xxx=on/xx=off.	Sergey Petrunia	2009-03-11	1	-7/+7
\| * \| \| \|	Merge	Sergey Petrunia	2009-03-10	1	-25/+32
\| \|\ \ \ \
\| * \| \| \| \|	- Backport @@optimizer_switch support from 6.0	Sergey Petrunia	2009-02-23	1	-22/+43
* \| \| \| \| \|	bzr merge from guilhem's maria tree to our local 5.1	Michael Widenius	2009-04-25	1	-25/+32
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| / \| \|_\|_\|_\|/ \|/\| \| \| \|