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

	Commit message (Expand)	Author	Age	Files	Lines
*	Manual merge 5.1-rep+2 to 5.1-rep+3	He Zhenxing	2009-10-18	1	-2/+4
\|\
\| *	Manual merge semi-sync to 5.1-rep+2	He Zhenxing	2009-10-03	1	-0/+1
\| \|\
\| \| *	Backporting WL#4398 WL#1720	He Zhenxing	2009-09-26	1	-0/+1
\| * \|	BUG#23300: Slow query log on slave does not log slow replicated statements	Luis Soares	2009-09-29	1	-2/+2
\| * \|	BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay log	Luis Soares	2009-09-29	1	-0/+1
\| \|/
* \|	merged fixes for BUG#39934 to 5.1-rpl+3	Sven Sandberg	2009-09-30	1	-17/+19
\|\ \ \| \|/ \|/\|
\| *	BUG#39934: Slave stops for engine that only support row-based logging	Sven Sandberg	2009-07-22	1	-11/+10
\| *	Merged fix for BUG#39934 up a few revisions.	Sven Sandberg	2009-07-14	1	-5/+8
\| \|\
\| \| *	BUG#39934: Slave stops for engine that only support row-based logging	Sven Sandberg	2009-07-14	1	-5/+8
* \| \|	Merge from 5.0 for 43414	Staale Smedseng	2009-08-28	1	-2/+2
\|\ \ \
\| * \| \|	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-08-28	1	-2/+2
* \| \| \|	reverted the fix for bug #46019 from 5.1-bugteam	Georgi Kodinov	2009-08-21	1	-2/+1
\|\ \ \ \ \| \|/ / /
* \| \| \|	merge of bug #46019 to 5.1-bugteam	Georgi Kodinov	2009-08-20	1	-1/+2
\|\ \ \ \ \| \|/ / /
* \| \| \|	Bug#43587: Putting event_scheduler=1 in init SQL file crashes	Davi Arnaut	2009-07-24	1	-1/+2
\|\ \ \ \
\| * \| \| \|	Code review for Bug#43587 Putting event_scheduler=1 in init SQL file crashes	Konstantin Osipov	2009-07-24	1	-1/+2
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge from 5.0	Gleb Shchepa	2009-07-24	1	-25/+23
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /
\| * \|	Bug #38816: kill + flush tables with read lock + stored	Gleb Shchepa	2009-07-24	1	-26/+23
\| * \|	Bug #45287: phase 2 : 5.0 64 bit compilation warnings	Georgi Kodinov	2009-07-16	1	-1/+1
* \| \|	Merge from 5.0	Staale Smedseng	2009-07-01	1	-2/+2
\|\ \ \ \| \|/ /
\| * \|	Bug #45790 Potential DoS vector: Writing of user input to log	Staale Smedseng	2009-07-01	1	-2/+2
\| * \|	Merge from 5.0-bt	Staale Smedseng	2009-06-29	1	-2/+2
* \| \|	Bug #45309: InnoDB does not rollback for delete and update	Alexey Kopytov	2009-06-23	1	-8/+7
\| \| \|
\| \ \
*-. \ \	Merge from 5.0-bugteam	Staale Smedseng	2009-06-17	1	-4/+4
\|\ \ \ \ \| \| \|/ / \| \|_\| / \|/\| \|
\| \| *	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-06-17	1	-14/+14
\| * \|	Bug #43414 Parenthesis (and other) warnings compiling MySQL	Staale Smedseng	2009-06-10	1	-14/+14
\| \|/
\| *	Merge community up to enterprise, thus ending the community-server	Chad MILLER	2009-05-06	1	-24/+79
\| \|\
\| \| *	Pull 5.1 treatment of community features into 5.0.	Chad MILLER	2009-05-05	1	-7/+7
\| \| *	Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.	Chad MILLER	2009-04-14	1	-23/+124
\| \| \|\
\| \| * \	Merged from 5.0 (enterprise).	Chad MILLER	2008-12-17	1	-49/+196
\| \| \|\ \
\| \| * \ \	Merge from mysql-5.0.66-release	Jonathan Perkin	2008-07-17	1	-0/+5
\| \| \|\ \ \
\| \| * \| \| \|	Fixed packet-test bug caused by if block that didn't have curly braces.	Chad MILLER	2008-07-15	1	-0/+2
\| \| * \| \| \|	Merge from 5.0 trunk.	Chad MILLER	2008-07-14	1	-2/+2
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge chunk from trunk.	Chad MILLER	2008-07-10	1	-0/+60
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge chunk from trunk.	Chad MILLER	2008-07-10	1	-26/+71
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2007-12-10	1	-25/+78
\| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Push history-limiting code until after the code that adds new	unknown	2007-11-14	1	-10/+34
\| * \| \| \| \| \| \| \| \|	BUG#13684: SP: DROP PROCEDURE\|FUNCTION IF EXISTS not binlogged if	Luis Soares	2009-04-09	1	-0/+8
\| * \| \| \| \| \| \| \| \|	Auto merge	He Zhenxing	2009-04-08	1	-2/+80
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	BUG#37145 Killing a statement doing DDL may log binlog event with error code ...	He Zhenxing	2009-03-27	1	-4/+8
* \| \| \| \| \| \| \| \| \| \|	Merge bug#45326	Magnus Blåudd	2009-06-05	1	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Bug#45326 Linker failure for libmysqld with VC++ 2008	Magnus Blåudd	2009-06-05	1	-6/+6
* \| \| \| \| \| \| \| \| \| \| \|	Automerge	Kristofer Pettersson	2009-05-29	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Bug#44658 Create procedure makes server crash when user does not have ALL pri...	Kristofer Pettersson	2009-05-29	1	-1/+3
* \| \| \| \| \| \| \| \| \| \| \| \|	fixed a compile warning in 5.1-bugteam	Georgi Kodinov	2009-05-15	1	-1/+0
* \| \| \| \| \| \| \| \| \| \| \| \|	Bug#44664: valgrind warning for COMMIT_AND_CHAIN and ROLLBACK_AND_CHAIN	Davi Arnaut	2009-05-11	1	-2/+5
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge Bug#43230 into mysql-5.1-bugteam	Davi Arnaut	2009-04-03	1	-3/+30
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| / / / / / / / / / \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Bug#43230: SELECT ... FOR UPDATE can hang with FLUSH TABLES WITH READ LOCK in...	Davi Arnaut	2009-04-03	1	-1/+25
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Manual merge.	Ramil Kalimullin	2009-03-25	1	-0/+37
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Auto-merge	Ramil Kalimullin	2009-03-25	1	-9/+8
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Fix for bug#35383: binlog playback and replication breaks	Ramil Kalimullin	2009-03-25	1	-0/+36