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

	Commit message (Expand)	Author	Age	Files	Lines
*	Manual merge from mysql-5.5-bugteam.	Ramil Kalimullin	2010-11-22	1	-0/+2
\|\
\| *	Merge from mysql-5.5-bugteam to mysql-5.5-runtime	Jon Olav Hauglid	2010-11-01	1	-0/+2
\| \|\
\| * \|	Bug#37780: Make KILL reliable (main.kill fails randomly)	Davi Arnaut	2010-10-22	1	-0/+2
* \| \|	Manual-merge from 5.5-bugfixing.	Ramil Kalimullin	2010-11-18	1	-0/+2
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	manual merge 5.1-bugteam --> 5.5-bugteam (bug 52160)	Gleb Shchepa	2010-11-01	1	-0/+2
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	Bug #52160: crash and inconsistent results when grouping	Gleb Shchepa	2010-10-31	1	-0/+2
* \| \|	5.1-security->5.5-security merge	Sergey Glukhov	2010-10-29	1	-8/+3
\|\ \ \
\| * \| \|	Bug#57688 Assertion `!table \|\| (!table->write_set \|\| bitmap_is_set(table->wri...	Sergey Glukhov	2010-10-29	1	-8/+3
* \| \| \|	5.1-security->5.5-security merge	Sergey Glukhov	2010-10-18	1	-0/+14
\|\ \ \ \ \| \|/ / /
\| * \| \|	Bug#56814 Explain + subselect + fulltext crashes server	Sergey Glukhov	2010-10-18	1	-0/+14
* \| \| \|	5.1-security->5.5-security merge	Sergey Glukhov	2010-10-18	1	-0/+3
\|\ \ \ \ \| \|/ / / \| \| / / \| \|/ / \|/\| \|
\| * \|	Bug#54484 explain + prepared statement: crash and Got error -1 from storage e...	Sergey Glukhov	2010-10-18	1	-0/+3
\| \|/
\| *	merged mysql-5.1 into mysql-5.1-bugteam	Georgi Kodinov	2010-10-05	1	-8/+16
\| \|\
\| \| *	Merge from mysql-5.1-bugteam to mysql-5.1-security	Jimmy Yang	2010-09-01	1	-18/+42
\| \| \|\
\| * \| \	merge	Mattias Jonsson	2010-09-13	1	-0/+9
\| \|\ \ \
* \| \ \ \	merge	Georgi Kodinov	2010-09-29	1	-8/+16
\|\ \ \ \ \
\| * \ \ \ \	merge from 5.5-merge	Georgi Kodinov	2010-09-02	1	-18/+42
\| \|\ \ \ \ \
\| * \ \ \ \ \	Automerge.	Alexey Kopytov	2010-08-26	1	-8/+16
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Bug #53544: Server hangs during JOIN query in stored procedure	Alexey Kopytov	2010-08-26	1	-1/+1
\| \| * \| \| \| \|	Automerge.	Alexey Kopytov	2010-08-24	1	-7/+15
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	Bug #55568: user variable assignments crash server when used	Alexey Kopytov	2010-08-24	1	-7/+15
* \| \| \| \| \| \| \|	merge	Mattias Jonsson	2010-09-13	1	-1/+9
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	merge	Mattias Jonsson	2010-09-10	1	-1/+9
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Bug#53806: Wrong estimates for range query in partitioned MyISAM table	Mattias Jonsson	2010-08-26	1	-1/+9
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
* \| \| \| \| \| \| \|	Merge of fix for Bug#50394.	Martin Hansson	2010-09-13	1	-0/+9
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| / / \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Bug #50394: Regression in EXPLAIN with index scan, LIMIT, GROUP BY and	Martin Hansson	2010-09-13	1	-0/+9
\| \|/ / / / /
\| * \| \| \| \|	Bug#54543: update ignore with incorrect subquery leads to assertion failure:	Martin Hansson	2010-09-07	1	-10/+8
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge 5.1-bugteam to 5.5-merge.	Sergey Vojtovich	2010-08-27	1	-18/+42
\|\ \ \ \ \ \| \|/ / / / \| \| \| / / \| \|_\|/ / \|/\| \| \|
\| * \| \|	Bug #55656: mysqldump can be slower after bug 39653 fix.	Evgeny Potemkin	2010-08-26	1	-18/+42
\| \|/ /
* \| \|	merge	Georgi Kodinov	2010-08-17	1	-7/+37
\|\ \ \ \| \|/ /
\| * \|	Bug #55580 : segfault in read_view_sees_trx_id	Georgi Kodinov	2010-08-13	1	-7/+37
* \| \|	manual merge from mysql-5.1-bugteam	Jon Olav Hauglid	2010-08-09	1	-0/+2
\|\ \ \ \| \|/ /
\| * \|	Bug #54106 assert in Protocol::end_statement,	Jon Olav Hauglid	2010-08-09	1	-0/+2
\| \|/
* \|	Auto-merge from mysql-trunk-bugfixing.	Alexander Nozdrin	2010-07-30	1	-68/+21
\|\ \
\| * \	Merge trunk-bugfixing -> trunk-runtime.	Konstantin Osipov	2010-07-29	1	-1/+1
\| \|\ \
\| \| * \|	Bug #55472: Assertion failed in heap_rfirst function of hp_rfirst.c on	Gleb Shchepa	2010-07-29	1	-1/+1
\| * \| \|	Merge trunk-bugfixing -> trunk-runtime.	Konstantin Osipov	2010-07-27	1	-79/+12
\| \|\ \ \ \| \| \|/ /
\| * \| \|	Implement WL#5502 Remove dead 5.0 class Sensitive_cursor.	Konstantin Osipov	2010-07-27	1	-67/+20
* \| \| \|	Rename select_send::abort() to select_send::abort_result_set()	Alexander Nozdrin	2010-07-28	1	-1/+1
\| \|/ / \|/\| \|
* \| \|	WL#5498: Remove dead and unused source code	Davi Arnaut	2010-07-23	1	-59/+0
* \| \|	manual merge from mysql-5.1-bugteam	Jon Olav Hauglid	2010-07-19	1	-20/+12
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Bug #54734 assert in Diagnostics_area::set_ok_status	Jon Olav Hauglid	2010-07-19	1	-20/+12
* \|	Merge of mysql-trunk-bugfixing into mysql-trunk-merge.	Davi Arnaut	2010-07-15	1	-207/+478
\|\ \
\| * \|	Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled	Davi Arnaut	2010-07-08	1	-5/+5
\| * \|	gcc warnings removal (after bugfix for bug 36569)	Gleb Shchepa	2010-06-26	1	-2/+2
\| * \|	Backport of Bug#53236 Segfault in DTCollation::set(DTCollation&)	Tor Didriksen	2010-06-23	1	-4/+2
\| * \|	Bug #30584: delete with order by and limit clauses does not	Gleb Shchepa	2010-06-23	1	-197/+464
* \| \|	5.1-bugteam->trunk-merge merge	Sergey Glukhov	2010-07-09	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Bug#54416 MAX from JOIN with HAVING returning NULL with 5.1 and Empty set	Sergey Glukhov	2010-07-09	1	-1/+1
* \| \|	5.1-bugteam->trunk-merge merge	Sergey Glukhov	2010-06-30	1	-1/+10
\|\ \ \ \| \|/ /