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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge MySQL 5.1.46 into MariaDB.	unknown	2010-04-28	1	-1/+2
\|\
\| *	Bug#48525: trigger changes "Column 'id' cannot be null" behaviour	Tatiana A. Nurnberg	2010-03-29	1	-0/+1
\| *	revert 48525	Tatiana A. Nurnberg	2010-02-22	1	-1/+0
\| *	Bug#48525: trigger changes "Column 'id' cannot be null" behaviour	Tatiana A. Nurnberg	2010-02-18	1	-0/+1
\| *	Bug#49534: multitable IGNORE update with sql_safe_updates	Martin Hansson	2010-02-10	1	-1/+1
* \|	Removed compiler warning	Michael Widenius	2010-03-30	1	-0/+2
* \|	Merge MySQL 5.1.44 into MariaDB.	unknown	2010-03-04	1	-1/+4
\|\ \ \| \|/
\| *	Backport Bug#37148 to 5.1	He Zhenxing	2010-01-24	1	-1/+1
\| *	BUG#46364 MyISAM transbuffer problems (NTM problem)	Alfranio Correia	2010-01-20	1	-0/+1
\| *	Auto-merged.	Evgeny Potemkin	2009-12-02	1	-0/+2
\| \|\
\| \| *	Bug#48508: Crash on prepared statement re-execution.	Evgeny Potemkin	2009-12-01	1	-0/+2
* \| \|	Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.	unknown	2009-11-30	1	-4/+69
\|\ \ \
\| * \ \	Merge with MySQL 5.1, with following additions:	unknown	2009-11-16	1	-4/+69
\| \|\ \ \ \| \| \|/ /
\| \| * \|	manual merge of 28141	Tatiana A. Nurnberg	2009-10-20	1	-0/+6
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd...	Tatiana A. Nurnberg	2009-10-19	1	-0/+6
\| \| * \|	Bug #40877: multi statement execution fails in 5.1.30	Georgi Kodinov	2009-10-16	1	-2/+5
\| \| * \|	Bug#47280 - strange results from count(*) with order by multiple	Jorgen Loland	2009-10-14	1	-1/+26
\| \| * \|	auto-merge	Ingo Struewing	2009-10-01	1	-0/+5
\| \| \|\ \
\| \| \| * \|	WL#4259 - Debug Sync Facility	Ingo Struewing	2009-09-29	1	-0/+5
\| \| * \| \|	Bug#46958: Assertion in Diagnostics_area::set_ok_status,	Martin Hansson	2009-09-28	1	-1/+2
\| \| \|/ /
\| \| * \|	Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent table	Sergey Glukhov	2009-09-10	1	-0/+25
* \| \| \|	Added protection around usage of thd->mysys_var	Michael Widenius	2009-11-26	1	-0/+1
\|/ / /
* \| \|	Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge	Sergey Petrunya	2009-09-15	1	-0/+7
\|\ \ \
\| * \| \|	Updated documentation files to reflect MariaDB and not the Maria storage engi...	Michael Widenius	2009-09-03	1	-0/+7
* \| \| \|	Merge MySQL->MariaDB	Sergey Petrunya	2009-09-08	1	-25/+77
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /
\| * \|	Merge mysql-5.1-innodb_plugin to mysql-5.1.	Sergey Vojtovich	2009-08-11	1	-1/+1
\| \|\ \
\| \| * \	Merge 5.1-bugteam -> 5.1-innodb_plugin.	Sergey Vojtovich	2009-07-14	1	-3/+40
\| \| \|\ \
\| \| * \| \|	Backport WL#3653 to 5.1 to enable bundled innodb plugin.	Vladislav Vaintroub	2009-06-10	1	-1/+1
\| * \| \| \|	Bug# 30946: mysqldump silently ignores --default-character-set	Gleb Shchepa	2009-07-31	1	-0/+1
\| * \| \| \|	Merge from 5.0	Gleb Shchepa	2009-07-24	1	-21/+31
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Bug #38816: kill + flush tables with read lock + stored	Gleb Shchepa	2009-07-24	1	-21/+31
\| \| * \| \|	Pull 5.1 treatment of community features into 5.0.	Chad MILLER	2009-05-05	1	-1/+1
\| \| * \| \|	Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.	Chad MILLER	2009-04-14	1	-0/+11
\| \| \|\ \ \
\| \| * \ \ \	Merge from Tim's 5.0.76-release tree to make 5.0.77 .	Chad MILLER	2009-01-21	1	-0/+7
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merged from 5.0 (enterprise).	Chad MILLER	2008-12-17	1	-11/+19
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge chunk from trunk.	Chad MILLER	2008-07-10	1	-1/+1
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge chunk from trunk.	Chad MILLER	2008-07-10	1	-6/+38
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2007-12-10	1	-0/+8
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \	Merge bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2007-09-10	1	-0/+8
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| * \ \ \ \ \ \ \	Merge mysqldev@production.mysql.com:my/mysql-5.0-release	unknown	2007-07-02	1	-0/+8
\| \| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| \| * \ \ \ \ \ \ \	Merge mysqldev@production.mysql.com:my/mysql-5.0-release	unknown	2007-04-26	1	-0/+8
\| \| \| \| \| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add a comment for thd->proc_info.	Konstantin Osipov	2009-07-22	1	-0/+4
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix for a valgrind warning due to use of a uninitialized	Davi Arnaut	2009-06-08	1	-1/+2
\| * \| \| \| \| \| \| \| \| \| \| \|	Bug#44672: Assertion failed: thd->transaction.xid_state.xid.is_null()	Davi Arnaut	2009-06-05	1	-0/+8
\| * \| \| \| \| \| \| \| \| \| \| \|	BUG#41948 Query_log_event constructor needlessly contorted	He Zhenxing	2009-05-30	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \|	Bug#44658 Create procedure makes server crash when user does not have ALL pri...	Kristofer Pettersson	2009-05-29	1	-1/+29
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merged with mysql-5.1 tree.	Michael Widenius	2009-04-25	1	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Manual merge.	Ramil Kalimullin	2009-03-25	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Auto-merge	Ramil Kalimullin	2009-03-25	1	-0/+1
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix for bug#35383: binlog playback and replication breaks	Ramil Kalimullin	2009-03-25	1	-0/+3