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

	Commit message (Expand)	Author	Age	Files	Lines
*	10.0-base merge	Sergei Golubchik	2013-07-18	1	-1/+1
\|\
\| *	mysql-5.5.32 merge	Sergei Golubchik	2013-07-16	1	-1/+1
\| \|\
\| \| *	Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER	Murthy Narkedimilli	2013-03-19	1	-1/+1
\| \| *	merge 5.1-security => 5.5-security	Tor Didriksen	2011-10-14	1	-0/+38
\| \| \|\
* \| \| \|	more fixes for test cases	Sergei Golubchik	2012-10-01	1	-0/+4
\|/ / /
* \| \|	5.3 merge	Sergei Golubchik	2012-01-13	1	-1/+32
\|\ \ \
\| * \ \	Merge with 5.2.	Michael Widenius	2011-12-11	1	-7/+37
\| \|\ \ \
\| \| * \| \|	Fixes for build failuers found by buildbot	Michael Widenius	2011-11-24	1	-1/+1
\| \| * \| \|	Merge with MySQL 5.1.60	Michael Widenius	2011-11-23	1	-5/+31
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	merge 5.0-security => 5.1 security	Tor Didriksen	2011-10-14	1	-0/+30
\| \| \| \|\ \
\| \| \| \| * \|	Bug#12563865 ROUNDED,TMP_BUF,DECIMAL_VALUE STACK CORRUPTION IN ALL VERSIONS >...	Tor Didriksen	2011-10-14	1	-0/+30
\| \| * \| \| \|	Initail merge with MySQL 5.1 (XtraDB still needs to be merged)	Michael Widenius	2011-11-21	1	-3/+7
\| \| \|\ \ \ \ \| \| \| \|/ / /
* \| \| \| \| \|	mysql-5.5.18 merge	Sergei Golubchik	2011-11-03	1	-7/+1
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	merge 5.1 => 5.5	Tor Didriksen	2011-08-29	1	-5/+1
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	BUG#12911710 - VALGRIND FAILURE IN ROW-DEBUG:PERFSCHEMA.SOCKET_SUMMARY_BY_INS...	Tor Didriksen	2011-08-29	1	-5/+1
\| \| * \| \| \|	Updated/added copyright headers	Kent Boortz	2011-07-03	1	-1/+2
\| \| \|\ \ \ \
\| \| * \ \ \ \	Updated/added copyright headers	Kent Boortz	2011-06-30	1	-2/+4
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \|
\| * \| \| \| \| \|	Bug 12608543 - CRASHES WITH DECIMALS AND STATEMENT NEEDS TO BE REPREPARED ERRORS	Tor Didriksen	2011-06-10	1	-2/+0
* \| \| \| \| \| \|	merge with 5.3	Sergei Golubchik	2011-10-19	1	-44/+24
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	merge with 5.1-micro	Sergei Golubchik	2011-06-07	1	-0/+5
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	revert a suggested "optimization" that introduced a bug	Sergei Golubchik	2011-06-06	1	-0/+5
\| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Adding support for Dynamic columns (WL#34):	Michael Widenius	2011-05-08	1	-44/+19
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Merge with MySQL 5.1.53	Michael Widenius	2010-11-25	1	-1/+1
\| \|\ \ \ \ \ \| \| \|/ / / /
* \| \| \| \| \|	5.5-merge	Sergei Golubchik	2011-07-02	1	-24/+45
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	auto-merge	Tatjana Azundris Nuernberg	2011-05-12	1	-20/+23
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Bug #11792200 - DIVIDING LARGE NUMBERS CAUSES STACK CORRUPTIONS	Tor Didriksen	2011-03-03	1	-20/+23
\| * \| \| \| \| \|	auto-merge Bug#11762799/Bug#55436	Tatjana Azundris Nuernberg	2011-05-12	1	-1/+2
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| / \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	auto-merge conservative fix for Bug#55436/Bug#11762799	Tatiana Azundris Nurnberg	2011-05-05	1	-1/+2
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| \| * \| \|	Bug#55436: buffer overflow in debug binary of dbug_buff in Field_new_decimal:...	Tatiana A. Nurnberg	2010-11-11	1	-1/+2
\| * \| \| \| \|	Bug #59241 invalid memory read in do_div_mod with doubly assigned variables	Tor Didriksen	2011-01-14	1	-2/+19
\| * \| \| \| \|	Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.	Davi Arnaut	2010-10-19	1	-1/+1
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Bug#45288: pb2 returns a lot of compilation warnings	Davi Arnaut	2010-10-19	1	-1/+1
\| \| \|/ / /
* \| \| \| \|	merge.	Sergei Golubchik	2010-11-25	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| / / \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge with MySQL 5.1, with following additions:	unknown	2009-11-16	1	-5/+9
\| \|\ \ \ \| \| \|/ /
\| * \| \|	Merge MySQL 5.1.39 into MariaDB 5.1.	unknown	2009-10-15	1	-9/+5
\| \|\ \ \
\| * \ \ \	Merge MySQL->MariaDB	Sergey Petrunya	2009-09-08	1	-2/+15
\| \|\ \ \ \
\| * \| \| \| \|	We are now using Valgrind rather than purify, and have for quite some time.	unknown	2009-05-06	1	-1/+1
* \| \| \| \| \|	WL#5030: Split and remove mysql_priv.h	Mats Kindahl	2010-03-31	1	-0/+20
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Bug#48370: Absolutely wrong calculations with GROUP BY and decimal fields whe...	Davi Arnaut	2009-11-02	1	-5/+9
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Bug#45261: Crash, stored procedure + decimal	Davi Arnaut	2009-08-24	1	-9/+5
\| \|/ / \|/\| \|
* \| \|	Manual merge.	Alexey Kopytov	2009-07-03	1	-2/+15
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Bug #45262: Bad effects with CREATE TABLE and DECIMAL	Alexey Kopytov	2009-07-03	1	-2/+15
\| \|/
* \|	Merge bk-internal.mysql.com:/home/bk/mysql-5.1	unknown	2008-05-20	1	-0/+8
\|\ \
\| * \|	Tentative implementation of	unknown	2008-04-08	1	-0/+8
* \| \|	Merge amd64.(none):/src/rel_clean_up/my50-rel_clean_up	unknown	2008-04-28	1	-2/+11
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	Bug#36023: Incorrect handling of zero length caused an assertion to fail.	unknown	2008-04-25	1	-2/+11
\| *	Merge bk-internal.mysql.com:/data0/bk/mysql-5.0	unknown	2007-05-28	1	-3/+7
\| \|\
\| * \	Merge siva.hindu.god:/home/tsmith/m/bk/50	unknown	2007-05-17	1	-0/+20
\| \|\ \
\| * \| \|	Backport of TIME->MYSQL_TIME / Y2K fixset	unknown	2007-05-16	1	-1/+1
* \| \| \|	Doxygenize comments.	unknown	2007-10-16	1	-10/+17