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

	Commit message (Expand)	Author	Age	Files	Lines
*	5.5-merge	Sergei Golubchik	2011-07-02	1	-29/+88
\|\
\| *	Manual-merge of patch for bug#11753738 from mysql-5.1 tree.	Dmitry Shulga	2011-06-10	1	-1/+16
\| \|\
\| \| *	Fixed bug#11753738 (formely known as bug#45235) - 5.1 DOES NOT SUPPORT 5.0-ONLY	Dmitry Shulga	2011-06-10	1	-0/+15
\| * \|	merge from latest 5.5	Guilhem Bichot	2011-05-21	1	-7/+7
\| \|\ \
\| \| * \	Merge 5.5	Mikael Ronström	2011-04-15	1	-3/+4
\| \| \|\ \
\| \| * \| \|	Changed prefix from ES_ to STMT_ on Query arena state	Mikael Ronstrom	2011-03-04	1	-7/+7
\| \| * \| \|	merge	Mikael Ronstrom	2011-03-04	1	-1/+0
\| \| \|\ \ \
\| \| * \| \| \|	BUG#59549, fix compiler error on Windows, step 2	Mikael Ronstrom	2011-01-20	1	-7/+7
\| * \| \| \| \|	Merge from 5.1.	Guilhem Bichot	2011-05-21	1	-2/+2
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| / \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.	Guilhem Bichot	2011-05-16	1	-3/+3
\| * \| \| \|	A patch for Bug#11763166 (55847: SHOW WARNINGS returns empty	Alexander Nozdrin	2011-04-15	1	-3/+4
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	WL#5670: Proposal: Remove SHOW NEW MASTER statement	Sven Sandberg	2011-02-16	1	-1/+0
\| \| \|/ \| \|/\|
\| * \|	merge mysql-5.5->mysql-5.5-bugteam	Georgi Kodinov	2010-12-16	1	-7/+4
\| \|\ \
\| \| * \|	Bug#45445: cannot execute procedures with thread_stack set to 128k.	Alexander Nozdrin	2010-11-24	1	-7/+4
\| * \| \|	Bug #58350: 5.5.7-rc compile failed at sp_head.cc	Georgi Kodinov	2010-12-08	1	-1/+1
\| \|/ /
\| * \|	Merge from mysql-5.5-runtime to mysql-5.5-bugteam	Jon Olav Hauglid	2010-11-18	1	-2/+12
\| \|\ \
\| \| * \|	Implement a fix for Bug#57058 -- send SERVER_QUERY_WAS_SLOW over	Konstantin Osipov	2010-11-12	1	-0/+5
\| \| * \|	Merge from mysql-5.5-bugteam to mysql-5.5-runtime	Jon Olav Hauglid	2010-11-12	1	-1/+1
\| \| \|\ \
\| \| * \| \|	Patch that refactors global read lock implementation and fixes	Dmitry Lenev	2010-11-11	1	-2/+7
\| * \| \| \|	Bug#57306 SHOW PROCESSLIST does not display string literals well.	Alexander Barkov	2010-11-18	1	-5/+2
\| \| \|/ / \| \|/\| \|
\| * \| \|	Auto-merge from mysql-5.1-bugteam for bug#54375.	Dmitry Shulga	2010-11-11	1	-1/+1
\| \|\ \ \ \| \| \|/ / \| \|/\| / \| \| \|/
\| \| *	Fixed bug#54375 - Error in stored procedure leaves connection	Dmitry Shulga	2010-11-11	1	-1/+1
\| * \|	Patch for Bug#55850 (Trigger warnings not cleared).	Alexander Nozdrin	2010-10-26	1	-6/+20
\| * \|	Fixed bug#45445 - cannot execute procedures with thread_stack	Dmitry Shulga	2010-10-21	1	-4/+7
\| * \|	Reverting a patch for Bug#45445 (cannot execute procedures with thread_stack ...	Alexander Nozdrin	2010-10-13	1	-1/+4
\| * \|	A follow up for the patch for Bug#45445, increase stack size	Dmitry Shulga	2010-10-12	1	-2/+3
\| * \|	Fixed bug#45445 - cannot execute procedures with thread_stack	Dmitry Shulga	2010-10-07	1	-2/+21
* \| \|	merge.	Sergei Golubchik	2010-11-25	1	-9/+14
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	merge with 5.1	Sergei Golubchik	2010-09-11	1	-2/+2
\| \|\ \
\| \| * \|	Fix that one can run mysql_upgrade with long table names	Michael Widenius	2010-09-03	1	-2/+2
\| * \| \|	Merge with MariaDB 5.1.49	Michael Widenius	2010-08-05	1	-8/+37
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge with MySQL 5.1.49	Michael Widenius	2010-08-02	1	-8/+37
\| \| \|\ \ \| \| \| \|/
\| * \| \|	merge 5.1->5.2	Sergei Golubchik	2010-06-01	1	-21/+17
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge with MySQL 5.1.47	Michael Widenius	2010-05-26	1	-21/+13
\| \| \|\ \
\| \| * \ \	Merge MySQL 5.1.46 into MariaDB.	unknown	2010-04-28	1	-0/+4
\| \| \|\ \ \
\| * \| \| \| \|	MWL#43 CREATE TABLE options (by Sanja)	Sergei Golubchik	2010-04-08	1	-1/+1
\| * \| \| \| \|	Merge with 5.1	Michael Widenius	2010-04-01	1	-0/+2
\| \|\ \ \ \ \ \| \| \|/ / / /
\| * \| \| \| \|	merged	Sergei Golubchik	2010-03-15	1	-2/+10
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge MySQL 5.1.44 into MariaDB.	unknown	2010-03-04	1	-2/+10
\| \| \|\ \ \ \
\| * \| \ \ \ \	merge 5.1->5.2	unknown	2010-02-01	1	-6/+18
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| \| * \| \| \| \|	Merge with MySQL 5.1.42	Michael Widenius	2010-01-15	1	-6/+18
\| \| \|\ \ \ \ \
\| * \| \ \ \ \ \	merge 5.1-> 5.2	unknown	2009-12-08	1	-19/+24
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.	unknown	2009-11-30	1	-18/+22
\| \| \|\ \ \ \ \ \
\| \| \| * \ \ \ \ \	Merge with MySQL 5.1, with following additions:	unknown	2009-11-16	1	-18/+22
\| \| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Fixes after comments from last push:	Michael Widenius	2009-11-30	1	-1/+1
\| \| * \| \| \| \| \| \| \|	Remove compiler warnings (Including some warnings from -Wstrict-aliasing)	Michael Widenius	2009-11-30	1	-1/+2
\| \| \|/ / / / / / /
\| * \| \| \| \| \| \| \|	The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.	Igor Babaev	2009-10-16	1	-1/+4
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge	Sergey Petrunya	2009-09-15	1	-7/+5
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Updated documentation files to reflect MariaDB and not the Maria storage engi...	Michael Widenius	2009-09-03	1	-7/+5
* \| \| \| \| \| \| \| \|	Fix use of uninitialized variable.	Alexander Nozdrin	2010-08-12	1	-1/+1