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

	Commit message (Expand)	Author	Age	Files	Lines
*	Manual merge from next-mr.	unknown	2010-01-12	1	-2/+2
\|\
\| *	WL#4738 streamline/simplify @@variable creation process	Sergei Golubchik	2009-12-22	1	-2/+2
* \|	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	Alfranio Correia	2010-01-07	1	-29/+19
\|\ \ \| \|/ \|/\|
\| *	merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1	Alfranio Correia	2009-12-17	1	-27/+21
\| \|\
\| \| *	mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...	Andrei Elkin	2009-11-30	1	-4/+4
\| \| \|\
\| \| * \	merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...	Andrei Elkin	2009-11-10	1	-61/+87
\| \| \|\ \
\| \| * \| \|	WL#2687 WL#5072 BUG#40278 BUG#47175	Alfranio Correia	2009-11-03	1	-9/+11
\| \| * \| \|	merged fixes for BUG#39934 to 5.1-rpl+3	Sven Sandberg	2009-09-30	1	-18/+6
\| \| \|\ \ \
\| \| \| * \ \	Merged fix for BUG#39934 up a few revisions.	Sven Sandberg	2009-07-14	1	-16/+4
\| \| \| \|\ \ \
\| \| \| \| * \| \|	BUG#39934: Slave stops for engine that only support row-based logging	Sven Sandberg	2009-07-14	1	-16/+4
* \| \| \| \| \| \|	Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marc	Marc Alff	2009-12-16	1	-6/+7
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Post-merge fix.	Alexander Nozdrin	2009-12-15	1	-4/+2
\| * \| \| \| \| \| \|	Manual merge from mysql-trunk-merge.	Alexander Nozdrin	2009-12-12	1	-8/+11
\| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \	Manual merge from mysql-trunk.	Alexander Nozdrin	2009-12-11	1	-2/+17
\| \| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Bug #48350 truncate temporary table crashes replication	unknown	2009-11-22	1	-5/+5
\| \| * \| \| \| \| \| \|	Bug #46425 crash in Diagnostics_area::set_ok_status , empty statement,	Magne Mahre	2009-11-18	1	-1/+2
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
* \| \| \| \| \| \| \|	Merge cleanup	Marc Alff	2009-12-11	1	-1/+1
* \| \| \| \| \| \| \|	Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc	Marc Alff	2009-12-11	1	-5/+7
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Manual merge/pull from mysql-next-mr.	Alexander Nozdrin	2009-11-25	1	-6/+6
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	BUG#37148 Most callers of mysql_bin_log.write ignore the return result	He Zhenxing	2009-11-21	1	-5/+7
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	WL#2360 Performance schema	Marc Alff	2009-12-09	1	-6/+6
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Backport of:	Konstantin Osipov	2009-11-24	1	-6/+6
\|/ / / / / /
* \| \| \| \| \|	Manual merge from mysql-trunk-merge.	Alexander Nozdrin	2009-11-05	1	-4/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Bug #40877: multi statement execution fails in 5.1.30	Georgi Kodinov	2009-10-16	1	-4/+4
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Manual merge from mysql-trunk-merge.	Alexander Nozdrin	2009-10-14	1	-61/+87
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Bug#46958: Assertion in Diagnostics_area::set_ok_status,	Martin Hansson	2009-09-28	1	-61/+87
\| \|/ / /
* \| \| \|	WL#4444 Added TRUNCATE partition support, fixes bug#19405 and bug #35111	Mikael Ronstrom	2009-09-10	1	-2/+17
\|/ / /
* \| \|	Fix for bug #46456 [Ver->Prg]: HANDLER OPEN + TRUNCATE + DROP	Ramil Kalimullin	2009-08-21	1	-0/+4
\|/ /
* \|	Merge of the fix for bug #40113 to 5.1.	Georgi Kodinov	2009-07-13	1	-1/+9
\|\ \
\| * \|	Bug #40113: Embedded SELECT inside UPDATE or DELETE can timeout	Georgi Kodinov	2009-07-13	1	-1/+9
* \| \|	Bug#44834 strxnmov is expected to behave as you'd expect	Sergey Glukhov	2009-06-19	1	-2/+2
* \| \|	auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam	Alfranio Correia	2009-06-18	1	-1/+1
\|\ \ \
\| * \| \|	BUG#43929 binlog corruption when max_binlog_cache_size is exceeded	Alfranio Correia	2009-06-18	1	-1/+1
\| \| \|/ \| \|/\|
\| \| \|
\| \ \
*-. \ \	Merge from 5.0-bugteam	Staale Smedseng	2009-06-17	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| / \| \| \|/
\| \| *	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-06-17	1	-1/+1
\| * \|	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-06-10	1	-1/+1
\| \|/
\| *	merged 5.0-main -> 5.0-bugteam	Georgi Kodinov	2009-05-15	1	-7/+7
\| \|\
\| \| *	Merge community up to enterprise, thus ending the community-server	Chad MILLER	2009-05-06	1	-7/+7
\| \| \|\
\| \| \| *	Merged from 5.0 (enterprise).	Chad MILLER	2008-12-17	1	-2/+2
\| \| \| \|\
\| \| \| * \	Merge from 5.0 trunk.	Chad MILLER	2008-07-14	1	-2/+2
\| \| \| \|\ \
\| \| \| * \ \	Merge chunk from trunk.	Chad MILLER	2008-07-10	1	-9/+10
\| \| \| \|\ \ \
\| \| \| * \ \ \	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2007-12-10	1	-7/+7
\| \| \| \|\ \ \ \
\| \| \| \| * \ \ \	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2007-09-10	1	-7/+7
\| \| \| \| \|\ \ \ \
\| \| \| \| \| * \ \ \	Merge mysqldev@production.mysql.com:my/mysql-5.0-release	unknown	2007-07-02	1	-7/+7
\| \| \| \| \| \|\ \ \ \
\| \| \| \| \| \| * \ \ \	Merge mysqldev@production.mysql.com:my/mysql-5.0-release	unknown	2007-04-26	1	-7/+7
\| \| \| \| \| \| \|\ \ \ \
* \| \| \| \| \| \| \| \| \| \|	BUG#41948 Query_log_event constructor needlessly contorted	He Zhenxing	2009-05-30	1	-3/+11
* \| \| \| \| \| \| \| \| \| \|	merging with local fix.	Anurag Shekhar	2009-05-06	1	-1/+19
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Bug #39918 memory (heap) engine crashing with b-tree index and DELETE	Anurag Shekhar	2009-05-06	1	-1/+19
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	BUG#37145 Killing a statement doing DDL may log binlog event with error code ...	He Zhenxing	2009-03-27	1	-2/+2
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Bug#40127 Multiple table DELETE IGNORE hangs on foreign key constraint violation	Kristofer Pettersson	2009-03-27	1	-10/+32